diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index 8925c6ae..cd28ba21 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -195,11 +195,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { //增加业务类型 BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountRecord"); countRecordMainDO.setBusinessType(businesstypeDO.getCode()); - countRecordMainDO.setId(null); - countRecordMainDO.setCreator(null); - countRecordMainDO.setCreateTime(null); - countRecordMainDO.setUpdater(null); - countRecordMainDO.setUpdateTime(null); + countRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); countRecordMainMapper.insert(countRecordMainDO); CountRequestMainDO countRequestMainDO = countRequestMainMapper.selectByNumber(countJobMainDO.getRequestNumber()); List countJobDetailUpdateReqVOList = countJobMainUpdateReqVO.getSubList(); @@ -215,11 +211,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { countRecordDetailDO.setMasterId(countRecordMainDO.getId()); countRecordDetailDO.setNumber(number); countRecordDetailDO.setJobDetailId(String.valueOf(countJobDetailUpdateReqVO.getId())); - countRecordDetailDO.setId(null); - countRecordDetailDO.setCreator(null); - countRecordDetailDO.setCreateTime(null); - countRecordDetailDO.setUpdater(null); - countRecordDetailDO.setUpdateTime(null); + countRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); countRecordDetailDOList.add(countRecordDetailDO); //新增任务子数据，回写到申请子表中 if(countJobDetailUpdateReqVO.getId() == 0) { @@ -227,11 +219,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { BeanUtils.copyProperties(countJobDetailUpdateReqVO, countRequestDetailDO); countRequestDetailDO.setMasterId(countRequestMainDO.getId()); countRequestDetailDO.setNumber(countRequestMainDO.getNumber()); - countRequestDetailDO.setId(null); - countRequestDetailDO.setCreator(null); - countRequestDetailDO.setCreateTime(null); - countRequestDetailDO.setUpdater(null); - countRequestDetailDO.setUpdateTime(null); + countRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); countRequestDetailDOList.add(countRequestDetailDO); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 8a7e2aa2..75723d08 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -418,11 +418,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); countJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); countJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); - countJobMainDO.setId(null); - countJobMainDO.setCreateTime(null); - countJobMainDO.setCreator(null); - countJobMainDO.setUpdateTime(null); - countJobMainDO.setUpdater(null); + countJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_JOB.getCode()); countJobMainDO.setNumber(number); countJobMainMapper.insert(countJobMainDO); @@ -434,11 +430,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { CountJobDetailDO countJobDetailDO = CountJobDetailConvert.INSTANCE.convert(countRequestDetailDO); countJobDetailDO.setNumber(number); countJobDetailDO.setMasterId(countJobMainDO.getId()); - countJobDetailDO.setId(null); - countJobDetailDO.setCreateTime(null); - countJobDetailDO.setCreator(null); - countJobDetailDO.setUpdateTime(null); - countJobDetailDO.setUpdater(null); + countJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); countJobDetailDOList.add(countJobDetailDO); } } @@ -467,11 +459,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countadjustRequestDetailDO.setAdjustQty(countRecordDetailDO.getQty().subtract(countRecordDetailDO.getCountQty())); //调整数量的绝对值 countadjustRequestDetailDO.setQty(countadjustRequestDetailDO.getAdjustQty().abs()); - countadjustRequestDetailDO.setId(null); - countadjustRequestDetailDO.setCreator(null); - countadjustRequestDetailDO.setCreateTime(null); - countadjustRequestDetailDO.setUpdater(null); - countadjustRequestDetailDO.setUpdateTime(null); + countadjustRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); countadjustRequestDetailDOList.add(countadjustRequestDetailDO); } int result = 0; @@ -490,11 +478,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countadjustRequestMainDO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); countadjustRequestMainDO.setCountRequestNumber(countRequestMainDO.getNumber()); countadjustRequestMainDO.setStatus(RequestStatusEnum.NEW.getCode()); - countadjustRequestMainDO.setId(null); - countadjustRequestMainDO.setCreator(null); - countadjustRequestMainDO.setCreateTime(null); - countadjustRequestMainDO.setUpdater(null); - countadjustRequestMainDO.setUpdateTime(null); + countadjustRequestMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); result = countadjustRequestMainMapper.insert(countadjustRequestMainDO); for(CountadjustRequestDetailDO countadjustRequestDetailDO : countadjustRequestDetailDOList) { countadjustRequestDetailDO.setMasterId(countadjustRequestMainDO.getId()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index becea038..bcaadad8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -224,11 +224,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { inspectRecordMainDO.setNumber(number); inspectRecordMainDO.setJobNumber(inspectJobMainDO.getNumber()); inspectRecordMainDO.setFromWarehouseCode(inspectJobMainDO.getWarehouseCode()); - inspectRecordMainDO.setId(null); - inspectRecordMainDO.setCreator(null); - inspectRecordMainDO.setCreateTime(null); - inspectRecordMainDO.setUpdater(null); - inspectRecordMainDO.setUpdateTime(null); + inspectRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); inspectRecordMainMapper.insert(inspectRecordMainDO); BigDecimal goodQty = BigDecimal.ZERO; BigDecimal failedQty = BigDecimal.ZERO; @@ -250,11 +246,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { inspectRecordDetailDO.setMasterId(inspectRecordMainDO.getId()); inspectRecordDetailDO.setNumber(number); inspectRecordDetailDO.setJobDetailId(String.valueOf(inspectJobDetailUpdateReqVO.getId())); - inspectRecordDetailDO.setId(null); - inspectRecordDetailDO.setCreator(null); - inspectRecordDetailDO.setCreateTime(null); - inspectRecordDetailDO.setUpdater(null); - inspectRecordDetailDO.setUpdateTime(null); + inspectRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); inspectRecordDetailDOList.add(inspectRecordDetailDO); //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(inspectJobDetailUpdateReqVO.getPackingNumber(), inspectJobMainUpdateReqVO.getItemCode(), inspectJobMainUpdateReqVO.getBatch(), inspectJobDetailUpdateReqVO.getInventoryStatus(), inspectJobDetailUpdateReqVO.getFromLocationCode()); @@ -357,18 +349,10 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { requestMainDO.setInspectType("FULL"); requestMainDO.setSampleMethod("QTY"); requestMainDO.setStatus(RequestStatusEnum.NEW.getCode()); - requestMainDO.setId(null); - requestMainDO.setCreator(null); - requestMainDO.setCreateTime(null); - requestMainDO.setUpdater(null); - requestMainDO.setUpdateTime(null); + requestMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); inspectRequestMainMapper.insert(requestMainDO); for(InspectRequestDetailDO inspectRequestDetailDO : requestDetailDOList) { - inspectRequestDetailDO.setId(null); - inspectRequestDetailDO.setCreator(null); - inspectRequestDetailDO.setCreateTime(null); - inspectRequestDetailDO.setUpdater(null); - inspectRequestDetailDO.setUpdateTime(null); + inspectRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); inspectRequestDetailDO.setMasterId(requestMainDO.getId()); inspectRequestDetailDO.setNumber(requestNumber); } @@ -394,25 +378,18 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { } PutawayRequestDetailCreateReqVO putawayRequestDetailCreateReqVO = new PutawayRequestDetailCreateReqVO(); BeanUtils.copyProperties(inspectJobDetailUpdateReqVO, putawayRequestDetailCreateReqVO); + putawayRequestDetailCreateReqVO.setQty(inspectJobDetailUpdateReqVO.getGoodQty()); putawayRequestDetailCreateReqVO.setBatch(inspectRecordMainDO.getBatch()); putawayRequestDetailCreateReqVO.setPoNumber(inspectRecordMainDO.getPoNumber()); putawayRequestDetailCreateReqVO.setPoLine(inspectRecordMainDO.getPoLine()); putawayRequestDetailCreateReqVO.setItemCode(inspectRecordMainDO.getItemCode()); putawayRequestDetailCreateReqVO.setItemName(inspectRecordMainDO.getItemCode()); putawayRequestDetailCreateReqVO.setInventoryStatus("OK"); - putawayRequestDetailCreateReqVO.setId(null); - putawayRequestDetailCreateReqVO.setCreateTime(null); - putawayRequestDetailCreateReqVO.setCreator(null); - putawayRequestDetailCreateReqVO.setUpdateTime(null); - putawayRequestDetailCreateReqVO.setUpdater(null); + putawayRequestDetailCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRequestDetailCreateReqVOList.add(putawayRequestDetailCreateReqVO); } putawayRequestMainCreateReqVO.setToWarehouseCode(inspectRecordMainDO.getFromWarehouseCode()); - putawayRequestMainCreateReqVO.setId(null); - putawayRequestMainCreateReqVO.setCreateTime(null); - putawayRequestMainCreateReqVO.setCreator(null); - putawayRequestMainCreateReqVO.setUpdateTime(null); - putawayRequestMainCreateReqVO.setUpdater(null); + putawayRequestMainCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRequestMainCreateReqVO.setSubList(putawayRequestDetailCreateReqVOList); if(!putawayRequestDetailCreateReqVOList.isEmpty()) { putawayRequestMainService.createPutawayRequestMain(putawayRequestMainCreateReqVO); 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 824f49a4..b57a15ae 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 @@ -403,11 +403,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService inspectJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); inspectJobMainDO.setRequestNumber(mainDO.getNumber()); inspectJobMainDO.setWarehouseCode(mainDO.getFromWarehouseCode()); - inspectJobMainDO.setId(null); - inspectJobMainDO.setCreator(null); - inspectJobMainDO.setCreateTime(null); - inspectJobMainDO.setUpdater(null); - inspectJobMainDO.setUpdateTime(null); + inspectJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_JOB.getCode()); inspectJobMainDO.setNumber(number); //增加业务类型 @@ -422,11 +418,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService InspectJobDetailDO inspectJobDetailDO = InspectJobDetailConvert.INSTANCE.convert(inspectRequestDetailDO); inspectJobDetailDO.setNumber(number); inspectJobDetailDO.setMasterId(inspectJobMainDO.getId()); - inspectJobDetailDO.setId(null); - inspectJobDetailDO.setCreator(null); - inspectJobDetailDO.setCreateTime(null); - inspectJobDetailDO.setUpdater(null); - inspectJobDetailDO.setUpdateTime(null); + inspectJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); inspectJobDetailDOList.add(inspectJobDetailDO); //预计出 ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 606ddc7b..75a8e535 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -263,11 +263,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain purchasereceiptRecordMainDO.setActiveDate(LocalDateTime.now()); purchasereceiptRecordMainDO.setDueTime(purchasereceiptJobMainDO.getRequestDueTime()); purchasereceiptRecordMainDO.setAvailable("TRUE"); - purchasereceiptRecordMainDO.setId(null); - purchasereceiptRecordMainDO.setCreateTime(null); - purchasereceiptRecordMainDO.setCreator(null); - purchasereceiptRecordMainDO.setUpdateTime(null); - purchasereceiptRecordMainDO.setUpdater(null); + purchasereceiptRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereceiptRecordMainMapper.insert(purchasereceiptRecordMainDO); List purchasereceiptJobDetailUpdateReqVOList = purchasereceiptJobMainUpdateReqVO.getSubList(); //收货记录子 @@ -311,11 +307,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode()); purchasereceiptRecordDetailDO.setSinglePrice(purchaseDetailDO.getSinglePrice()); purchasereceiptRecordDetailDO.setAmount(purchaseDetailDO.getSinglePrice().multiply(purchasereceiptRecordDetailDO.getQty())); - purchasereceiptRecordDetailDO.setId(null); - purchasereceiptRecordDetailDO.setCreateTime(null); - purchasereceiptRecordDetailDO.setCreator(null); - purchasereceiptRecordDetailDO.setUpdateTime(null); - purchasereceiptRecordDetailDO.setUpdater(null); + purchasereceiptRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereceiptRecordDetailDOList.add(purchasereceiptRecordDetailDO); BigDecimal poQty = poQtyMap.get(purchasereceiptRecordDetailDO.getPoNumber() + "_" + purchasereceiptRecordDetailDO.getPoLine() + "_" + purchasereceiptRecordDetailDO.getItemCode()); if(poQty == null) { @@ -363,11 +355,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode()); purchaseshortageDetailDO.setSinglePrice(purchaseDetailDO.getSinglePrice()); purchaseshortageDetailDO.setAmount(purchaseDetailDO.getSinglePrice().multiply(purchaseshortageDetailDO.getQty())); - purchaseshortageDetailDO.setId(null); - purchaseshortageDetailDO.setCreateTime(null); - purchaseshortageDetailDO.setCreator(null); - purchaseshortageDetailDO.setUpdateTime(null); - purchaseshortageDetailDO.setUpdater(null); + purchaseshortageDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchaseshortageDetailDOList.add(purchaseshortageDetailDO); } } @@ -479,18 +467,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain putawayRequestDetailCreateReqVO.setBatch(purchasereceiptRecordDetailDO.getToBatch()); putawayRequestDetailCreateReqVO.setFromLocationCode(purchasereceiptRecordDetailDO.getToLocationCode()); putawayRequestDetailCreateReqVO.setInventoryStatus("OK"); - putawayRequestDetailCreateReqVO.setId(null); - putawayRequestDetailCreateReqVO.setCreateTime(null); - putawayRequestDetailCreateReqVO.setCreator(null); - putawayRequestDetailCreateReqVO.setUpdateTime(null); - putawayRequestDetailCreateReqVO.setUpdater(null); + putawayRequestDetailCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRequestDetailCreateReqVOList.add(putawayRequestDetailCreateReqVO); } - putawayRequestMainCreateReqVO.setId(null); - putawayRequestMainCreateReqVO.setCreateTime(null); - putawayRequestMainCreateReqVO.setCreator(null); - putawayRequestMainCreateReqVO.setUpdateTime(null); - putawayRequestMainCreateReqVO.setUpdater(null); + putawayRequestMainCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRequestMainCreateReqVO.setSubList(putawayRequestDetailCreateReqVOList); putawayRequestMainService.createPutawayRequestMain(putawayRequestMainCreateReqVO); } 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 009ce73e..850afdf9 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 @@ -514,11 +514,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq purchasereceiptJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_JOB.getCode()); purchasereceiptJobMainDO.setNumber(number); - purchasereceiptJobMainDO.setId(null); - purchasereceiptJobMainDO.setCreateTime(null); - purchasereceiptJobMainDO.setCreator(null); - purchasereceiptJobMainDO.setUpdateTime(null); - purchasereceiptJobMainDO.setUpdater(null); + purchasereceiptJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); //增加业务类型 BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptJob"); purchasereceiptJobMainDO.setBusinessType(businesstypeDO.getCode()); @@ -530,11 +526,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq PurchasereceiptJobDetailDO purchasereceiptJobDetailDO = PurchasereceiptJobDetailConvert.INSTANCE.convert(purchasereceiptJobDetailCreateReqVO); purchasereceiptJobDetailDO.setNumber(number); purchasereceiptJobDetailDO.setMasterId(purchasereceiptJobMainDO.getId()); - purchasereceiptJobDetailDO.setId(null); - purchasereceiptJobDetailDO.setCreateTime(null); - purchasereceiptJobDetailDO.setCreator(null); - purchasereceiptJobDetailDO.setUpdateTime(null); - purchasereceiptJobDetailDO.setUpdater(null); + purchasereceiptJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereceiptJobDetailDOList.add(purchasereceiptJobDetailDO); //预计入 ExpectinCreateReqVO expectinCreateReqVO = new ExpectinCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 120659d7..4e41bed2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -230,11 +230,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RETURN_RECORD.getCode()); purchasereturnRecordMainDO.setNumber(number); purchasereturnRecordMainDO.setJobNumber(purchasereturnJobMainDO.getNumber()); - purchasereturnRecordMainDO.setId(null); - purchasereturnRecordMainDO.setCreateTime(null); - purchasereturnRecordMainDO.setCreator(null); - purchasereturnRecordMainDO.setUpdateTime(null); - purchasereturnRecordMainDO.setUpdater(null); + purchasereturnRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereturnRecordMainMapper.insert(purchasereturnRecordMainDO); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); List purchasereturnJobDetailUpdateReqVOList = purchasereturnJobMainUpdateReqVO.getSubList(); @@ -257,11 +253,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe purchasereturnRecordDetailDO.setToBatch(purchasereturnJobDetailUpdateReqVO.getToBatch()); purchasereturnRecordDetailDO.setInventoryStatus(purchasereturnJobDetailUpdateReqVO.getToInventoryStatus()); purchasereturnRecordDetailDO.setToLocationCode(purchasereturnJobDetailUpdateReqVO.getToLocationCode()); - purchasereturnRecordDetailDO.setId(null); - purchasereturnRecordDetailDO.setCreateTime(null); - purchasereturnRecordDetailDO.setCreator(null); - purchasereturnRecordDetailDO.setUpdateTime(null); - purchasereturnRecordDetailDO.setUpdater(null); + purchasereturnRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereturnRecordDetailDOList.add(purchasereturnRecordDetailDO); //更新采购订单明细的退货数量 purchaseMainService.updateOrderPurchaseReturnQty(purchasereturnRecordDetailDO.getPoNumber(), purchasereturnRecordDetailDO.getPoLine(), purchasereturnRecordDetailDO.getItemCode(), purchasereturnRecordDetailDO.getQty()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 8c21dbc2..9e728df4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -120,7 +120,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque mainDO.setNumber(number); purchasereturnRequestMainMapper.insert(mainDO); for (PurchasereturnRequestDetailDO detailDO : subDOList) { - detailDO.setId(null); + detailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); detailDO.setMasterId(mainDO.getId()); detailDO.setNumber(number); } @@ -373,11 +373,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque purchasereturnJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber()); purchasereturnJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach()); purchasereturnJobMainDO.setRequestTime(mainDO.getRequestTime()); - purchasereturnJobMainDO.setId(null); - purchasereturnJobMainDO.setCreateTime(null); - purchasereturnJobMainDO.setCreator(null); - purchasereturnJobMainDO.setUpdateTime(null); - purchasereturnJobMainDO.setUpdater(null); + purchasereturnJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); purchasereturnJobMainDO.setBusinessType(businesstypeDO.getCode()); purchasereturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); @@ -389,11 +385,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnRequestDetailDO); purchasereturnJobDetailDO.setToLocationCode(purchasereturnRequestDetailDO.getToLocationCode()); purchasereturnJobDetailDO.setNumber(number); - purchasereturnJobDetailDO.setId(null); - purchasereturnJobDetailDO.setCreateTime(null); - purchasereturnJobDetailDO.setCreator(null); - purchasereturnJobDetailDO.setUpdateTime(null); - purchasereturnJobDetailDO.setUpdater(null); + purchasereturnJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereturnJobDetailDO.setMasterId(purchasereturnJobMainDO.getId()); purchasereturnJobDetailDO.setFromLocationCode(purchasereturnRequestDetailDO.getFromLocationCode()); purchasereturnJobDetailDO.setToOwnerCode(purchasereturnRequestDetailDO.getToOwnerCode()); @@ -450,7 +442,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque requestsettingAndBusinesstypeSet(mainDO); //子表校验 for (PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : subDOList) { - purchasereturnRequestDetailDO.setId(null); + purchasereturnRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); validatorDetailMethod(purchasereturnRequestDetailDO, mainDO); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index 14222001..de92567d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -193,11 +193,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_RECORD.getCode()); putawayRecordMainDO.setNumber(number); putawayRecordMainDO.setJobNumber(putawayJobMainDO.getNumber()); - putawayRecordMainDO.setId(null); - putawayRecordMainDO.setCreator(null); - putawayRecordMainDO.setCreateTime(null); - putawayRecordMainDO.setUpdater(null); - putawayRecordMainDO.setUpdateTime(null); + putawayRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRecordMainMapper.insert(putawayRecordMainDO); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob"); //库存事务 @@ -218,11 +214,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { putawayRecordDetailDO.setFromBatch(putawayJobDetailUpdateReqVO.getBatch()); putawayRecordDetailDO.setToBatch(putawayJobDetailUpdateReqVO.getToBatch()); putawayRecordDetailDO.setInventoryStatus(putawayJobDetailUpdateReqVO.getToInventoryStatus()); - putawayRecordDetailDO.setId(null); - putawayRecordDetailDO.setCreator(null); - putawayRecordDetailDO.setCreateTime(null); - putawayRecordDetailDO.setUpdater(null); - putawayRecordDetailDO.setUpdateTime(null); + putawayRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRecordDetailDOList.add(putawayRecordDetailDO); //添加库存事务入list TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java index af3cbb3b..8f5bee32 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java @@ -359,11 +359,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService putawayJobMainDO.setBusinessType(businesstypeDO.getCode()); putawayJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); putawayJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); - putawayJobMainDO.setId(null); - putawayJobMainDO.setCreateTime(null); - putawayJobMainDO.setCreator(null); - putawayJobMainDO.setUpdateTime(null); - putawayJobMainDO.setUpdater(null); + putawayJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayJobMainMapper.insert(putawayJobMainDO); List putawayJobDetailDOList = new ArrayList<>(); for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) { @@ -373,11 +369,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService putawayJobDetailDO.setToLocationCode(locationDO.getCode()); putawayJobDetailDO.setNumber(number); putawayJobDetailDO.setMasterId(putawayJobMainDO.getId()); - putawayJobDetailDO.setId(null); - putawayJobDetailDO.setCreateTime(null); - putawayJobDetailDO.setCreator(null); - putawayJobDetailDO.setUpdateTime(null); - putawayJobDetailDO.setUpdater(null); + putawayJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayJobDetailDOList.add(putawayJobDetailDO); //预计出 ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO();