From a6fbf634425838cafca19e5f37242f5b6e3ec4f2 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 20 Dec 2023 17:14:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=8C=85=E8=A3=85=E5=8F=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/balance/BalanceController.java | 28 +++++++++ .../wms/dal/mysql/balance/BalanceMapper.java | 34 +++++++++++ .../wms/service/balance/BalanceService.java | 8 +++ .../service/balance/BalanceServiceImpl.java | 22 +++++++ .../TransferissueJobMainServiceImpl.java | 51 ++++++++-------- .../TransferissueRecordMainServiceImpl.java | 50 ++++++++-------- .../TransferissueRequestMainServiceImpl.java | 50 ++++++++-------- .../TransferreceiptJobMainServiceImpl.java | 50 ++++++++-------- .../TransferreceiptRecordMainServiceImpl.java | 56 ++++++++--------- ...TransferreceiptRequestMainServiceImpl.java | 60 +++++++++---------- .../UnplannedissueJobMainServiceImpl.java | 2 + 11 files changed, 252 insertions(+), 159 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java index 743706ca..41898c6c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java @@ -83,4 +83,32 @@ public class BalanceController { ExcelUtils.write(response, "库存余额.xls", "数据", BalanceExcelVO.class, datas); } } + + @GetMapping("/pageItems") + @Operation(summary = "获得库存余额分页") + @PreAuthorize("@ss.hasPermission('wms:balance:query')") + public CommonResult> getBalanceAndItemPage(@Valid BalancePageReqVO pageVO) { + PageResult pageResult = balanceService.getBalanceItemsPage(pageVO); + PageResult result = BalanceConvert.INSTANCE.convertPage(pageResult); + for (BalanceRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); + } + + @PostMapping("/seniorItems") + @Operation(summary = "高级搜索获得库存余额分页") + @PreAuthorize("@ss.hasPermission('wms:balance:query')") + public CommonResult> getBalanceItemSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = balanceService.getSeniroBalanceItemsPage(conditions); + PageResult result = BalanceConvert.INSTANCE.convertPage(pageResult); + for(BalanceRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java index 161d17f6..8412f222 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java @@ -1,6 +1,7 @@ package com.win.module.wms.dal.mysql.balance; import cn.hutool.json.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; @@ -14,6 +15,7 @@ import com.win.module.wms.controller.balance.vo.BalancePageReqVO; import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.balance.BalanceConvert; import com.win.module.wms.dal.dataobject.balance.BalanceDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.inventoryAction.InventoryActionEnum; import org.apache.ibatis.annotations.Mapper; @@ -198,4 +200,36 @@ public interface BalanceMapper extends BaseMapperX { .orderByDesc(BalanceDO::getId)); } + default List getBalanceItemsPage(BalancePageReqVO reqVO){ + List list = selectList(new LambdaQueryWrapperX() + .eqIfPresent(BalanceDO::getPackingNumber, reqVO.getPackingNumber()) + .eqIfPresent(BalanceDO::getContainerNumber, reqVO.getContainerNumber()) + .eqIfPresent(BalanceDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(BalanceDO::getBatch, reqVO.getBatch()) + .eqIfPresent(BalanceDO::getAltBatch, reqVO.getAltBatch()) + .betweenIfPresent(BalanceDO::getArriveDate, reqVO.getArriveDate()) + .betweenIfPresent(BalanceDO::getProduceDate, reqVO.getProduceDate()) + .betweenIfPresent(BalanceDO::getExpireDate, reqVO.getExpireDate()) + .eqIfPresent(BalanceDO::getInventoryStatus, reqVO.getInventoryStatus()) + .eqIfPresent(BalanceDO::getLocationCode, reqVO.getLocationCode()) + .eqIfPresent(BalanceDO::getLocationGroupCode, reqVO.getLocationGroupCode()) + .eqIfPresent(BalanceDO::getAreaCode, reqVO.getAreaCode()) + .eqIfPresent(BalanceDO::getWarehouseCode, reqVO.getWarehouseCode()) + .eqIfPresent(BalanceDO::getErpLocationCode, reqVO.getErpLocationCode()) + .eqIfPresent(BalanceDO::getOwnerCode, reqVO.getOwnerCode()) + .eqIfPresent(BalanceDO::getUom, reqVO.getUom()) + .eqIfPresent(BalanceDO::getQty, reqVO.getQty()) + .eqIfPresent(BalanceDO::getSinglePrice, reqVO.getSinglePrice()) + .eqIfPresent(BalanceDO::getAmount, reqVO.getAmount()) + .betweenIfPresent(BalanceDO::getPutInTime, reqVO.getPutInTime()) + .eqIfPresent(BalanceDO::getFrozen, reqVO.getFrozen()) + .eqIfPresent(BalanceDO::getFrozenReason, reqVO.getFrozenReason()) + .eqIfPresent(BalanceDO::getLastTransNumber, reqVO.getLastTransNumber()) + .eqIfPresent(BalanceDO::getWeight, reqVO.getWeight()) + .eqIfPresent(BalanceDO::getArea, reqVO.getArea()) + .eqIfPresent(BalanceDO::getVolume, reqVO.getVolume()) + .inSql(BalanceDO::getItemCode,"select code from basic_itembasic where type in ('FG','SEMI')") + .orderByDesc(BalanceDO::getId)); + return list; + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java index 691a34c4..9a269076 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java @@ -83,4 +83,12 @@ public interface BalanceService { */ public List selectUniqueId(String packingNumber, String locationCode, List inventoryStatus); + /** + * 根据物品类型查询库存余额 + * @param pageVO + * @return + */ + PageResult getBalanceItemsPage(BalancePageReqVO pageVO); + + PageResult getSeniroBalanceItemsPage(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index aa8692b5..12a8853c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -1,8 +1,12 @@ package com.win.module.wms.service.balance; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.MyBatisUtils; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.balance.vo.BalanceExportReqVO; import com.win.module.wms.controller.balance.vo.BalancePageReqVO; import com.win.module.wms.dal.dataobject.balance.BalanceDO; @@ -144,4 +148,22 @@ public class BalanceServiceImpl implements BalanceService { return null; } } + + @Override + public PageResult getBalanceItemsPage(BalancePageReqVO pageVO) { + IPage mpPage = MyBatisUtils.buildPage(pageVO); + List list = balanceMapper.getBalanceItemsPage(pageVO); + mpPage.setRecords(list); + return new PageResult<>(mpPage.getRecords(), mpPage.getTotal()); + } + + @Override + public PageResult getSeniroBalanceItemsPage(CustomConditions conditions) { + QueryWrapper lambdaQuery = QueryWrapperUtils.structure(conditions); + lambdaQuery.inSql("item_code","select code from basic_itembasic where type in ('FG','SEMI')"); + IPage mpPage = MyBatisUtils.buildPage(conditions); + List list = balanceMapper.selectList(lambdaQuery); + mpPage.setRecords(list); + return new PageResult<>(mpPage.getRecords(), mpPage.getTotal()); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index b79f4017..442a2b4d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java @@ -323,7 +323,7 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(transferissueRecordMainDO.getBusinessType()); - transactionCreateReqVO.setLocationCode(transferissueRecordDetailDO.getToLocationCode()); + transactionCreateReqVO.setLocationCode(transferissueRecordDetailDO.getFromLocationCode()); transactionCreateReqVO.setOwnerCode(transferissueRecordDetailDO.getFromOwnerCode()); transactionCreateReqVO.setPackingNumber(transferissueRecordDetailDO.getFromPackingNumber()); transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); @@ -336,31 +336,30 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate()); transactionCreateReqVO.setId(null); transactionCreateReqVOList.add(transactionCreateReqVO); - if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { - TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); - BeanUtils.copyProperties(transferissueRecordDetailDO, transactionCreateReqVOIn); - //增加业务入类型 - transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); - transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); - transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); - transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); - transactionCreateReqVOIn.setBatch(transferissueRecordDetailDO.getToBatch()); - transactionCreateReqVOIn.setPackingNumber(transferissueRecordDetailDO.getToPackingNumber()); - transactionCreateReqVOIn.setInventoryStatus(transferissueRecordDetailDO.getInventoryStatus()); - transactionCreateReqVOIn.setLocationCode(transferissueRecordDetailDO.getToLocationCode()); - transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); - transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); - transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); - transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); - transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); - transactionCreateReqVOIn.setWarehouseCode(transferissueRecordMainDO.getFromWarehouseCode()); - transactionCreateReqVOIn.setRecordNumber(number); - transactionCreateReqVOIn.setId(null); - //待确定库存事务信息 - transactionCreateReqVOList.add(transactionCreateReqVOIn); - } - +// if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { +// TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); +// BeanUtils.copyProperties(transferissueRecordDetailDO, transactionCreateReqVOIn); +// //增加业务入类型 +// transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); +// TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); +// transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); +// transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); +// transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); +// transactionCreateReqVOIn.setBatch(transferissueRecordDetailDO.getToBatch()); +// transactionCreateReqVOIn.setPackingNumber(transferissueRecordDetailDO.getToPackingNumber()); +// transactionCreateReqVOIn.setInventoryStatus(transferissueRecordDetailDO.getInventoryStatus()); +// transactionCreateReqVOIn.setLocationCode(transferissueRecordDetailDO.getToLocationCode()); +// transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); +// transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); +// transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); +// transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); +// transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); +// transactionCreateReqVOIn.setWarehouseCode(transferissueRecordMainDO.getFromWarehouseCode()); +// transactionCreateReqVOIn.setRecordNumber(number); +// transactionCreateReqVOIn.setId(null); +// //待确定库存事务信息 +// transactionCreateReqVOList.add(transactionCreateReqVOIn); +// } } } if(!transferissueRecordDetailDOList.isEmpty()) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java index f50d90df..89f8d32f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java @@ -112,7 +112,7 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(transferissueRecordMainDO.getBusinessType()); - transactionCreateReqVO.setLocationCode(recordDetailDO.getToLocationCode()); + transactionCreateReqVO.setLocationCode(recordDetailDO.getFromLocationCode()); transactionCreateReqVO.setOwnerCode(recordDetailDO.getFromOwnerCode()); transactionCreateReqVO.setPackingNumber(recordDetailDO.getFromPackingNumber()); transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); @@ -125,30 +125,30 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate()); transactionCreateReqVO.setId(null); transactionCreateReqVOList.add(transactionCreateReqVO); - if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { - TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); - BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVOIn); - //增加业务入类型 - transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); - transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); - transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); - transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); - transactionCreateReqVOIn.setBatch(recordDetailDO.getToBatch()); - transactionCreateReqVOIn.setPackingNumber(recordDetailDO.getToPackingNumber()); - transactionCreateReqVOIn.setInventoryStatus(recordDetailDO.getInventoryStatus()); - transactionCreateReqVOIn.setLocationCode(recordDetailDO.getToLocationCode()); - transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); - transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); - transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); - transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); - transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); - transactionCreateReqVOIn.setWarehouseCode(transferissueRecordMainDO.getFromWarehouseCode()); - transactionCreateReqVOIn.setRecordNumber(number); - transactionCreateReqVOIn.setId(null); - //待确定库存事务信息 - transactionCreateReqVOList.add(transactionCreateReqVOIn); - } +// if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { +// TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); +// BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVOIn); +// //增加业务入类型 +// transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); +// TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); +// transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); +// transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); +// transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); +// transactionCreateReqVOIn.setBatch(recordDetailDO.getToBatch()); +// transactionCreateReqVOIn.setPackingNumber(recordDetailDO.getToPackingNumber()); +// transactionCreateReqVOIn.setInventoryStatus(recordDetailDO.getInventoryStatus()); +// transactionCreateReqVOIn.setLocationCode(recordDetailDO.getToLocationCode()); +// transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); +// transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); +// transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); +// transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); +// transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); +// transactionCreateReqVOIn.setWarehouseCode(transferissueRecordMainDO.getFromWarehouseCode()); +// transactionCreateReqVOIn.setRecordNumber(number); +// transactionCreateReqVOIn.setId(null); +// //待确定库存事务信息 +// transactionCreateReqVOList.add(transactionCreateReqVOIn); +// } } //增加库存事务 transactionService.createTransaction(transactionCreateReqVOList); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java index 5d099718..e20aa3f8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java @@ -639,7 +639,7 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(transferissueRecordMainDO.getBusinessType()); - transactionCreateReqVO.setLocationCode(transferissueRecordDetailDO.getToLocationCode()); + transactionCreateReqVO.setLocationCode(transferissueRecordDetailDO.getFromLocationCode()); transactionCreateReqVO.setOwnerCode(transferissueRecordDetailDO.getFromOwnerCode()); transactionCreateReqVO.setPackingNumber(transferissueRecordDetailDO.getFromPackingNumber()); transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); @@ -652,30 +652,30 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate()); transactionCreateReqVO.setId(null); transactionCreateReqVOList.add(transactionCreateReqVO); - if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { - TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); - BeanUtils.copyProperties(transferissueRecordDetailDO, transactionCreateReqVOIn); - //增加业务入类型 - transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); - transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); - transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); - transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); - transactionCreateReqVOIn.setBatch(transferissueRecordDetailDO.getToBatch()); - transactionCreateReqVOIn.setPackingNumber(transferissueRecordDetailDO.getToPackingNumber()); - transactionCreateReqVOIn.setInventoryStatus(transferissueRecordDetailDO.getInventoryStatus()); - transactionCreateReqVOIn.setLocationCode(transferissueRecordDetailDO.getToLocationCode()); - transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); - transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); - transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); - transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); - transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); - transactionCreateReqVOIn.setWarehouseCode(transferissueRecordMainDO.getFromWarehouseCode()); - transactionCreateReqVOIn.setRecordNumber(number); - transactionCreateReqVOIn.setId(null); - //待确定库存事务信息 - transactionCreateReqVOList.add(transactionCreateReqVOIn); - } +// if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { +// TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); +// BeanUtils.copyProperties(transferissueRecordDetailDO, transactionCreateReqVOIn); +// //增加业务入类型 +// transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); +// TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); +// transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); +// transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); +// transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); +// transactionCreateReqVOIn.setBatch(transferissueRecordDetailDO.getToBatch()); +// transactionCreateReqVOIn.setPackingNumber(transferissueRecordDetailDO.getToPackingNumber()); +// transactionCreateReqVOIn.setInventoryStatus(transferissueRecordDetailDO.getInventoryStatus()); +// transactionCreateReqVOIn.setLocationCode(transferissueRecordDetailDO.getToLocationCode()); +// transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); +// transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); +// transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); +// transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); +// transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); +// transactionCreateReqVOIn.setWarehouseCode(transferissueRecordMainDO.getFromWarehouseCode()); +// transactionCreateReqVOIn.setRecordNumber(number); +// transactionCreateReqVOIn.setId(null); +// //待确定库存事务信息 +// transactionCreateReqVOList.add(transactionCreateReqVOIn); +// } // 调拨入库数据拼装 TransferreceiptRequestDetailCreateReqVO transferreceiptRequestDetailCreateReqVO = new TransferreceiptRequestDetailCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index bf85e39c..e3d52e4c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -307,7 +307,7 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain transactionCreateReqVO.setPackingNumber(transferreceiptRecordDetailDO.getFromPackingNumber()); transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); transactionCreateReqVO.setBatch(transferreceiptRecordDetailDO.getFromBatch()); - transactionCreateReqVO.setWarehouseCode(transferreceiptRecordMainDO.getToWarehouseCode()); + transactionCreateReqVO.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode()); transactionCreateReqVO.setRecordNumber(number); transactionCreateReqVO.setAmount(balanceDO.getAmount()); transactionCreateReqVO.setArriveDate(balanceDO.getArriveDate()); @@ -315,30 +315,30 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate()); transactionCreateReqVO.setId(null); transactionCreateReqVOList.add(transactionCreateReqVO); - if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { - TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); - BeanUtils.copyProperties(transferreceiptRecordDetailDO, transactionCreateReqVOIn); - //增加业务入类型 - transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); - transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); - transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); - transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); - transactionCreateReqVOIn.setBatch(transferreceiptRecordDetailDO.getToBatch()); - transactionCreateReqVOIn.setPackingNumber(transferreceiptRecordDetailDO.getToPackingNumber()); - transactionCreateReqVOIn.setInventoryStatus(transferreceiptRecordDetailDO.getInventoryStatus()); - transactionCreateReqVOIn.setLocationCode(transferreceiptRecordDetailDO.getToLocationCode()); - transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); - transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); - transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); - transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); - transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); - transactionCreateReqVOIn.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode()); - transactionCreateReqVOIn.setRecordNumber(number); - transactionCreateReqVOIn.setId(null); - //待确定库存事务信息 - transactionCreateReqVOList.add(transactionCreateReqVOIn); - } +// if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { +// TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); +// BeanUtils.copyProperties(transferreceiptRecordDetailDO, transactionCreateReqVOIn); +// //增加业务入类型 +// transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); +// TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); +// transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); +// transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); +// transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); +// transactionCreateReqVOIn.setBatch(transferreceiptRecordDetailDO.getToBatch()); +// transactionCreateReqVOIn.setPackingNumber(transferreceiptRecordDetailDO.getToPackingNumber()); +// transactionCreateReqVOIn.setInventoryStatus(transferreceiptRecordDetailDO.getInventoryStatus()); +// transactionCreateReqVOIn.setLocationCode(transferreceiptRecordDetailDO.getToLocationCode()); +// transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); +// transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); +// transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); +// transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); +// transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); +// transactionCreateReqVOIn.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode()); +// transactionCreateReqVOIn.setRecordNumber(number); +// transactionCreateReqVOIn.setId(null); +// //待确定库存事务信息 +// transactionCreateReqVOList.add(transactionCreateReqVOIn); +// } } } if(!transferreceiptRecordDetailDOList.isEmpty()) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java index 689bb8b0..7203b7b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java @@ -106,13 +106,13 @@ public class TransferreceiptRecordMainServiceImpl implements TransferreceiptReco BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVO); //增加业务类型 transactionCreateReqVO.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(transferreceiptRecordMainDO.getBusinessType()); - transactionCreateReqVO.setLocationCode(recordDetailDO.getFromLocationCode()); - transactionCreateReqVO.setOwnerCode(recordDetailDO.getFromOwnerCode()); - transactionCreateReqVO.setPackingNumber(recordDetailDO.getFromPackingNumber()); + transactionCreateReqVO.setLocationCode(recordDetailDO.getToLocationCode()); + transactionCreateReqVO.setOwnerCode(recordDetailDO.getToOwnerCode()); + transactionCreateReqVO.setPackingNumber(recordDetailDO.getToPackingNumber()); transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); transactionCreateReqVO.setBatch(recordDetailDO.getFromBatch()); transactionCreateReqVO.setWarehouseCode(transferreceiptRecordMainDO.getToWarehouseCode()); @@ -123,30 +123,30 @@ public class TransferreceiptRecordMainServiceImpl implements TransferreceiptReco transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate()); transactionCreateReqVO.setId(null); transactionCreateReqVOList.add(transactionCreateReqVO); - if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { - TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); - BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVOIn); - //增加业务入类型 - transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); - transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); - transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); - transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); - transactionCreateReqVOIn.setBatch(recordDetailDO.getToBatch()); - transactionCreateReqVOIn.setPackingNumber(recordDetailDO.getToPackingNumber()); - transactionCreateReqVOIn.setInventoryStatus(recordDetailDO.getInventoryStatus()); - transactionCreateReqVOIn.setLocationCode(recordDetailDO.getToLocationCode()); - transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); - transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); - transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); - transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); - transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); - transactionCreateReqVOIn.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode()); - transactionCreateReqVOIn.setRecordNumber(number); - transactionCreateReqVOIn.setId(null); - //待确定库存事务信息 - transactionCreateReqVOList.add(transactionCreateReqVOIn); - } +// if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { +// TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); +// BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVOIn); +// //增加业务入类型 +// transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); +// TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); +// transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); +// transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); +// transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); +// transactionCreateReqVOIn.setBatch(recordDetailDO.getToBatch()); +// transactionCreateReqVOIn.setPackingNumber(recordDetailDO.getToPackingNumber()); +// transactionCreateReqVOIn.setInventoryStatus(recordDetailDO.getInventoryStatus()); +// transactionCreateReqVOIn.setLocationCode(recordDetailDO.getToLocationCode()); +// transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); +// transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); +// transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); +// transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); +// transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); +// transactionCreateReqVOIn.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode()); +// transactionCreateReqVOIn.setRecordNumber(number); +// transactionCreateReqVOIn.setId(null); +// //待确定库存事务信息 +// transactionCreateReqVOList.add(transactionCreateReqVOIn); +// } } //增加库存事务 transactionService.createTransaction(transactionCreateReqVOList); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java index 463c9097..ca5d7486 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java @@ -173,18 +173,18 @@ public class TransferreceiptRequestMainServiceImpl implements TransferreceiptReq //添加库存事务list BalanceDO balanceDO = balanceMapper.getBalanceQty(transferreceiptRequestDetailDO.getPackingNumber(), transferreceiptRequestDetailDO.getItemCode(), transferreceiptRequestDetailDO.getBatch(), transferreceiptRequestDetailDO.getInventoryStatus(), transferreceiptRequestDetailDO.getFromLocationCode()); TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); - BeanUtils.copyProperties(transferreceiptRequestDetailDO, transactionCreateReqVO); + BeanUtils.copyProperties(transferreceiptRecordDetailDO, transactionCreateReqVO); //增加业务类型 transactionCreateReqVO.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(transferreceiptRecordMainDO.getBusinessType()); - transactionCreateReqVO.setLocationCode(transferreceiptRequestDetailDO.getToLocationCode()); - transactionCreateReqVO.setOwnerCode(transferreceiptRequestDetailDO.getFromOwnerCode()); - transactionCreateReqVO.setPackingNumber(transferreceiptRequestDetailDO.getPackingNumber()); + transactionCreateReqVO.setLocationCode(transferreceiptRecordDetailDO.getToLocationCode()); + transactionCreateReqVO.setOwnerCode(transferreceiptRecordDetailDO.getToOwnerCode()); + transactionCreateReqVO.setPackingNumber(transferreceiptRecordDetailDO.getToPackingNumber()); transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); - transactionCreateReqVO.setBatch(transferreceiptRequestDetailDO.getBatch()); + transactionCreateReqVO.setBatch(transferreceiptRecordDetailDO.getToBatch()); transactionCreateReqVO.setWarehouseCode(transferreceiptRecordMainDO.getToWarehouseCode()); transactionCreateReqVO.setRecordNumber(number); transactionCreateReqVO.setAmount(balanceDO.getAmount()); @@ -193,30 +193,30 @@ public class TransferreceiptRequestMainServiceImpl implements TransferreceiptReq transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate()); transactionCreateReqVO.setId(null); transactionCreateReqVOList.add(transactionCreateReqVO); - if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { - TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); - BeanUtils.copyProperties(transferreceiptRequestDetailDO, transactionCreateReqVOIn); - //增加业务入类型 - transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); - transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); - transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); - transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); - transactionCreateReqVOIn.setBatch(transferreceiptRequestDetailDO.getBatch()); - transactionCreateReqVOIn.setPackingNumber(transferreceiptRequestDetailDO.getPackingNumber()); - transactionCreateReqVOIn.setInventoryStatus(transferreceiptRequestDetailDO.getInventoryStatus()); - transactionCreateReqVOIn.setLocationCode(transferreceiptRequestDetailDO.getToLocationCode()); - transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); - transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); - transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); - transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); - transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); - transactionCreateReqVOIn.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode()); - transactionCreateReqVOIn.setRecordNumber(number); - transactionCreateReqVOIn.setId(null); - //待确定库存事务信息 - transactionCreateReqVOList.add(transactionCreateReqVOIn); - } +// if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { +// TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); +// BeanUtils.copyProperties(transferreceiptRequestDetailDO, transactionCreateReqVOIn); +// //增加业务入类型 +// transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); +// TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); +// transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); +// transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); +// transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); +// transactionCreateReqVOIn.setBatch(transferreceiptRequestDetailDO.getBatch()); +// transactionCreateReqVOIn.setPackingNumber(transferreceiptRequestDetailDO.getPackingNumber()); +// transactionCreateReqVOIn.setInventoryStatus(transferreceiptRequestDetailDO.getInventoryStatus()); +// transactionCreateReqVOIn.setLocationCode(transferreceiptRequestDetailDO.getToLocationCode()); +// transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); +// transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); +// transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); +// transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); +// transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); +// transactionCreateReqVOIn.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode()); +// transactionCreateReqVOIn.setRecordNumber(number); +// transactionCreateReqVOIn.setId(null); +// //待确定库存事务信息 +// transactionCreateReqVOList.add(transactionCreateReqVOIn); +// } } //增加库存事务 transactionService.createTransaction(transactionCreateReqVOList); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java index 43f4cbe9..787acac8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java @@ -216,6 +216,8 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe if(!flag) { throw new ServiceException(TRANSFERISSUE_JOB_MAIN_STATUS_ERROR); } + + //更新完成信息 Long userId = getLoginUserId(); AdminUserRespDTO userRespDTO = userApi.getUser(userId);