From f891a925f898928caf87705edf0cba74f54b9077 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 25 Dec 2023 14:07:13 +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 | 22 +++++----- .../InventorymoveRequestMainServiceImpl.java | 40 +++++++++---------- 2 files changed, 31 insertions(+), 31 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 60267ed7..a06ff277 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 @@ -259,30 +259,30 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ inventorymoveRecordMainDO.setExecuteTime(LocalDateTime.now()); inventorymoveRecordMainDO.setActiveDate(LocalDateTime.now()); inventorymoveRecordMainDO.setDueTime(inventorymoveJobMainDO.getRequestDueTime()); - if ("HoldToOkJob".equals(inventorymoveRecordMainDO.getBusinessType())) { + if ("HoldToOk".equals(inventorymoveRecordMainDO.getBusinessType())) { number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); - } else if ("OkToHoldJob".equals(inventorymoveRecordMainDO.getBusinessType())) { + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest"); + } else if ("OkToHold".equals(inventorymoveRecordMainDO.getBusinessType())) { number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); - } else if ("HoldToScrapJob".equals(inventorymoveRecordMainDO.getBusinessType())) { + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest"); + } else if ("HoldToScrap".equals(inventorymoveRecordMainDO.getBusinessType())) { number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); - } else if ("ScrapToHoldJob".equals(inventorymoveRecordMainDO.getBusinessType())) { + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest"); + } else if ("ScrapToHold".equals(inventorymoveRecordMainDO.getBusinessType())) { number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); - } else if ("OkToScrapJob".equals(inventorymoveRecordMainDO.getBusinessType())) { + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest"); + } else if ("OkToScrap".equals(inventorymoveRecordMainDO.getBusinessType())) { number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest"); }else { number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest"); } 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 dd929390..25d8d47b 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 @@ -171,7 +171,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest CreateBusinessTypeAndRequestSetting(inventorymoveRequestMainDO,inventorymoveRequestDetailDO,itembasicDO,OkToScrapRequest); }//库存转移申请 else { - String InventoryMoveRequest = "InventoryMoveRequest"; + String InventoryMoveRequest = "MoveRequest"; CreateBusinessTypeAndRequestSetting(inventorymoveRequestMainDO,inventorymoveRequestDetailDO,itembasicDO,InventoryMoveRequest); } validtebalance(inventorymoveRequestDetailDO); @@ -322,7 +322,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest detailDo.setNumber(number); // 校验业务类型 try { - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest"); 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("OkToHold"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest"); 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("HoldToScrap"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest"); 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("ScrapToHold"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest"); 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("OkToScrap"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest"); mainDO.setBusinessType(businesstypeDO.getCode()); validationBusinesstype(detailDo,businesstypeDO,messageDetail); } catch (ServiceException ex) { @@ -426,7 +426,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest // 校验业务类型 try { - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest"); mainDO.setBusinessType(businesstypeDO.getCode()); validationBusinesstype(detailDo, businesstypeDO, messageDetail); } catch (ServiceException ex) { @@ -445,7 +445,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest mainDO.setNumber(number); // 校验业务类型 try { - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest"); mainDO.setBusinessType(businesstypeDO.getCode()); validationBusinesstype(detailDo,businesstypeDO,messageDetail); } catch (ServiceException ex) { @@ -578,27 +578,27 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest if("HoldToOk".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest"); } else if("OkToHold".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest"); } else if("HoldToScrap".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest"); } else if("ScrapToHold".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest"); } else if("OkToScrap".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest"); }else { number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest"); } inventorymoveRecordMainCreateReqVO.setNumber(number); inventorymoveRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); @@ -638,27 +638,27 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest if("HoldToOk".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("HoldToOkJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest"); } else if("OkToHold".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("OkToHoldJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest"); } else if("HoldToScrap".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("HoldToScrapJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest"); } else if("ScrapToHold".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("ScrapToHoldJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest"); } else if("OkToScrap".equals(mainDO.getBusinessType())){ number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("OkToScrapJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest"); }else { number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_JOB.getCode()); jobsettingDO = jobsettingService.selectJobsettingExist("MoveJob"); - businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); + businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest"); } inventorymoveJobMainDO.setNumber(number); inventorymoveJobMainDO.setRequestTime(mainDO.getRequestTime());