zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

客户退货申请/任务/记录BusinessType修改

master
chenfang 2 years ago
parent
7209a1531f
commit
df2c6885e1
9 changed files with 43 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java
  2. 24
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java
  3. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java
  4. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java
  5. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java
  6. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java
  7. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java
  8. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java
  9. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java
View File

@ -30,7 +30,6 @@ public class CustomerreturnRequestMainBaseVO {
private String customerCode; private String customerCode;
@Schema(description = "客户月台代码", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "客户月台代码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "客户月台代码不能为空")
private String customerDockCode; private String customerDockCode;
@Schema(description = "承运商") @Schema(description = "承运商")

24
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java
View File

@ -86,7 +86,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
List<CustomerreceiptRequestDetailDO> subDOList = CustomerreceiptRequestDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); List<CustomerreceiptRequestDetailDO> subDOList = CustomerreceiptRequestDetailConvert.INSTANCE.convertList03(createReqVO.getSubList());
String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_RECEIPT_REQUEST.getCode()); String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_RECEIPT_REQUEST.getCode());
customerreceiptRequestMain.setNumber(number); customerreceiptRequestMain.setNumber(number);
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("CustomerreceiptRequest"); RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("CustomerReceiptRequest");
RequestStatusState requestStatusState = new RequestStatusState(); RequestStatusState requestStatusState = new RequestStatusState();
requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute()); requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute());
customerreceiptRequestMain.setStatus(requestStatusState.getState().getCode()); customerreceiptRequestMain.setStatus(requestStatusState.getState().getCode());
@ -94,7 +94,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
customerreceiptRequestMain.setAutoAgree(requestsettingDO.getAutoAgree()); customerreceiptRequestMain.setAutoAgree(requestsettingDO.getAutoAgree());
customerreceiptRequestMain.setAutoExecute(requestsettingDO.getAutoExecute()); customerreceiptRequestMain.setAutoExecute(requestsettingDO.getAutoExecute());
customerreceiptRequestMain.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); customerreceiptRequestMain.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord());
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerreceiptRequest"); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerReceiptRequest");
customerreceiptRequestMain.setBusinessType(businesstypeDO.getCode()); customerreceiptRequestMain.setBusinessType(businesstypeDO.getCode());
customerreceiptRequestMain.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); customerreceiptRequestMain.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
customerreceiptRequestMain.setToLocationTypes(businesstypeDO.getInLocationTypes()); customerreceiptRequestMain.setToLocationTypes(businesstypeDO.getInLocationTypes());
@ -113,7 +113,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
customerreceiptRequestDetailDO.setNumber(number); customerreceiptRequestDetailDO.setNumber(number);
} }
customerreceiptRequestDetailMapper.insertBatch(subDOList); customerreceiptRequestDetailMapper.insertBatch(subDOList);
trendsApi.createTrends(requestsettingDO.getId(), "CustomerreceiptRequest", "增加了客户收货申请", TrendsTypeEnum.CREATE); trendsApi.createTrends(requestsettingDO.getId(), "CustomerReceiptRequest", "增加了客户收货申请", TrendsTypeEnum.CREATE);
// 返回 // 返回
return customerreceiptRequestMain.getId(); return customerreceiptRequestMain.getId();
} }
@ -125,7 +125,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
// 更新 // 更新
CustomerreceiptRequestMainDO updateObj = CustomerreceiptRequestMainConvert.INSTANCE.convert(updateReqVO); CustomerreceiptRequestMainDO updateObj = CustomerreceiptRequestMainConvert.INSTANCE.convert(updateReqVO);
customerreceiptRequestMainMapper.updateById(updateObj); customerreceiptRequestMainMapper.updateById(updateObj);
trendsApi.createTrends(updateReqVO.getId(), "CustomerreceiptRequest", "修改了客户收货申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(updateReqVO.getId(), "CustomerReceiptRequest", "修改了客户收货申请", TrendsTypeEnum.UPDATE);
} }
@Override @Override
@ -186,7 +186,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
throw new ServiceException(CUSTOMERRECEIPT_REQUEST_CANNOT_CLOSE); throw new ServiceException(CUSTOMERRECEIPT_REQUEST_CANNOT_CLOSE);
} }
mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
trendsApi.createTrends(id, "CustomerreceiptRequest", "关闭了客户收货申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "CustomerReceiptRequest", "关闭了客户收货申请", TrendsTypeEnum.UPDATE);
return customerreceiptRequestMainMapper.updateById(mainDO); return customerreceiptRequestMainMapper.updateById(mainDO);
} }
@ -206,7 +206,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
throw new ServiceException(CUSTOMERRECEIPT_REQUEST_CANNOT_RE_ADD); throw new ServiceException(CUSTOMERRECEIPT_REQUEST_CANNOT_RE_ADD);
} }
mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
trendsApi.createTrends(id, "CustomerreceiptRequest", "打开了客户收货申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "CustomerReceiptRequest", "打开了客户收货申请", TrendsTypeEnum.UPDATE);
return customerreceiptRequestMainMapper.updateById(mainDO); return customerreceiptRequestMainMapper.updateById(mainDO);
} }
@ -229,7 +229,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) {
this.generateRecord(mainDO, customerreceiptRequestDetailMapper.selectList(mainDO.getId())); this.generateRecord(mainDO, customerreceiptRequestDetailMapper.selectList(mainDO.getId()));
} }
trendsApi.createTrends(id, "CustomerreceiptRequest", "提交了客户收货申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "CustomerReceiptRequest", "提交了客户收货申请", TrendsTypeEnum.UPDATE);
return customerreceiptRequestMainMapper.updateById(mainDO); return customerreceiptRequestMainMapper.updateById(mainDO);
} }
@ -253,7 +253,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) {
this.generateRecord(mainDO, customerreceiptRequestDetailMapper.selectList(mainDO.getId())); this.generateRecord(mainDO, customerreceiptRequestDetailMapper.selectList(mainDO.getId()));
} }
trendsApi.createTrends(id, "CustomerreceiptRequest", "审批同意了客户收货申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "CustomerReceiptRequest", "审批同意了客户收货申请", TrendsTypeEnum.UPDATE);
return customerreceiptRequestMainMapper.updateById(mainDO); return customerreceiptRequestMainMapper.updateById(mainDO);
} }
@ -275,7 +275,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
mainDO.setStatus(requestStatusState.getState().getCode()); mainDO.setStatus(requestStatusState.getState().getCode());
//调用执行方法 //调用执行方法
this.generateRecord(mainDO, customerreceiptRequestDetailMapper.selectList(mainDO.getId())); this.generateRecord(mainDO, customerreceiptRequestDetailMapper.selectList(mainDO.getId()));
trendsApi.createTrends(id, "CustomerreceiptRequest", "执行了客户收货申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "CustomerReceiptRequest", "执行了客户收货申请", TrendsTypeEnum.UPDATE);
return customerreceiptRequestMainMapper.updateById(mainDO); return customerreceiptRequestMainMapper.updateById(mainDO);
} }
@ -295,7 +295,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
throw new ServiceException(CUSTOMERRECEIPT_REQUEST_CANNOT_REFUSED); throw new ServiceException(CUSTOMERRECEIPT_REQUEST_CANNOT_REFUSED);
} }
mainDO.setStatus(requestStatusState.getState().getCode()); mainDO.setStatus(requestStatusState.getState().getCode());
trendsApi.createTrends(id, "CustomerreceiptRequest", "审批驳回了客户收货申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "CustomerReceiptRequest", "审批驳回了客户收货申请", TrendsTypeEnum.UPDATE);
return customerreceiptRequestMainMapper.updateById(mainDO); return customerreceiptRequestMainMapper.updateById(mainDO);
} }
@ -313,7 +313,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_RECEIPT_REQUEST.getCode()); String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_RECEIPT_REQUEST.getCode());
customerreceiptRecordMainCreateReqVO.setNumber(number); customerreceiptRecordMainCreateReqVO.setNumber(number);
//增加业务类型 //增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerreceiptRecord"); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerReceiptRecord");
customerreceiptRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); customerreceiptRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
customerreceiptRecordMainMapper.insert(CustomerreceiptRecordMainConvert.INSTANCE.convert(customerreceiptRecordMainCreateReqVO)); customerreceiptRecordMainMapper.insert(CustomerreceiptRecordMainConvert.INSTANCE.convert(customerreceiptRecordMainCreateReqVO));
List<ExpectinCreateReqVO> expectinCreateReqVOList = new ArrayList<>(); List<ExpectinCreateReqVO> expectinCreateReqVOList = new ArrayList<>();
@ -325,7 +325,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
customerreceiptRecordDetailCreateReqVO.setNumber(number); customerreceiptRecordDetailCreateReqVO.setNumber(number);
customerreceiptRecordDetailMapper.insert(CustomerreceiptRecordDetailConvert.INSTANCE.convert(customerreceiptRecordDetailCreateReqVO)); customerreceiptRecordDetailMapper.insert(CustomerreceiptRecordDetailConvert.INSTANCE.convert(customerreceiptRecordDetailCreateReqVO));
} }
trendsApi.createTrends(mainDO.getId(), "CustomerreceiptRecord", "客户收货申请生成客户收货记录", TrendsTypeEnum.CREATE); trendsApi.createTrends(mainDO.getId(), "CustomerReceiptRecord", "客户收货申请生成客户收货记录", TrendsTypeEnum.CREATE);
} }
} }
} }

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java
View File

