yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.1.37 根据项目快照创建发货草稿 功能弃用 注释

Browse Source
dev
yinq 2 months ago
parent f9d21f96c8
commit 0adc28dd69
3 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File

3
ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/dubbo/RemoteWmsShippingBillServiceImpl.java
Unescape Escape View File

@ -24,7 +24,8 @@ public class RemoteWmsShippingBillServiceImpl implements RemoteWmsShippingBillSe
*/
@Override
public Long createDraftByProject(RemoteWmsShippingDraft draft) {
return wmsShippingBillService.createDraftByProject(draft);
// return wmsShippingBillService.createDraftByProject(draft);
return 1L;
}
}

14
ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsShippingBillService.java
Unescape Escape View File

@ -85,11 +85,11 @@ public interface IWmsShippingBillService {
Map<String, Object> buildWordExportData(Long shippingBillId);
/**
* 根据项目快照创建发货草稿
*
* @param draft 发货草稿快照
* @return 发货单ID
*/
Long createDraftByProject(RemoteWmsShippingDraft draft);
// /**
// * 根据项目快照创建发货草稿
// * 弃用
// * @param draft 发货草稿快照
// * @return 发货单ID
// */
// Long createDraftByProject(RemoteWmsShippingDraft draft);
}

118
ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java
Unescape Escape View File

@ -262,65 +262,65 @@ public class WmsShippingBillServiceImpl implements IWmsShippingBillService {
}
}
/**
* 根据项目快照创建发货草稿
* 功能弃用
* @param draft 发货草稿快照
* @return 发货单ID
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Long createDraftByProject(RemoteWmsShippingDraft draft) {
if (draft == null || draft.getProjectId() == null) {
throw new ServiceException("项目发货草稿参数不完整");
}
WmsShippingBill existing = baseMapper.selectOne(Wrappers.<WmsShippingBill>lambdaQuery()
.select(WmsShippingBill::getShippingBillId)
.eq(WmsShippingBill::getProjectId, draft.getProjectId())
.eq(WmsShippingBill::getOutStockBillStatus, OAStatusEnum.DRAFT.getStatus())
.eq(WmsShippingBill::getFlowStatus, BusinessStatusEnum.DRAFT.getStatus())
.eq(WmsShippingBill::getDelFlag, "0")
.last("limit 1"), false);
if (existing != null) {
return existing.getShippingBillId();
}
WmsShippingBillBo bo = new WmsShippingBillBo();
bo.setBindType(StringUtils.defaultIfBlank(draft.getBindType(), "1"));
bo.setShippingMode(StringUtils.defaultIfBlank(draft.getShippingMode(), "1"));
bo.setShippingType(draft.getShippingType());
bo.setProjectId(draft.getProjectId());
bo.setProjectCode(draft.getProjectCode());
bo.setProjectName(draft.getProjectName());
bo.setSourceBillType("PROJECT");
bo.setSourceBillId(draft.getProjectId());
bo.setSourceBillCode(draft.getProjectCode());
bo.setContractId(draft.getContractId());
bo.setContractCode(draft.getContractCode());
bo.setContractName(draft.getContractName());
bo.setCustomerId(draft.getCustomerId());
bo.setCustomerName(draft.getCustomerName());
bo.setShippingAddress(draft.getShippingAddress());
bo.setReceiverName(draft.getReceiverName());
bo.setReceiverPhone(draft.getReceiverPhone());
bo.setDirections(draft.getDirections());
bo.setRemark(StringUtils.defaultIfBlank(draft.getRemark(), "系统根据项目自动生成发货草稿"));
// 发货代办页面就是“草稿提醒页”，这里显式落草稿状态，后续只允许用户在编辑页补全后再手工发起流程
bo.setOutStockBillStatus(OAStatusEnum.DRAFT.getStatus());
bo.setFlowStatus(BusinessStatusEnum.DRAFT.getStatus());
bo.setShippingStatus(OAStatusEnum.DRAFT.getStatus());
bo.setDetailsList(buildDraftDetails(draft.getDetails()));
//手动设置信息
bo.setTenantId(draft.getTenantId());
bo.setCreateBy(draft.getCreateBy());
bo.setCreateTime(draft.getCreateTime());
bo.setCreateDept(draft.getCreateDept());
this.insertByBo(bo);
return bo.getShippingBillId();
}
// /**
// * 根据项目快照创建发货草稿
// * 功能弃用
// * @param draft 发货草稿快照
// * @return 发货单ID
// */
// @Override
// @Transactional(rollbackFor = Exception.class)
// public Long createDraftByProject(RemoteWmsShippingDraft draft) {
// if (draft == null || draft.getProjectId() == null) {
// throw new ServiceException("项目发货草稿参数不完整");
// }
// WmsShippingBill existing = baseMapper.selectOne(Wrappers.<WmsShippingBill>lambdaQuery()
// .select(WmsShippingBill::getShippingBillId)
// .eq(WmsShippingBill::getProjectId, draft.getProjectId())
// .eq(WmsShippingBill::getOutStockBillStatus, OAStatusEnum.DRAFT.getStatus())
// .eq(WmsShippingBill::getFlowStatus, BusinessStatusEnum.DRAFT.getStatus())
// .eq(WmsShippingBill::getDelFlag, "0")
// .last("limit 1"), false);
// if (existing != null) {
// return existing.getShippingBillId();
// }
//
// WmsShippingBillBo bo = new WmsShippingBillBo();
// bo.setBindType(StringUtils.defaultIfBlank(draft.getBindType(), "1"));
// bo.setShippingMode(StringUtils.defaultIfBlank(draft.getShippingMode(), "1"));
// bo.setShippingType(draft.getShippingType());
// bo.setProjectId(draft.getProjectId());
// bo.setProjectCode(draft.getProjectCode());
// bo.setProjectName(draft.getProjectName());
// bo.setSourceBillType("PROJECT");
// bo.setSourceBillId(draft.getProjectId());
// bo.setSourceBillCode(draft.getProjectCode());
// bo.setContractId(draft.getContractId());
// bo.setContractCode(draft.getContractCode());
// bo.setContractName(draft.getContractName());
// bo.setCustomerId(draft.getCustomerId());
// bo.setCustomerName(draft.getCustomerName());
// bo.setShippingAddress(draft.getShippingAddress());
// bo.setReceiverName(draft.getReceiverName());
// bo.setReceiverPhone(draft.getReceiverPhone());
// bo.setDirections(draft.getDirections());
// bo.setRemark(StringUtils.defaultIfBlank(draft.getRemark(), "系统根据项目自动生成发货草稿"));
// // 发货代办页面就是“草稿提醒页”，这里显式落草稿状态，后续只允许用户在编辑页补全后再手工发起流程
// bo.setOutStockBillStatus(OAStatusEnum.DRAFT.getStatus());
// bo.setFlowStatus(BusinessStatusEnum.DRAFT.getStatus());
// bo.setShippingStatus(OAStatusEnum.DRAFT.getStatus());
// bo.setDetailsList(buildDraftDetails(draft.getDetails()));
//
// //手动设置信息
// bo.setTenantId(draft.getTenantId());
// bo.setCreateBy(draft.getCreateBy());
// bo.setCreateTime(draft.getCreateTime());
// bo.setCreateDept(draft.getCreateDept());
//
//
// this.insertByBo(bo);
// return bo.getShippingBillId();
// }
/**
* 保存前的数据校验

Write Preview
Loading…
Cancel
Save