From 2cc969ae7e97cc803975e494f79af5a883cc0a2f Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 18 Dec 2023 11:03:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=9B=91=E7=9B=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countRequest/CountRequestMainServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 f0dc5cb8..2ea140d0 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 @@ -416,13 +416,13 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); countJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); countJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); - String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_JOB.getCode()); - countJobMainDO.setNumber(number); countJobMainDO.setId(null); countJobMainDO.setCreateTime(null); countJobMainDO.setCreator(null); countJobMainDO.setUpdateTime(null); countJobMainDO.setUpdater(null); + String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_JOB.getCode()); + countJobMainDO.setNumber(number); countJobMainMapper.insert(countJobMainDO); List countJobDetailDOList = new ArrayList<>(); List countRequestDetailDOList = listMap.get(mapKey); @@ -432,6 +432,11 @@ 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); countJobDetailDOList.add(countJobDetailDO); } } From 125cd7c8d97d924bb89c8b74995c3baa0fef0dff Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 18 Dec 2023 11:06:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9E=E7=89=A9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/service/countJob/CountJobMainServiceImpl.java | 3 +++ .../wms/service/countPlan/CountPlanMainServiceImpl.java | 4 ++++ .../service/countRequest/CountRequestDetailServiceImpl.java | 4 ++++ .../wms/service/countRequest/CountRequestMainServiceImpl.java | 2 ++ .../inspectRequest/InspectRequestDetailServiceImpl.java | 4 ++++ .../purchasereturnJob/PurchasereturnJobMainServiceImpl.java | 2 +- .../PurchasereturnRequestDetailServiceImpl.java | 4 ++++ .../PurchasereturnRequestMainServiceImpl.java | 3 +++ .../putawayRequest/PutawayRequestDetailServiceImpl.java | 4 ++++ 9 files changed, 29 insertions(+), 1 deletion(-) 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 180d96ad..8925c6ae 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 @@ -121,6 +121,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { } @Override + @Transactional public Integer acceptCountJobMain(Long id) { CountJobMainDO countJobMainDO = this.validateCountJobMainExists(id); JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus()); @@ -138,6 +139,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { } @Override + @Transactional public Integer abandonCountJobMain(Long id) { CountJobMainDO countJobMainDO = this.validateCountJobMainExists(id); JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus()); @@ -166,6 +168,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { } @Override + @Transactional public String executeCountJobMain(CountJobMainUpdateReqVO countJobMainUpdateReqVO) { //查询数据 CountJobMainDO countJobMainDO = this.validateCountJobMainExists(countJobMainUpdateReqVO.getId()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java index 9c5a49b8..9f8eed67 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java @@ -83,6 +83,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { private SchedulerManager schedulerManager; @Override + @Transactional public Long createCountPlanMain(CountPlanMainCreateReqVO createReqVO) { if(!createReqVO.getType().equals("MANUAL")) { if (!CronUtils.isValid(createReqVO.getCrontab())) { @@ -105,6 +106,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { } @Override + @Transactional public int updateCountPlanMain(CountPlanMainUpdateReqVO updateReqVO) { // 校验存在 validateCountPlanMainExists(updateReqVO.getId()); @@ -115,6 +117,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { } @Override + @Transactional public int deleteCountPlanMain(Long id) { // 校验存在 validateCountPlanMainExists(id); @@ -306,6 +309,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { * @param mainDO 盘点申请主 */ @Override + @Transactional public void generateRequest(CountPlanMainDO mainDO) { List detailDOList = countPlanDetailMapper.selectList(mainDO.getId()); List balanceDOList = this.getBalanceDOList(detailDOList); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailServiceImpl.java index c1422537..e2e98d40 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailServiceImpl.java @@ -11,6 +11,7 @@ import com.win.module.wms.convert.countRequest.CountRequestDetailConvert; import com.win.module.wms.dal.dataobject.countRequest.CountRequestDetailDO; import com.win.module.wms.dal.mysql.countRequest.CountRequestDetailMapper; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; @@ -35,6 +36,7 @@ public class CountRequestDetailServiceImpl implements CountRequestDetailService private TrendsApi trendsApi; @Override + @Transactional public Long createCountRequestDetail(CountRequestDetailCreateReqVO createReqVO) { // 插入 CountRequestDetailDO countRequestDetailDO = CountRequestDetailConvert.INSTANCE.convert(createReqVO); @@ -45,6 +47,7 @@ public class CountRequestDetailServiceImpl implements CountRequestDetailService } @Override + @Transactional public int updateCountRequestDetail(CountRequestDetailUpdateReqVO updateReqVO) { // 校验存在 validateCountRequestDetailExists(updateReqVO.getId()); @@ -55,6 +58,7 @@ public class CountRequestDetailServiceImpl implements CountRequestDetailService } @Override + @Transactional public int deleteCountRequestDetail(Long id) { // 校验存在 CountRequestDetailDO countRequestDetailDO = validateCountRequestDetailExists(id); 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 2ea140d0..8a7e2aa2 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 @@ -344,6 +344,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { } @Override + @Transactional public Integer createReCountJob(CountRequestMainUpdateReqVO updateReqVO) { CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO); mainDO.setStage("RECOUNT");//重盘 @@ -361,6 +362,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { } @Override + @Transactional public Integer createSuperviseCountJob(CountRequestMainUpdateReqVO updateReqVO) { CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO); mainDO.setStage("AUDIT_COUNT");//监盘 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java index 4d042522..0bcd4bc4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java @@ -22,6 +22,7 @@ import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.util.JobUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; @@ -56,6 +57,7 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ private TrendsApi trendsApi; @Override + @Transactional public Long createInspectRequestDetail(InspectRequestDetailCreateReqVO createReqVO) { // 插入 InspectRequestDetailDO inspectRequestDetail = InspectRequestDetailConvert.INSTANCE.convert(createReqVO); @@ -69,6 +71,7 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ } @Override + @Transactional public int updateInspectRequestDetail(InspectRequestDetailUpdateReqVO updateReqVO) { // 校验存在 validateInspectRequestDetailExists(updateReqVO.getId()); @@ -79,6 +82,7 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ } @Override + @Transactional public int deleteInspectRequestDetail(Long id) { // 校验存在 InspectRequestDetailDO inspectRequestDetailDO = validateInspectRequestDetailExists(id); 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 bd3091d3..120659d7 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 @@ -117,7 +117,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe * @param ppoLine 订单行 * @return 供应商发货记录子 */ - public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode, String pnumber, String pitemCode, String ppoNumber, String ppoLine) { + private SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode, String pnumber, String pitemCode, String ppoNumber, String ppoLine) { SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(psupplierCode, pnumber, pitemCode, ppoNumber, ppoLine); if (supplierdeliverRecordDetailDO != null) { return supplierdeliverRecordDetailDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java index ea239b08..8719e5e0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java @@ -16,6 +16,7 @@ import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.itempackaging.ItempackagingService; import com.win.module.wms.util.JobUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; @@ -46,6 +47,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq private ItempackagingService itempackagingService; @Override + @Transactional public Long createPurchasereturnRequestDetail(PurchasereturnRequestDetailCreateReqVO createReqVO) { // 插入 PurchasereturnRequestDetailDO purchasereturnRequestDetailDO = PurchasereturnRequestDetailConvert.INSTANCE.convert(createReqVO); @@ -57,6 +59,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq } @Override + @Transactional public void updatePurchasereturnRequestDetail(PurchasereturnRequestDetailUpdateReqVO updateReqVO) { // 校验存在 validatePurchasereturnRequestDetailExists(updateReqVO.getId()); @@ -66,6 +69,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq } @Override + @Transactional public void deletePurchasereturnRequestDetail(Long id) { // 校验存在 validatePurchasereturnRequestDetailExists(id); 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 1332e121..8c21dbc2 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 @@ -110,6 +110,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque private JobsettingService jobsettingService; @Override + @Transactional public Long createPurchasereturnRequestMain(PurchasereturnRequestMainCreateReqVO createReqVO) { PurchasereturnRequestMainDO mainDO = PurchasereturnRequestMainConvert.INSTANCE.convert(createReqVO); List subDOList = PurchasereturnRequestDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); @@ -134,6 +135,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque } @Override + @Transactional public int updatePurchasereturnRequestMain(PurchasereturnRequestMainUpdateReqVO updateReqVO) { // 校验存在 validatePurchasereturnRequestMainExists(updateReqVO.getId()); @@ -169,6 +171,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque } @Override + @Transactional public List importPurchasereturnRequestList(List datas, Integer mode, boolean updatePart) { if (CollUtil.isEmpty(datas)) { throw exception(PURCHASERETURN_REQUEST_IMPORT_LIST_IS_EMPTY); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java index 114b8fa7..d8cdaab5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java @@ -10,6 +10,7 @@ import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert; import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO; import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestDetailMapper; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; @@ -31,6 +32,7 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ private PutawayRequestDetailMapper putawayRequestDetailMapper; @Override + @Transactional public Long createPutawayRequestDetail(PutawayRequestDetailCreateReqVO createReqVO) { // 插入 PutawayRequestDetailDO putawayRequestDetail = PutawayRequestDetailConvert.INSTANCE.convert(createReqVO); @@ -43,6 +45,7 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ return putawayRequestDetailMapper.selectSenior(conditions); } @Override + @Transactional public void updatePutawayRequestDetail(PutawayRequestDetailUpdateReqVO updateReqVO) { // 校验存在 validatePutawayRequestDetailExists(updateReqVO.getId()); @@ -52,6 +55,7 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ } @Override + @Transactional public void deletePutawayRequestDetail(Long id) { // 校验存在 validatePutawayRequestDetailExists(id);