@ -198,7 +198,7 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe
customerreturnJobMainDO.setAcceptUserId(String.valueOf(userId)); customerreturnJobMainDO.setAcceptUserId(String.valueOf(userId));
customerreturnJobMainDO.setAcceptUserName(userRespDTO.getNickname()); customerreturnJobMainDO.setAcceptUserName(userRespDTO.getNickname());
customerreturnJobMainDO.setAcceptTime(LocalDateTime.now()); customerreturnJobMainDO.setAcceptTime(LocalDateTime.now());
trendsApi.createTrends(id, "customerreturnJob", "承接了客户退货任务", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "CustomerRejectJob", "承接了客户退货任务", TrendsTypeEnum.UPDATE);
return customerreturnJobMainMapper.updateById(customerreturnJobMainDO); return customerreturnJobMainMapper.updateById(customerreturnJobMainDO);
} }
@ -214,7 +214,7 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe
customerreturnJobMainDO.setAcceptUserId(null); customerreturnJobMainDO.setAcceptUserId(null);
customerreturnJobMainDO.setAcceptUserName(null); customerreturnJobMainDO.setAcceptUserName(null);
customerreturnJobMainDO.setAcceptTime(null); customerreturnJobMainDO.setAcceptTime(null);
trendsApi.createTrends(id, "customerreturnJob", "取消了客户退货任务", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "CustomerRejectJob", "取消了客户退货任务", TrendsTypeEnum.UPDATE);
return customerreturnJobMainMapper.updateById(customerreturnJobMainDO); return customerreturnJobMainMapper.updateById(customerreturnJobMainDO);
} }
@ -227,7 +227,7 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe
throw exception(CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR); throw exception(CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR);
} }
customerreturnJobMainDO.setStatus(jobStatusState.getState().getCode()); customerreturnJobMainDO.setStatus(jobStatusState.getState().getCode());
trendsApi.createTrends(id, "customerreturnJob", "关闭了客户退货任务", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "CustomerRejectJob", "关闭了客户退货任务", TrendsTypeEnum.UPDATE);
return customerreturnJobMainMapper.updateById(customerreturnJobMainDO); return customerreturnJobMainMapper.updateById(customerreturnJobMainDO);
} }
@ -346,7 +346,7 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe
//移除预计出 //移除预计出
expectoutService.deleteExpectoutByJobNumber(customerreturnJobMainDO.getNumber()); expectoutService.deleteExpectoutByJobNumber(customerreturnJobMainDO.getNumber());
//变更记录 //变更记录
trendsApi.createTrends(customerreturnJobMainDO.getId(), "customerreturnJob", "执行了客户退货任务", TrendsTypeEnum.UPDATE); trendsApi.createTrends(customerreturnJobMainDO.getId(), "CustomerRejectJob", "执行了客户退货任务", TrendsTypeEnum.UPDATE);
return number; return number;
} }
} }

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java
View File

