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

库存移动业务类型判断

master
chenfang 2 years ago
parent
eb79b4246a
commit
f891a925f8
2 changed files with 31 additions and 31 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. 22
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java
  2. 40
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java

22
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java
View File

@ -259,30 +259,30 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
inventorymoveRecordMainDO.setExecuteTime(LocalDateTime.now()); inventorymoveRecordMainDO.setExecuteTime(LocalDateTime.now());
inventorymoveRecordMainDO.setActiveDate(LocalDateTime.now()); inventorymoveRecordMainDO.setActiveDate(LocalDateTime.now());
inventorymoveRecordMainDO.setDueTime(inventorymoveJobMainDO.getRequestDueTime()); inventorymoveRecordMainDO.setDueTime(inventorymoveJobMainDO.getRequestDueTime());
if ("HoldToOkJob".equals(inventorymoveRecordMainDO.getBusinessType())) { if ("HoldToOk".equals(inventorymoveRecordMainDO.getBusinessType())) {
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest");
} else if ("OkToHoldJob".equals(inventorymoveRecordMainDO.getBusinessType())) { } else if ("OkToHold".equals(inventorymoveRecordMainDO.getBusinessType())) {
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest");
} else if ("HoldToScrapJob".equals(inventorymoveRecordMainDO.getBusinessType())) { } else if ("HoldToScrap".equals(inventorymoveRecordMainDO.getBusinessType())) {
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest");
} else if ("ScrapToHoldJob".equals(inventorymoveRecordMainDO.getBusinessType())) { } else if ("ScrapToHold".equals(inventorymoveRecordMainDO.getBusinessType())) {
number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest");
} else if ("OkToScrapJob".equals(inventorymoveRecordMainDO.getBusinessType())) { } else if ("OkToScrap".equals(inventorymoveRecordMainDO.getBusinessType())) {
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest");
}else { }else {
number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest");
} }
inventorymoveRecordMainDO.setNumber(number); inventorymoveRecordMainDO.setNumber(number);
inventorymoveRecordMainDO.setBusinessType(businesstypeDO.getCode()); inventorymoveRecordMainDO.setBusinessType(businesstypeDO.getCode());

40
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java
View File

