From 357321d3e35ee729d297b96f5168dd7b6f41b10c Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 18 Dec 2023 13:53:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/transaction/TransactionServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java index ac74b50c..5888af49 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java @@ -12,9 +12,11 @@ import com.win.module.wms.controller.transaction.vo.TransactionPageReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogCreateReqVO; import com.win.module.wms.convert.transaction.TransactionConvert; import com.win.module.wms.convert.transferlog.TransferlogConvert; +import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.transaction.TransactionDO; import com.win.module.wms.dal.dataobject.transferlog.TransferlogDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; +import com.win.module.wms.dal.mysql.location.LocationMapper; import com.win.module.wms.dal.mysql.transaction.TransactionMapper; import com.win.module.wms.dal.mysql.transferlog.TransferlogMapper; import com.win.module.wms.service.rule.RuleService; @@ -37,16 +39,14 @@ public class TransactionServiceImpl implements TransactionService { @Resource private TransactionMapper transactionMapper; - @Resource private BalanceMapper balanceMapper; - @Resource private TransferlogMapper transferlogMapper; - + @Resource + private LocationMapper locationMapper; @Resource private RuleService ruleService; - @Resource private SerialNumberApi serialNumberApi; @@ -62,6 +62,10 @@ public class TransactionServiceImpl implements TransactionService { result += transactionMapper.insert(transactionDO); BalanceCreateReqVO balanceCreateReqVO = new BalanceCreateReqVO(); BeanUtils.copyProperties(createReqVO, balanceCreateReqVO); + LocationDO locationDO = locationMapper.selectByCode(balanceCreateReqVO.getLocationCode()); + balanceCreateReqVO.setWarehouseCode(locationDO.getWarehouseCode()); + balanceCreateReqVO.setAreaCode(locationDO.getAreaCode()); + balanceCreateReqVO.setLocationGroupCode(locationDO.getLocationGroupCode()); balanceCreateReqVO.setLastTransNumber(number); RuleRespVO ruleRespVO = ruleService.warehouseStorage(createReqVO.getLocationCode()); balanceMapper.updateBalanceQty(balanceCreateReqVO, ruleRespVO, createReqVO.getInventoryAction()); From 303953e536f919bcda09d1e747ecfefb1a02d5f0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 18 Dec 2023 13:55:00 +0800 Subject: [PATCH 2/3] =?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 --- .../wms/service/countRequest/CountRequestMainServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 1ea99745..52af467a 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 @@ -485,6 +485,8 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countadjustRequestDetailDO.setNumber(adjustNumber); } countadjustRequestDetailMapper.insertBatch(countadjustRequestDetailDOList); + countRequestMainDO.setCountAdjustStatus("3"); + countRequestMainMapper.updateById(countRequestMainDO); trendsApi.createTrends(countadjustRequestMainDO.getId(), "countadjustRequest", "生成了盘点调整申请", TrendsTypeEnum.CREATE); } return result; From 0a2d5e7f8d62952a6172c7bbfa54c480b1f5f681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 18 Dec 2023 14:05:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E4=BA=8B=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/production/ProductionMainServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java index a593e980..61ee92d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java @@ -459,6 +459,7 @@ public class ProductionMainServiceImpl implements ProductionMainService { } @Override + @Transactional public Integer openProductionMain(Long id) { ProductionMainDO mainDO = validateProductionMainExists(id); PlanStatusState planStatusState = new PlanStatusState(mainDO.getStatus()); @@ -473,6 +474,7 @@ public class ProductionMainServiceImpl implements ProductionMainService { } @Override + @Transactional public Integer rejectProductionMain(Long id) { ProductionMainDO mainDO = validateProductionMainExists(id); PlanStatusState planStatusState = new PlanStatusState(mainDO.getStatus()); @@ -487,6 +489,7 @@ public class ProductionMainServiceImpl implements ProductionMainService { } @Override + @Transactional public Integer agreeProductionMain(Long id) { ProductionMainDO mainDO = validateProductionMainExists(id); PlanStatusState planStatusState = new PlanStatusState(mainDO.getStatus()); @@ -501,6 +504,7 @@ public class ProductionMainServiceImpl implements ProductionMainService { } @Override + @Transactional public Integer publishProductionMain(Long id) { ProductionMainDO mainDO = validateProductionMainExists(id); PlanStatusState planStatusState = new PlanStatusState(mainDO.getStatus()); @@ -517,6 +521,7 @@ public class ProductionMainServiceImpl implements ProductionMainService { } @Override + @Transactional public Integer resettingProductionMain(Long id) { ProductionMainDO mainDO = validateProductionMainExists(id); PlanStatusState planStatusState = new PlanStatusState(mainDO.getStatus());