@ -88,8 +88,8 @@ public class CustomerreturnRecordMainServiceImpl implements CustomerreturnRecord
List<CustomerreturnRecordDetailDO> subDOList = CustomerreturnRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); List<CustomerreturnRecordDetailDO> subDOList = CustomerreturnRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList());
String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_REJECT_RECORD.getCode()); String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_REJECT_RECORD.getCode());
mainDO.setNumber(number); mainDO.setNumber(number);
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerreturnRecord"); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectRecord");
RecordsettingDO recordsettingDO = recordsettingService.selectRecordsettingExist("CustomerreturnRecord"); RecordsettingDO recordsettingDO = recordsettingService.selectRecordsettingExist("CustomerRejectRecord");
mainDO.setBusinessType(businesstypeDO.getCode()); mainDO.setBusinessType(businesstypeDO.getCode());
AdminUserRespDTO user = userApi.getUser(Long.valueOf(createReqVO.getCreator())); AdminUserRespDTO user = userApi.getUser(Long.valueOf(createReqVO.getCreator()));
mainDO.setCreator(createReqVO.getCreator()); mainDO.setCreator(createReqVO.getCreator());
@ -168,7 +168,7 @@ public class CustomerreturnRecordMainServiceImpl implements CustomerreturnRecord
//增加库存事务 //增加库存事务
transactionService.createTransaction(transactionCreateReqVOList); transactionService.createTransaction(transactionCreateReqVOList);
//增加操作记录 //增加操作记录
trendsApi.createTrends(mainDO.getId(), "customerreturnRecordMain", "增加了客户退货记录", TrendsTypeEnum.CREATE); trendsApi.createTrends(mainDO.getId(), "CustomerRejectRecord", "增加了客户退货记录", TrendsTypeEnum.CREATE);
// 返回 // 返回
return customerreturnRecordMain.getNumber(); return customerreturnRecordMain.getNumber();
} }

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java
View File

