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; 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()); 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());