@ -171,7 +171,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
CreateBusinessTypeAndRequestSetting(inventorymoveRequestMainDO,inventorymoveRequestDetailDO,itembasicDO,OkToScrapRequest); CreateBusinessTypeAndRequestSetting(inventorymoveRequestMainDO,inventorymoveRequestDetailDO,itembasicDO,OkToScrapRequest);
}//库存转移申请 }//库存转移申请
else { else {
String InventoryMoveRequest = "InventoryMoveRequest"; String InventoryMoveRequest = "MoveRequest";
CreateBusinessTypeAndRequestSetting(inventorymoveRequestMainDO,inventorymoveRequestDetailDO,itembasicDO,InventoryMoveRequest); CreateBusinessTypeAndRequestSetting(inventorymoveRequestMainDO,inventorymoveRequestDetailDO,itembasicDO,InventoryMoveRequest);
} }
validtebalance(inventorymoveRequestDetailDO); validtebalance(inventorymoveRequestDetailDO);
@ -322,7 +322,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
detailDo.setNumber(number); detailDo.setNumber(number);
// 校验业务类型 // 校验业务类型
try { try {
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest");
mainDO.setBusinessType(businesstypeDO.getCode()); mainDO.setBusinessType(businesstypeDO.getCode());
validationBusinesstype(detailDo,businesstypeDO,messageDetail); validationBusinesstype(detailDo,businesstypeDO,messageDetail);
} catch (ServiceException ex) { } catch (ServiceException ex) {
@ -343,7 +343,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
mainDO.setNumber(number); mainDO.setNumber(number);
// 校验业务类型 // 校验业务类型
try { try {
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest");
mainDO.setBusinessType(businesstypeDO.getCode()); mainDO.setBusinessType(businesstypeDO.getCode());
validationBusinesstype(detailDo,businesstypeDO,messageDetail); validationBusinesstype(detailDo,businesstypeDO,messageDetail);
} catch (ServiceException ex) { } catch (ServiceException ex) {
@ -363,7 +363,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
mainDO.setNumber(number); mainDO.setNumber(number);
// 校验业务类型 // 校验业务类型
try { try {
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest");
mainDO.setBusinessType(businesstypeDO.getCode()); mainDO.setBusinessType(businesstypeDO.getCode());
validationBusinesstype(detailDo,businesstypeDO,messageDetail); validationBusinesstype(detailDo,businesstypeDO,messageDetail);
} catch (ServiceException ex) { } catch (ServiceException ex) {
@ -383,7 +383,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
mainDO.setNumber(number); mainDO.setNumber(number);
// 校验业务类型 // 校验业务类型
try { try {
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest");
mainDO.setBusinessType(businesstypeDO.getCode()); mainDO.setBusinessType(businesstypeDO.getCode());
validationBusinesstype(detailDo,businesstypeDO,messageDetail); validationBusinesstype(detailDo,businesstypeDO,messageDetail);
} catch (ServiceException ex) { } catch (ServiceException ex) {
@ -403,7 +403,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
mainDO.setNumber(number); mainDO.setNumber(number);
// 校验业务类型 // 校验业务类型
try { try {
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest");
mainDO.setBusinessType(businesstypeDO.getCode()); mainDO.setBusinessType(businesstypeDO.getCode());
validationBusinesstype(detailDo,businesstypeDO,messageDetail); validationBusinesstype(detailDo,businesstypeDO,messageDetail);
} catch (ServiceException ex) { } catch (ServiceException ex) {
@ -426,7 +426,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
// 校验业务类型 // 校验业务类型
try { try {
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest");
mainDO.setBusinessType(businesstypeDO.getCode()); mainDO.setBusinessType(businesstypeDO.getCode());
validationBusinesstype(detailDo, businesstypeDO, messageDetail); validationBusinesstype(detailDo, businesstypeDO, messageDetail);
} catch (ServiceException ex) { } catch (ServiceException ex) {
@ -445,7 +445,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
mainDO.setNumber(number); mainDO.setNumber(number);
// 校验业务类型 // 校验业务类型
try { try {
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest");
mainDO.setBusinessType(businesstypeDO.getCode()); mainDO.setBusinessType(businesstypeDO.getCode());
validationBusinesstype(detailDo,businesstypeDO,messageDetail); validationBusinesstype(detailDo,businesstypeDO,messageDetail);
} catch (ServiceException ex) { } catch (ServiceException ex) {
@ -578,27 +578,27 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
if("HoldToOk".equals(mainDO.getBusinessType())){ if("HoldToOk".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest");
} else if("OkToHold".equals(mainDO.getBusinessType())){ } else if("OkToHold".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest");
} else if("HoldToScrap".equals(mainDO.getBusinessType())){ } else if("HoldToScrap".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest");
} else if("ScrapToHold".equals(mainDO.getBusinessType())){ } else if("ScrapToHold".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest");
} else if("OkToScrap".equals(mainDO.getBusinessType())){ } else if("OkToScrap".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest");
}else { }else {
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest");
} }
inventorymoveRecordMainCreateReqVO.setNumber(number); inventorymoveRecordMainCreateReqVO.setNumber(number);
inventorymoveRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); inventorymoveRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
@ -638,27 +638,27 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
if("HoldToOk".equals(mainDO.getBusinessType())){ if("HoldToOk".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_JOB.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("HoldToOkJob"); jobsettingDO = jobsettingService.selectJobsettingExist("HoldToOkJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest");
} else if("OkToHold".equals(mainDO.getBusinessType())){ } else if("OkToHold".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_JOB.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("OkToHoldJob"); jobsettingDO = jobsettingService.selectJobsettingExist("OkToHoldJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest");
} else if("HoldToScrap".equals(mainDO.getBusinessType())){ } else if("HoldToScrap".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_JOB.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("HoldToScrapJob"); jobsettingDO = jobsettingService.selectJobsettingExist("HoldToScrapJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest");
} else if("ScrapToHold".equals(mainDO.getBusinessType())){ } else if("ScrapToHold".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_JOB.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("ScrapToHoldJob"); jobsettingDO = jobsettingService.selectJobsettingExist("ScrapToHoldJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest");
} else if("OkToScrap".equals(mainDO.getBusinessType())){ } else if("OkToScrap".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_JOB.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("OkToScrapJob"); jobsettingDO = jobsettingService.selectJobsettingExist("OkToScrapJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest");
}else { }else {
number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_JOB.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("MoveJob"); jobsettingDO = jobsettingService.selectJobsettingExist("MoveJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest");
} }
inventorymoveJobMainDO.setNumber(number); inventorymoveJobMainDO.setNumber(number);
inventorymoveJobMainDO.setRequestTime(mainDO.getRequestTime()); inventorymoveJobMainDO.setRequestTime(mainDO.getRequestTime());

Write Preview
Loading…
Cancel
Save