@ -353,7 +353,7 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
customerreturnJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber()); customerreturnJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
customerreturnJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach()); customerreturnJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
//增加业务类型 //增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectJob"); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectRequest");
customerreturnJobMainDO.setBusinessType(businesstypeDO.getCode()); customerreturnJobMainDO.setBusinessType(businesstypeDO.getCode());
customerreturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); customerreturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
customerreturnJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); customerreturnJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
@ -632,7 +632,9 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
DeliverRecordMainDO deliverRecordMainDO = deliverRecordMainService.selectsMainRecordExist(mainDo.getDeliverRecordNumber()); DeliverRecordMainDO deliverRecordMainDO = deliverRecordMainService.selectsMainRecordExist(mainDo.getDeliverRecordNumber());
mainDo.setDeliverPlanNumber(deliverRecordMainDO.getDeliverPlanNumber()); mainDo.setDeliverPlanNumber(deliverRecordMainDO.getDeliverPlanNumber());
mainDo.setCustomerCode(deliverRecordMainDO.getCustomerCode()); mainDo.setCustomerCode(deliverRecordMainDO.getCustomerCode());
if(deliverRecordMainDO.getCustomerDockCode() != null && !"".equals(deliverRecordMainDO.getCustomerDockCode())){
mainDo.setCustomerDockCode(deliverRecordMainDO.getCustomerDockCode()); mainDo.setCustomerDockCode(deliverRecordMainDO.getCustomerDockCode());
}
return mainDo; return mainDo;
} }
@ -792,5 +794,4 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
throw new UtilException("退货数量" + qty1 + "不能大于库存数量" + qty2); throw new UtilException("退货数量" + qty1 + "不能大于库存数量" + qty2);
} }
} }
} }

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java
View File

