调拨入库与出库修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailUpdateReqVO.java

@@ -3,6 +3,8 @@ package com.win.module.wms.controller.transferissueJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.math.BigDecimal;
+
 @Schema(description = "管理后台 - 调拨出库任务子更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -10,7 +12,7 @@ import lombok.*;
 public class TransferissueJobDetailUpdateReqVO extends TransferissueJobDetailBaseVO {
 
     @Schema(description = "实际收货数量")
-    private String handleQty;
+    private BigDecimal handleQty;
 
     @Schema(description = "到包装")
     private String toPackingNumber;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java

@@ -118,7 +118,6 @@ public class TransferissueRecordMainController {
         ExcelUtils.write(response, "调拨出库记录主.xls", "数据", TransferissueRecordMainExcelVO.class, datas);
     }
 
-
     @GetMapping("/getDetailInfoById")
     @Operation(summary = "获取记录根据ID")
     @PreAuthorize("@ss.hasPermission('wms:transferissue-record-main:query')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestMainMapper.java

@@ -94,4 +94,10 @@ public interface TransferissueRequestMainMapper extends BaseMapperX<Transferissu
                 .eq(TransferissueRequestMainDO::getNumber, requestNumber)
                 .ne(TransferissueRequestMainDO::getStatus, OrderStatusEnum.CLOSED.getCode()));
     }
+
+    default TransferissueRequestMainDO queryByRequestNumber(String requestNumber){
+        return selectOne(new LambdaQueryWrapperX<TransferissueRequestMainDO>()
+                .eq(TransferissueRequestMainDO::getNumber, requestNumber)
+                .ne(TransferissueRequestMainDO::getStatus, OrderStatusEnum.CLOSED.getCode()));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestMainMapper.java

@@ -91,4 +91,10 @@ public interface TransferreceiptRequestMainMapper extends BaseMapperX<Transferre
                 .eq(TransferreceiptRequestMainDO::getNumber, requestNumber)
                 .ne(TransferreceiptRequestMainDO::getStatus, OrderStatusEnum.CLOSED.getCode()));
     }
