制品返修修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailBaseVO.java

@@ -112,4 +112,7 @@ public class ProductrepairRecordDetailBaseVO {
     @Schema(description = "BOM版本")
     private String bomVersion;
 
+    @Schema(description = "成品库位代码")
+    private String fgFromLocationCode;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaBaseVO.java

@@ -1,13 +1,12 @@
 package com.win.module.wms.controller.productrepairRequest.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -101,4 +100,7 @@ public class ProductrepairRequestDetailaBaseVO {
     @Schema(description = "主键ID")
     private Long masterId;
 
+    @Schema(description = "成品库位代码")
+    private String fgFromLocationCode;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ProductrepairRecordDetailDO.java

@@ -152,4 +152,9 @@ public class ProductrepairRecordDetailDO extends BaseDO {
      */
     private String bomVersion;
 
+    /**
+     * 成品库位代码
+     */
+    private String fgFromLocationCode;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailaDO.java

@@ -125,4 +125,9 @@ public class ProductrepairRequestDetailaDO extends BaseDO {
      */
     private String  bomVersion;
 
+    /**
+     * 成品库位代码
+     */
+    private String fgFromLocationCode;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java

@@ -3,6 +3,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.baomidou.mybatisplus.core.metadata.IPage;
 import com.win.framework.common.exception.ServiceException;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
@@ -200,8 +201,8 @@ public interface BalanceMapper extends BaseMapperX<BalanceDO> {
                 .orderByDesc(BalanceDO::getId));
     }
 
-    default List<BalanceDO> getBalanceItemsPage(BalancePageReqVO reqVO){
-        List<BalanceDO> list  = selectList(new LambdaQueryWrapperX<BalanceDO>()
+    default List<BalanceDO> getBalanceItemsPage(IPage<BalanceDO> mpPage,BalancePageReqVO reqVO){
+        List<BalanceDO> list  = selectList(mpPage,new LambdaQueryWrapperX<BalanceDO>()
                 .eqIfPresent(BalanceDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(BalanceDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(BalanceDO::getItemCode, reqVO.getItemCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java

@@ -260,7 +260,7 @@ public class BalanceServiceImpl implements BalanceService {
     @Override
     public PageResult<BalanceDO> getBalanceItemsPage(BalancePageReqVO pageVO) {
         IPage<BalanceDO> mpPage = MyBatisUtils.buildPage(pageVO);
-        List<BalanceDO> list = balanceMapper.getBalanceItemsPage(pageVO);
+        List<BalanceDO> list = balanceMapper.getBalanceItemsPage(mpPage,pageVO);
         mpPage.setRecords(list);
         return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
     }
@@ -270,7 +270,7 @@ public class BalanceServiceImpl implements BalanceService {
         QueryWrapper<BalanceDO> lambdaQuery =  QueryWrapperUtils.structure(conditions);
         lambdaQuery.inSql("item_code","select code from basic_itembasic where type in ('FG','SEMI')");
         IPage<BalanceDO> mpPage = MyBatisUtils.buildPage(conditions);
-        List<BalanceDO> list = balanceMapper.selectList(lambdaQuery);
+        List<BalanceDO> list = balanceMapper.selectList(mpPage,lambdaQuery);
         mpPage.setRecords(list);
         return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java

@@ -117,7 +117,7 @@ public class ProductrepairRequestDetailaServiceImpl implements ProductrepairRequ
         String inventoryStatus = detailDo.getInventoryStatus();
         String[] inventoryArray = inventoryStatus.split(",");
         List<String> inventorystatus = Arrays.asList(inventoryArray);
-        List<BalanceDO> list = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch(), detailDo.getFromLocationCode(),inventorystatus);
+        List<BalanceDO> list = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch(), detailDo.getFgFromLocationCode(),inventorystatus);
         if(list != null && list.size() > 0){
             BalanceDO balanceDO = list.get(0);
             mainDO.setFromWarehouseCode(balanceDO.getWarehouseCode());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java

@@ -163,7 +163,10 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest
                 productrepairRecordDetailCreateReqVO.setNumber(number);
                 productrepairRecordDetailCreateReqVO.setMasterId(String.valueOf(productrepairRecordMainDO.getId()));
                 productrepairRecordDetailCreateReqVO.setInventoryStatus(productrepairRequestDetailaDO.getInventoryStatus());
+                productrepairRecordDetailCreateReqVO.setFgFromLocationCode(productrepairRequestDetailaDO.getFgFromLocationCode());
                 ProductrepairRecordDetailDO productrepairRecordDetailDO = ProductrepairRecordDetailConvert.INSTANCE.convert(productrepairRecordDetailCreateReqVO);
+                productrepairRecordDetailDO.setFgFromLocationCode(productrepairRecordDetailCreateReqVO.getFgFromLocationCode());
+                productrepairRecordDetailDO.setToLocationCode(productrepairRequestDetailaDO.getFromLocationCode());
                 productrepairRecordDetailMapper.insert(productrepairRecordDetailDO);
                 // 查询二级子表数据
                 List<ProductrepairRequestDetailbDO> productrepairRequestDetailbDOList = productrepairRequestDetailbMapper.selectList(productrepairRequestDetailaDO.getId());
@@ -175,7 +178,7 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest
                     //添加库存事务list
                     TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
                     BeanUtils.copyProperties(productrepairRecordDetailDO, transactionCreateReqVO);
-                    TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
+                    TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
                     transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
                     transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
                     transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
@@ -188,6 +191,7 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest
                     transactionCreateReqVO.setBatch(consumeRecordDetailbDO.getBatch());
                     transactionCreateReqVO.setContainerNumber(null);
                     transactionCreateReqVO.setAmount(BigDecimal.ZERO);
+                    transactionCreateReqVO.setQty(consumeRecordDetailbDO.getQty());
                     transactionCreateReqVO.setWarehouseCode(productrepairRecordMainDO.getFromWarehouseCode());
                     transactionCreateReqVO.setLocationCode(consumeRecordDetailbDO.getFromLocationCode());
                     transactionCreateReqVOList.add(transactionCreateReqVO);
@@ -217,6 +221,7 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest
             detailaDO.setMasterId(mainBo.getId());
             detailaDO.setNumber(mainBo.getNumber());
             detailaDO.setInventoryStatus(businesstypeDO.getOutInventoryStatuses());
+            detailaDO.setFgFromLocationCode(productrepairRequestDetailaCreateReqVO.getFgFromLocationCode());
             productrepairRequestDetailaMapper.insert(detailaDO);
             List<ProductrepairRequestDetailbCreateReqVO> consumereDetailbList = productrepairRequestDetailaCreateReqVO.getChildList();
             if(consumereDetailbList != null && consumereDetailbList.size() > 0){