@ -100,7 +100,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
if(RequestStatusEnum.HANDLING.getCode().equals(customersettleRequestMainDO.getStatus())) { if(RequestStatusEnum.HANDLING.getCode().equals(customersettleRequestMainDO.getStatus())) {
generateRecord(customersettleRequestMainDO,customersettleRequestDetailMapper.selectList(customersettleRequestMainDO.getId())); generateRecord(customersettleRequestMainDO,customersettleRequestDetailMapper.selectList(customersettleRequestMainDO.getId()));
} }
trendsApi.createTrends(customersettleRequestMainDO.getId(), "CustomersettleRequest", "增加了客户结算申请", TrendsTypeEnum.CREATE); trendsApi.createTrends(customersettleRequestMainDO.getId(), "CustomerSettleRequest", "增加了客户结算申请", TrendsTypeEnum.CREATE);
// 返回 // 返回
return customersettleRequestMainDO.getId(); return customersettleRequestMainDO.getId();
} }
@ -114,7 +114,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
if(RequestStatusEnum.HANDLING.getCode().equals(updateObj.getStatus())) { if(RequestStatusEnum.HANDLING.getCode().equals(updateObj.getStatus())) {
generateRecord(updateObj,customersettleRequestDetailMapper.selectList(updateObj.getId())); generateRecord(updateObj,customersettleRequestDetailMapper.selectList(updateObj.getId()));
} }
trendsApi.createTrends(updateObj.getId(), "CustomersettleRequest", "修改了客户结算申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(updateObj.getId(), "CustomerSettleRequest", "修改了客户结算申请", TrendsTypeEnum.UPDATE);
customersettleRequestMainMapper.updateById(updateObj); customersettleRequestMainMapper.updateById(updateObj);
} }
@ -274,7 +274,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_SETTLE_RECORD.getCode()); String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_SETTLE_RECORD.getCode());
customersettleRecordMainCreateReqVO.setNumber(number); customersettleRecordMainCreateReqVO.setNumber(number);
//增加业务类型 //增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomersettleRecord"); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerSettleRecord");
customersettleRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); customersettleRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
CustomersettleRecordMainDO convert = CustomersettleRecordMainConvert.INSTANCE.convert(customersettleRecordMainCreateReqVO); CustomersettleRecordMainDO convert = CustomersettleRecordMainConvert.INSTANCE.convert(customersettleRecordMainCreateReqVO);
customersettleRecordMainMapper.insert(convert); customersettleRecordMainMapper.insert(convert);
@ -306,7 +306,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
transactionCreateReqVO.setLocationCode(recordDetailDO.getFromLocationCode()); transactionCreateReqVO.setLocationCode(recordDetailDO.getFromLocationCode());
transactionCreateReqVOList.add(transactionCreateReqVO); transactionCreateReqVOList.add(transactionCreateReqVO);
} }
trendsApi.createTrends(mainDO.getId(), "CustomersettleRecord", "客户结算申请生成客户结算记录", TrendsTypeEnum.CREATE); trendsApi.createTrends(mainDO.getId(), "CustomerSettleRecord", "客户结算申请生成客户结算记录", TrendsTypeEnum.CREATE);
} }
@Override @Override
@ -344,7 +344,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
//增加操作记录 //增加操作记录
String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_SETTLE_REQUEST.getCode()); String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_SETTLE_REQUEST.getCode());
mainDO.setNumber(number); mainDO.setNumber(number);
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("CustomersettleRequest"); RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("CustomerSettleRequest");
RequestStatusState requestStatusState = new RequestStatusState(); RequestStatusState requestStatusState = new RequestStatusState();
requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute()); requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute());
mainDO.setStatus(requestStatusState.getState().getCode()); mainDO.setStatus(requestStatusState.getState().getCode());
@ -354,7 +354,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
mainDO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); mainDO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord());
mainDO.setRequestTime(LocalDateTime.now()); mainDO.setRequestTime(LocalDateTime.now());
customersettleRequestMainMapper.insert(mainDO); customersettleRequestMainMapper.insert(mainDO);
trendsApi.createTrends(mainDO.getId(), "customersettleRequestMain", "导入了客户结算申请", TrendsTypeEnum.CREATE); trendsApi.createTrends(mainDO.getId(), "CustomerSettleRequest", "导入了客户结算申请", TrendsTypeEnum.CREATE);
for (CustomersettleRequestDetailDO detailDO : subDOList) { for (CustomersettleRequestDetailDO detailDO : subDOList) {
detailDO.setMasterId(mainDO.getId()); detailDO.setMasterId(mainDO.getId());
detailDO.setNumber(number); detailDO.setNumber(number);

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java
View File

@ -23,7 +23,6 @@ import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.customer.CustomerDO; import com.win.module.wms.dal.dataobject.customer.CustomerDO;
import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanDetailDO; import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanDetailDO;
import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanMainDO; import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanMainDO;
import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.mysql.deliverPlan.DeliverPlanDetailMapper; import com.win.module.wms.dal.mysql.deliverPlan.DeliverPlanDetailMapper;
@ -111,9 +110,8 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService {
@Override @Override
@Transactional @Transactional
public Long createDeliverPlanMain(DeliverPlanMainCreateReqVO createReqVO) { public Long createDeliverPlanMain(DeliverPlanMainCreateReqVO createReqVO) {
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("DeliverPlan");
DeliverPlanMainDO deliverPlanMainDO = validatorToCreate(createReqVO); DeliverPlanMainDO deliverPlanMainDO = validatorToCreate(createReqVO);
trendsApi.createTrends(requestsettingDO.getId(), "DeliverPlanMain", "增加了发货计划", TrendsTypeEnum.CREATE); trendsApi.createTrends(deliverPlanMainDO.getId(), "DeliverPlanMain", "增加了发货计划", TrendsTypeEnum.CREATE);
return deliverPlanMainDO.getId(); return deliverPlanMainDO.getId();
} }
@ -127,7 +125,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService {
} }
DeliverPlanMainDO mainDO = DeliverPlanMainConvert.INSTANCE.convert(updateReqVO); DeliverPlanMainDO mainDO = DeliverPlanMainConvert.INSTANCE.convert(updateReqVO);
deliverPlanMainMapper.updateById(mainDO); deliverPlanMainMapper.updateById(mainDO);
trendsApi.createTrends(updateReqVO.getId(), "DeliverPlanMain", deliverPlanMainDO.toString(), TrendsTypeEnum.UPDATE); trendsApi.createTrends(mainDO.getId(), "DeliverPlanMain", deliverPlanMainDO.toString(), TrendsTypeEnum.UPDATE);
} }
@Override @Override

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java
View File