+
+    default TransferreceiptRequestMainDO queryByRequestNumber(String requestNumber){
+        return selectOne(new LambdaQueryWrapperX<TransferreceiptRequestMainDO>()
+                .eq(TransferreceiptRequestMainDO::getNumber, requestNumber)
+                .ne(TransferreceiptRequestMainDO::getStatus, OrderStatusEnum.CLOSED.getCode()));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java

@@ -24,11 +24,14 @@ import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetail
 import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO;
 import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordDetailDO;
 import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordMainDO;
+import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestMainDO;
 import com.win.module.wms.dal.mysql.balance.BalanceMapper;
 import com.win.module.wms.dal.mysql.transferissueJob.TransferissueJobMainMapper;
 import com.win.module.wms.dal.mysql.transferissueRecord.TransferissueRecordDetailMapper;
 import com.win.module.wms.dal.mysql.transferissueRecord.TransferissueRecordMainMapper;
+import com.win.module.wms.dal.mysql.transferissueRequest.TransferissueRequestMainMapper;
 import com.win.module.wms.enums.job.JobStatusState;
+import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.recordsetting.RecordsettingService;
@@ -43,7 +46,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -92,6 +94,9 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ
     private RequestsettingService requestsettingService;
     @Resource
     private BalanceMapper balanceMapper;
+    @Resource
+    private TransferissueRequestMainMapper transferissueRequestMainMapper;
+
 
     @Override
     public Long createTransferissueJobMain(TransferissueJobMainCreateReqVO createReqVO) {
@@ -300,15 +305,16 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ
                 transferissueRecordDetailDO.setToAreaCode(locationDO2.getAreaCode());
                 transferissueRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode());
                 transferissueRecordDetailDO.setInventoryStatus(transferissueJobDetailUpdateReqVO.getToInventoryStatus());//toInventoryStatus
-                transferissueRecordDetailDO.setQty(new BigDecimal(transferissueJobDetailUpdateReqVO.getHandleQty() == null?"0":transferissueJobDetailUpdateReqVO.getHandleQty()));//handleQty
+                transferissueRecordDetailDO.setQty(transferissueJobDetailUpdateReqVO.getHandleQty());//handleQty
                 transferissueRecordDetailDOList.add(transferissueRecordDetailDO);
 
                 TransferreceiptRequestDetailCreateReqVO transferreceiptRequestDetailCreateReqVO = new TransferreceiptRequestDetailCreateReqVO();
                 BeanUtils.copyProperties(transferissueJobDetailUpdateReqVO,transferreceiptRequestDetailCreateReqVO);
-                transferreceiptRequestDetailCreateReqVO.setToLocationCode(transferissueJobDetailUpdateReqVO.getToLocationCode());
                 transferreceiptRequestDetailCreateReqVO.setFromLocationCode(transferissueJobDetailUpdateReqVO.getFromLocationCode());
-                transferreceiptRequestDetailCreateReqVO.setPackingNumber(transferissueJobDetailUpdateReqVO.getPackingNumber());
+                transferreceiptRequestDetailCreateReqVO.setToLocationCode(transferissueJobDetailUpdateReqVO.getToLocationCode());
-                transferreceiptRequestDetailCreateReqVO.setBatch(transferissueJobDetailUpdateReqVO.getBatch());
+                transferreceiptRequestDetailCreateReqVO.setPackingNumber(transferissueJobDetailUpdateReqVO.getToPackingNumber());
+                transferreceiptRequestDetailCreateReqVO.setBatch(transferissueJobDetailUpdateReqVO.getToBatch());
+                transferreceiptRequestDetailCreateReqVO.setQty(transferissueJobDetailUpdateReqVO.getHandleQty());
                 transferreceiptReqSubList.add(transferreceiptRequestDetailCreateReqVO);
 
                 //查询库存余额
@@ -336,37 +342,14 @@ 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(!transferissueRecordDetailDOList.isEmpty()) {
             transferissueRecordDetailMapper.insertBatch(transferissueRecordDetailDOList);
             //创建调拨入库申请
             TransferreceiptRequestMainCreateReqVO createReqVO = new TransferreceiptRequestMainCreateReqVO();
-            BeanUtils.copyProperties(transferissueJobMainDO,createReqVO);
+            BeanUtils.copyProperties(transferissueRecordMainDO,createReqVO);
+
             RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("TransferReceiptRequest");
             // 自动执行相关内容获取配置信息
             createReqVO.setAutoCommit(requestsettingDO.getAutoCommit());
@@ -381,6 +364,10 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ
         transactionService.createTransaction(transactionCreateReqVOList);
         //移除预计入
         expectinService.deleteExpectinByJobNumber(transferissueJobMainDO.getNumber());
+        // 请求主表更新状态
+        TransferissueRequestMainDO transferissueRequestMainDO = transferissueRequestMainMapper.queryByRequestNumber(transferissueJobMainDO.getRequestNumber());
+        transferissueRequestMainDO.setStatus(RequestStatusEnum.COMPLETED.getCode());
+        transferissueRequestMainMapper.updateById(transferissueRequestMainDO);
         //变更记录
         trendsApi.createTrends(transferissueJobMainDO.getId(), "transferissueJob", "执行调拨出库任务", TrendsTypeEnum.UPDATE);
         return number;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java

@@ -701,6 +701,9 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest
             transferreceiptRequestMainService.createTransferreceiptRequestMain(createReqVO);
             //增加库存事务
             transactionService.createTransaction(transactionCreateReqVOList);
+            // 更新主表状态
+            mainDO.setStatus(RequestStatusEnum.COMPLETED.getCode());
+            transferissueRequestMainMapper.updateById(mainDO);
             return;
         }
         // 任务 主表数据创建

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java

@@ -21,11 +21,14 @@ import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDe
 import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO;
 import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO;
 import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO;
+import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestMainDO;
 import com.win.module.wms.dal.mysql.balance.BalanceMapper;
 import com.win.module.wms.dal.mysql.transferreceiptJob.TransferreceiptJobMainMapper;
 import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordDetailMapper;
 import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordMainMapper;
+import com.win.module.wms.dal.mysql.transferreceiptRequest.TransferreceiptRequestMainMapper;
 import com.win.module.wms.enums.job.JobStatusState;
+import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.recordsetting.RecordsettingService;
@@ -81,7 +84,8 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain
     private ExpectinService expectinService;
     @Resource
     private BalanceMapper balanceMapper;
-
+    @Resource
+    private TransferreceiptRequestMainMapper transferreceiptRequestMainMapper;
 
     @Override
     public Long createTransferreceiptJobMain(TransferreceiptJobMainCreateReqVO createReqVO) {
@@ -345,6 +349,11 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain
         if(!transferreceiptRecordDetailDOList.isEmpty()) {
             transferreceiptRecordDetailMapper.insertBatch(transferreceiptRecordDetailDOList);
         }
+        TransferreceiptRequestMainDO transferreceiptRequestMainDO = transferreceiptRequestMainMapper.queryByRequestNumber(transferreceiptJobMainDO.getRequestNumber());
+        // 更新成状态已完成
+        transferreceiptRequestMainDO.setStatus(RequestStatusEnum.COMPLETED.getCode());
+        transferreceiptRequestMainMapper.updateById(transferreceiptRequestMainDO);
+
         //增加库存事务
         transactionService.createTransaction(transactionCreateReqVOList);
         //移除预计入

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java

@@ -106,7 +106,7 @@ public class TransferreceiptRequestDetailServiceImpl implements TransferreceiptR
         // DBT——>DBT2——>SO  校验库存状态
         jobUtils.ifOutInventoryStatuses(transferreceiptRequestDetailDO.getInventoryStatus(), businesstypeDO);
         // TB——>TB1 校验库存余额是否存在
-        validatebalance(transferreceiptRequestDetailDO);
+        // validatebalance(transferreceiptRequestDetailDO);
     }
 
     private List<BalanceDO> validatebalance(TransferreceiptRequestDetailDO detailDo) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java

@@ -218,6 +218,9 @@ public class TransferreceiptRequestMainServiceImpl implements TransferreceiptReq
 //                    transactionCreateReqVOList.add(transactionCreateReqVOIn);
 //                }
             }
+            // 更新成状态已完成
+            mainDO.setStatus(RequestStatusEnum.COMPLETED.getCode());
+            transferreceiptRequestMainMapper.updateById(mainDO);
             //增加库存事务
             transactionService.createTransaction(transactionCreateReqVOList);
             return;