diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobDetailConvert.java index 6e09a605..d4efed54 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobDetailConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobDetailConvert.java @@ -1,16 +1,16 @@ package com.win.module.wms.convert.inspectJob; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExcelVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailRespVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; + +import java.util.List; /** * 检验任务子 Convert @@ -34,4 +34,6 @@ public interface InspectJobDetailConvert { List convertList02(List list); + InspectJobDetailDO convert(InspectRequestDetailDO bean); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java index bdb5a7be..b0e48c77 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java @@ -1,16 +1,16 @@ package com.win.module.wms.convert.inspectJob; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExcelVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; + +import java.util.List; /** * 检验任务主 Convert @@ -34,4 +34,6 @@ public interface InspectJobMainConvert { List convertList02(List list); + InspectJobMainDO convert(InspectRequestMainDO bean); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index ef25caf1..2aefdba5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -16,27 +16,40 @@ import com.win.module.system.api.dict.DictDataApi; import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; +import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.*; import com.win.module.wms.controller.rule.vo.RuleRespVO; +import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert; +import com.win.module.wms.convert.inspectJob.InspectJobMainConvert; import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; +import com.win.module.wms.dal.mysql.inspectJob.InspectJobDetailMapper; import com.win.module.wms.dal.mysql.inspectJob.InspectJobMainMapper; import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestDetailMapper; import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.enums.request.RequestStatusState; +import com.win.module.wms.service.expectout.ExpectoutService; +import com.win.module.wms.service.inspectRecord.InspectRecordDetailService; +import com.win.module.wms.service.inspectRecord.InspectRecordMainService; import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService; import com.win.module.wms.service.requestsetting.RequestsettingService; import com.win.module.wms.service.rule.RuleService; import com.win.module.wms.util.JobUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -69,6 +82,8 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService @Resource private InspectJobMainMapper inspectJobMainMapper; @Resource + private InspectJobDetailMapper inspectJobDetailMapper; + @Resource private PurchasereceiptRecordMainService purchasereceiptRecordMainService; @Resource private SerialNumberApi serialNumberApi; @@ -88,6 +103,12 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService private RequestsettingService requestsettingService; @Resource private TrendsApi trendsApi; + @Resource + private InspectRecordMainService inspectRecordMainService; + @Resource + private InspectRecordDetailService inspectRecordDetailService; + @Resource + private ExpectoutService expectoutService; @Override @Transactional @@ -329,7 +350,50 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService * @param detailDOList 收货检验子 */ private void generateJob(InspectRequestMainDO mainDO, List detailDOList) { - + //跳过任务直接生成记录 + if("TRUE".equals(mainDO.getDirectCreateRecord())) { + InspectRecordMainCreateReqVO inspectRecordMainCreateReqVO = new InspectRecordMainCreateReqVO(); + BeanUtils.copyProperties(mainDO, inspectRecordMainCreateReqVO); + inspectRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); + String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_RECORD.getCode()); + inspectRecordMainCreateReqVO.setNumber(number); + //增加业务类型 + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRecord"); + inspectRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); + inspectRecordMainService.createInspectRecordMain(inspectRecordMainCreateReqVO); + for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) { + InspectRecordDetailCreateReqVO inspectRecordDetailCreateReqVO = new InspectRecordDetailCreateReqVO(); + BeanUtils.copyProperties(inspectRequestDetailDO, inspectRecordDetailCreateReqVO); + inspectRecordDetailCreateReqVO.setNumber(number); + inspectRecordDetailService.createInspectRecordDetail(inspectRecordDetailCreateReqVO); + } + return; + } + List expectoutCreateReqVOList = new ArrayList<>(); + InspectJobMainDO inspectJobMainDO = InspectJobMainConvert.INSTANCE.convert(mainDO); + inspectJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); + String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_JOB.getCode()); + inspectJobMainDO.setNumber(number); + //增加业务类型 + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob"); + inspectJobMainDO.setBusinessType(businesstypeDO.getCode()); + inspectJobMainMapper.insert(inspectJobMainDO); + List inspectJobDetailDOList = new ArrayList<>(); + for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) { + InspectJobDetailDO inspectJobDetailDO = InspectJobDetailConvert.INSTANCE.convert(inspectRequestDetailDO); + inspectJobDetailDO.setNumber(number); + inspectJobDetailDO.setMasterId(inspectJobMainDO.getId()); + inspectJobDetailDOList.add(inspectJobDetailDO); + //预计出 + ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO(); + BeanUtils.copyProperties(inspectJobDetailDO, expectoutCreateReqVO); + expectoutCreateReqVO.setJobNumber(number); + expectoutCreateReqVOList.add(expectoutCreateReqVO); + } + inspectJobDetailMapper.insertBatch(inspectJobDetailDOList); + //增加预计出 + expectoutService.createExpectout(expectoutCreateReqVOList); + trendsApi.createTrends(inspectJobMainDO.getId(), "purchasereceiptJob", "到货检验申请生成到货检验任务", TrendsTypeEnum.CREATE); } //判断导入单位是否正确 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index aa396012..89fc95a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -506,7 +506,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq subList.add(purchasereceiptJobDetailCreateReqVO); } } - List createReqVOList = new ArrayList<>(); + List expectinCreateReqVOList = new ArrayList<>(); //把任务插入数据库 for(PurchasereceiptJobMainCreateReqVO purchasereceiptJobMainCreateReqVO : purchasereceiptJobMainCreateReqVOList) { PurchasereceiptJobMainDO purchasereceiptJobMainDO = PurchasereceiptJobMainConvert.INSTANCE.convert(purchasereceiptJobMainCreateReqVO); @@ -527,11 +527,11 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq ExpectinCreateReqVO expectinCreateReqVO = new ExpectinCreateReqVO(); BeanUtils.copyProperties(purchasereceiptJobDetailDO, expectinCreateReqVO); expectinCreateReqVO.setJobNumber(number); - createReqVOList.add(expectinCreateReqVO); + expectinCreateReqVOList.add(expectinCreateReqVO); } purchasereceiptJobDetailMapper.insertBatch(purchasereceiptJobDetailDOList); //增加预计入 - expectinService.createExpectin(createReqVOList); + expectinService.createExpectin(expectinCreateReqVOList); trendsApi.createTrends(purchasereceiptJobMainDO.getId(), "purchasereceiptJob", "采购收货申请生成采购收货任务", TrendsTypeEnum.CREATE); } }