@ -157,7 +157,7 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
if(RequestStatusEnum.HANDLING.getCode().equals(deliverRequestMain.getStatus())) { if(RequestStatusEnum.HANDLING.getCode().equals(deliverRequestMain.getStatus())) {
generateJob(deliverRequestMain,deliverRequestDetailMapper.selectList(deliverRequestMain.getId())); generateJob(deliverRequestMain,deliverRequestDetailMapper.selectList(deliverRequestMain.getId()));
} }
trendsApi.createTrends(requestsettingDO.getId(), "DeliverRequest", "增加了制品上架申请", TrendsTypeEnum.CREATE); trendsApi.createTrends(deliverRequestMain.getId(), "DeliverRequest", "增加了制品上架申请", TrendsTypeEnum.CREATE);
return deliverRequestMain.getId(); return deliverRequestMain.getId();
} }
@ -174,7 +174,7 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
if(RequestStatusEnum.HANDLING.getCode().equals(deliverRequestMainDO.getStatus())) { if(RequestStatusEnum.HANDLING.getCode().equals(deliverRequestMainDO.getStatus())) {
generateJob(deliverRequestMainDO,deliverRequestDetailMapper.selectList(deliverRequestMainDO.getId())); generateJob(deliverRequestMainDO,deliverRequestDetailMapper.selectList(deliverRequestMainDO.getId()));
} }
trendsApi.createTrends(requestsettingDO.getId(), "DeliverRequest", "修改了制品上架申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(deliverRequestMainDO.getId(), "DeliverRequest", "修改了制品上架申请", TrendsTypeEnum.UPDATE);
} }
@Override @Override

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
View File

