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
452acad47c
commit
d4ad69db1f
2 changed files with 39 additions and 40 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. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java
  2. 64
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java

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

@ -235,7 +235,6 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
String number = ""; String number = "";
//查询数据 //查询数据
InventorymoveJobMainDO inventorymoveJobMainDO = this.validateInventorymoveJobMainExists(inventorymoveJobMainUpdateReqVO.getId()); InventorymoveJobMainDO inventorymoveJobMainDO = this.validateInventorymoveJobMainExists(inventorymoveJobMainUpdateReqVO.getId());
List<InventorymoveJobDetailDO> subList = inventorymoveJobDetailService.selectList(inventorymoveJobMainDO.getId());
JobStatusState jobStatusState = new JobStatusState(inventorymoveJobMainDO.getStatus()); JobStatusState jobStatusState = new JobStatusState(inventorymoveJobMainDO.getStatus());
boolean flag = jobStatusState.execute(); boolean flag = jobStatusState.execute();
if (!flag) { if (!flag) {
@ -263,27 +262,27 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
if ("HoldToOkJob".equals(inventorymoveRecordMainDO.getBusinessType())) { if ("HoldToOkJob".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("HoldToOkRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk");
} else if ("OkToHoldJob".equals(inventorymoveRecordMainDO.getBusinessType())) { } else if ("OkToHoldJob".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("OkToHoldRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold");
} else if ("HoldToScrapJob".equals(inventorymoveRecordMainDO.getBusinessType())) { } else if ("HoldToScrapJob".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("HoldToScrapRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap");
} else if ("ScrapToHoldJob".equals(inventorymoveRecordMainDO.getBusinessType())) { } else if ("ScrapToHoldJob".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("ScrapToHoldRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold");
} else if ("OkToScrapJob".equals(inventorymoveRecordMainDO.getBusinessType())) { } else if ("OkToScrapJob".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("OkToScrapRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap");
}else { }else {
number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("InventoryMoveRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move");
} }
inventorymoveRecordMainDO.setNumber(number); inventorymoveRecordMainDO.setNumber(number);
inventorymoveRecordMainDO.setBusinessType(businesstypeDO.getCode()); inventorymoveRecordMainDO.setBusinessType(businesstypeDO.getCode());

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

@ -322,7 +322,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
detailDo.setNumber(number); detailDo.setNumber(number);
// 校验业务类型 // 校验业务类型
try { try {
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk");
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("OkToHoldRequest"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold");
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("HoldToScrapRequest"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap");
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("ScrapToHoldRequest"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold");
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("OkToScrapRequest"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap");
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("OkToScrapRequest"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap");
mainDO.setBusinessType(businesstypeDO.getCode()); mainDO.setBusinessType(businesstypeDO.getCode());
validationBusinesstype(detailDo, businesstypeDO, messageDetail); validationBusinesstype(detailDo, businesstypeDO, messageDetail);
} catch (ServiceException ex) { } catch (ServiceException ex) {
@ -445,13 +445,13 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
mainDO.setNumber(number); mainDO.setNumber(number);
// 校验业务类型 // 校验业务类型
try { try {
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRequest"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move");
mainDO.setBusinessType(businesstypeDO.getCode()); mainDO.setBusinessType(businesstypeDO.getCode());
validationBusinesstype(detailDo,businesstypeDO,messageDetail); validationBusinesstype(detailDo,businesstypeDO,messageDetail);
} catch (ServiceException ex) { } catch (ServiceException ex) {
messageDetail += ex.getMessage() + ","; messageDetail += ex.getMessage() + ",";
} }
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("InventoryMoveRequest"); RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("MoveRequest");
if (requestsettingDO != null) { if (requestsettingDO != null) {
mainDO.setAutoAgree(requestsettingDO.getAutoAgree()); mainDO.setAutoAgree(requestsettingDO.getAutoAgree());
mainDO.setAutoCommit(requestsettingDO.getAutoCommit()); mainDO.setAutoCommit(requestsettingDO.getAutoCommit());
@ -575,30 +575,30 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
inventorymoveRecordMainCreateReqVO.setCreator(null); inventorymoveRecordMainCreateReqVO.setCreator(null);
inventorymoveRecordMainCreateReqVO.setCreateTime(null); inventorymoveRecordMainCreateReqVO.setCreateTime(null);
inventorymoveRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); inventorymoveRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
if("HoldToOkRequest".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("HoldToOkRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk");
} else if("OkToHoldRequest".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("OkToHoldRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold");
} else if("HoldToScrapRequest".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("HoldToScrapRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap");
} else if("ScrapToHoldRequest".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("ScrapToHoldRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold");
} else if("OkToScrapRequest".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("OkToScrapRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap");
}else { }else {
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("InventoryMoveRecord"); recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRecord"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move");
} }
inventorymoveRecordMainCreateReqVO.setNumber(number); inventorymoveRecordMainCreateReqVO.setNumber(number);
inventorymoveRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); inventorymoveRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
@ -635,30 +635,30 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
BeanUtils.copyProperties(mainDO, inventorymoveJobMainDO); BeanUtils.copyProperties(mainDO, inventorymoveJobMainDO);
inventorymoveJobMainDO.setRequestNumber(mainDO.getNumber()); inventorymoveJobMainDO.setRequestNumber(mainDO.getNumber());
inventorymoveJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); inventorymoveJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
if("HoldToOkRequest".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("HoldToOkJob"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk");
} else if("OkToHoldRequest".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("OkToHoldJob"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHold");
} else if("HoldToScrapRequest".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("HoldToScrapJob"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrap");
} else if("ScrapToHoldRequest".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("ScrapToHoldJob"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHold");
} else if("OkToScrapRequest".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("OkToScrapJob"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrap");
}else { }else {
number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_JOB.getCode()); number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("InventoryMoveJob"); jobsettingDO = jobsettingService.selectJobsettingExist("MoveJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveJob"); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Move");
} }
inventorymoveJobMainDO.setNumber(number); inventorymoveJobMainDO.setNumber(number);
inventorymoveJobMainDO.setRequestTime(mainDO.getRequestTime()); inventorymoveJobMainDO.setRequestTime(mainDO.getRequestTime());

Write Preview
Loading…
Cancel
Save