From d4ad69db1f73d6fa338bf14bc75625945e3ec576 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 25 Dec 2023 13:25:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventorymoveJobMainServiceImpl.java | 15 ++--- .../InventorymoveRequestMainServiceImpl.java | 64 +++++++++---------- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java index 7b02784d..60267ed7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java @@ -235,7 +235,6 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ String number = ""; //查询数据 InventorymoveJobMainDO inventorymoveJobMainDO = this.validateInventorymoveJobMainExists(inventorymoveJobMainUpdateReqVO.getId()); - List subList = inventorymoveJobDetailService.selectList(inventorymoveJobMainDO.getId()); JobStatusState jobStatusState = new JobStatusState(inventorymoveJobMainDO.getStatus()); boolean flag = jobStatusState.execute(); if (!flag) { @@ -263,27 +262,27 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ if ("HoldToOkJob".equals(inventorymoveRecordMainDO.getBusinessType())) { number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRecord"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); } else if ("OkToHoldJob".equals(inventorymoveRecordMainDO.getBusinessType())) { number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRecord"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); } else if ("HoldToScrapJob".equals(inventorymoveRecordMainDO.getBusinessType())) { number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRecord"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); } else if ("ScrapToHoldJob".equals(inventorymoveRecordMainDO.getBusinessType())) { number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRecord"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); } else if ("OkToScrapJob".equals(inventorymoveRecordMainDO.getBusinessType())) { number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRecord"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); }else { number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_RECORD.getCode()); - recordsettingDO = recordsettingService.selectRecordsettingExist("InventoryMoveRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRecord"); + recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); } inventorymoveRecordMainDO.setNumber(number); inventorymoveRecordMainDO.setBusinessType(businesstypeDO.getCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java index f2c3e336..dd929390 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java @@ -322,7 +322,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest detailDo.setNumber(number); // 校验业务类型 try { - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); mainDO.setBusinessType(businesstypeDO.getCode()); validationBusinesstype(detailDo,businesstypeDO,messageDetail); } catch (ServiceException ex) { @@ -343,7 +343,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest mainDO.setNumber(number); // 校验业务类型 try { - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); mainDO.setBusinessType(businesstypeDO.getCode()); validationBusinesstype(detailDo,businesstypeDO,messageDetail); } catch (ServiceException ex) { @@ -363,7 +363,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest mainDO.setNumber(number); // 校验业务类型 try { - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); mainDO.setBusinessType(businesstypeDO.getCode()); validationBusinesstype(detailDo,businesstypeDO,messageDetail); } catch (ServiceException ex) { @@ -383,7 +383,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest mainDO.setNumber(number); // 校验业务类型 try { - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); mainDO.setBusinessType(businesstypeDO.getCode()); validationBusinesstype(detailDo,businesstypeDO,messageDetail); } catch (ServiceException ex) { @@ -403,7 +403,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest mainDO.setNumber(number); // 校验业务类型 try { - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); mainDO.setBusinessType(businesstypeDO.getCode()); validationBusinesstype(detailDo,businesstypeDO,messageDetail); } catch (ServiceException ex) { @@ -426,7 +426,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest // 校验业务类型 try { - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); mainDO.setBusinessType(businesstypeDO.getCode()); validationBusinesstype(detailDo, businesstypeDO, messageDetail); } catch (ServiceException ex) { @@ -445,13 +445,13 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest mainDO.setNumber(number); // 校验业务类型 try { - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRequest"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); mainDO.setBusinessType(businesstypeDO.getCode()); validationBusinesstype(detailDo,businesstypeDO,messageDetail); } catch (ServiceException ex) { messageDetail += ex.getMessage() + ","; } - RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("InventoryMoveRequest"); + RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("MoveRequest"); if (requestsettingDO != null) { mainDO.setAutoAgree(requestsettingDO.getAutoAgree()); mainDO.setAutoCommit(requestsettingDO.getAutoCommit()); @@ -575,30 +575,30 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest inventorymoveRecordMainCreateReqVO.setCreator(null); inventorymoveRecordMainCreateReqVO.setCreateTime(null); inventorymoveRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); - if("HoldToOkRequest".equals(mainDO.getBusinessType())){ + if("HoldToOk".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRecord"); - } else if("OkToHoldRequest".equals(mainDO.getBusinessType())){ + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); + } else if("OkToHold".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRecord"); - } else if("HoldToScrapRequest".equals(mainDO.getBusinessType())){ + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); + } else if("HoldToScrap".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRecord"); - } else if("ScrapToHoldRequest".equals(mainDO.getBusinessType())){ + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); + } else if("ScrapToHold".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRecord"); - } else if("OkToScrapRequest".equals(mainDO.getBusinessType())){ + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); + } else if("OkToScrap".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRecord"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); }else { number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); - recordsettingDO = recordsettingService.selectRecordsettingExist("InventoryMoveRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRecord"); + recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); } inventorymoveRecordMainCreateReqVO.setNumber(number); inventorymoveRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); @@ -635,30 +635,30 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest BeanUtils.copyProperties(mainDO, inventorymoveJobMainDO); inventorymoveJobMainDO.setRequestNumber(mainDO.getNumber()); inventorymoveJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); - if("HoldToOkRequest".equals(mainDO.getBusinessType())){ + if("HoldToOk".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("HoldToOkJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkJob"); - } else if("OkToHoldRequest".equals(mainDO.getBusinessType())){ + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); + } else if("OkToHold".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("OkToHoldJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldJob"); - } else if("HoldToScrapRequest".equals(mainDO.getBusinessType())){ + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); + } else if("HoldToScrap".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("HoldToScrapJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapJob"); - } else if("ScrapToHoldRequest".equals(mainDO.getBusinessType())){ + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); + } else if("ScrapToHold".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("ScrapToHoldJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldJob"); - } else if("OkToScrapRequest".equals(mainDO.getBusinessType())){ + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); + } else if("OkToScrap".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("OkToScrapJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapJob"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); }else { number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_JOB.getCode()); - jobsettingDO = jobsettingService.selectJobsettingExist("InventoryMoveJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveJob"); + jobsettingDO = jobsettingService.selectJobsettingExist("MoveJob"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); } inventorymoveJobMainDO.setNumber(number); inventorymoveJobMainDO.setRequestTime(mainDO.getRequestTime());