@ -211,11 +211,17 @@ public class JobUtils {
detailDOQueryWrapper.eq("available", "TRUE"); detailDOQueryWrapper.eq("available", "TRUE");
deliverPlanDetailDO = deliverPlanDetailMapper.selectOne(detailDOQueryWrapper); deliverPlanDetailDO = deliverPlanDetailMapper.selectOne(detailDOQueryWrapper);
BigDecimal shippedQty = deliverPlanDetailDO.getShippedQty(); BigDecimal shippedQty = deliverPlanDetailDO.getShippedQty();
// 如果已发货数量=计划数量，更新计划明细状态为（开放 => 关闭） //修改已发货qty
deliverPlanDetailDO.setShippedQty(shippedQty.add(pshippedQty)); deliverPlanDetailDO.setShippedQty(shippedQty.add(pshippedQty));
if(deliverPlanDetailDO.getShippedQty().compareTo(deliverPlanDetailDO.getPlanQty()) == 1){
throw exception(QTY_EXCEPTION, deliverPlanDetailDO.getItemCode() + "该物件已发货数量" + deliverPlanDetailDO.getShippedQty() + "大于发货计划数量" + deliverPlanDetailDO.getPlanQty() + "超出" + deliverPlanDetailDO.getShippedQty().subtract(deliverPlanDetailDO.getPlanQty()));
}else {
deliverPlanDetailMapper.updateById(deliverPlanDetailDO);
// 如果已发货数量=计划数量，更新计划明细状态为（开放 => 关闭）
if (deliverPlanDetailDO.getPlanQty() == deliverPlanDetailDO.getShippedQty()) { if (deliverPlanDetailDO.getPlanQty() == deliverPlanDetailDO.getShippedQty()) {
deliverPlanDetailDO.setAvailable("FALSE"); deliverPlanDetailDO.setAvailable("FALSE");
} }
}
// 如果全部明细状态为(关闭)，更新计划状态为(已接受 => 完成) // 如果全部明细状态为(关闭)，更新计划状态为(已接受 => 完成)
QueryWrapper<DeliverPlanDetailDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<DeliverPlanDetailDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("master_id", deliverPlanMainDO.getId()); queryWrapper.eq("master_id", deliverPlanMainDO.getId());
@ -933,6 +939,7 @@ public class JobUtils {
// 任务子表数据 // 任务子表数据
List<BalanceDO> balanceDOListJob = new ArrayList<>(); List<BalanceDO> balanceDOListJob = new ArrayList<>();
System.out.println(queryWrapper.toString());
List<BalanceDO> balanceDOList = balanceMapper.selectList(queryWrapper); List<BalanceDO> balanceDOList = balanceMapper.selectList(queryWrapper);
if (balanceDOList == null || balanceDOList.size() == 0 ) { if (balanceDOList == null || balanceDOList.size() == 0 ) {
throw exception(BALANCE_NOT_EXISTS); throw exception(BALANCE_NOT_EXISTS);

Write Preview
Loading…
Cancel
Save