From 57634c56b3ecc65b7558ff183746a7fa0f5e5394 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 19 Dec 2023 18:40:04 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/ProductrepairRecordDetailExportReqVO.java               | 3 +++
 .../vo/ProductrepairRecordDetailPageReqVO.java                 | 3 +++
 .../productrepairRecord/ProductrepairRecordDetailMapper.java   | 1 +
 .../ProductrepairRequestMainServiceImpl.java                   | 2 +-
 .../productscrapRequest/RawscrapRequestDetailServiceImpl.java  | 2 +-
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExportReqVO.java
index 5bc2f39e..56880c9b 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExportReqVO.java
@@ -99,4 +99,7 @@ public class ProductrepairRecordDetailExportReqVO {
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
+    @Schema(description = "主键ID")
+    private Long masterId;
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailPageReqVO.java
index 2c33d053..469f680d 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailPageReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailPageReqVO.java
@@ -101,4 +101,7 @@ public class ProductrepairRecordDetailPageReqVO extends PageParam {
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
+    @Schema(description = "主键ID")
+    private Long masterId;
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java
index 2060becc..6e501f9f 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java
@@ -49,6 +49,7 @@ public interface ProductrepairRecordDetailMapper extends BaseMapperX<Productrepa
                 .eqIfPresent(ProductrepairRecordDetailDO::getCode, reqVO.getCode())
                 .eqIfPresent(ProductrepairRecordDetailDO::getInterfaceType, reqVO.getInterfaceType())
                 .eqIfPresent(ProductrepairRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
+                .eqIfPresent(ProductrepairRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .orderByDesc(ProductrepairRecordDetailDO::getId));
     }
 
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java
index b1ce5e48..49af88c5 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java
@@ -189,7 +189,7 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest
                     transactionCreateReqVO.setContainerNumber(null);
                     transactionCreateReqVO.setAmount(BigDecimal.ZERO);
                     transactionCreateReqVO.setWarehouseCode(productrepairRecordMainDO.getFromWarehouseCode());
-                    transactionCreateReqVO.setLocationCode(productrepairRecordDetailDO.getToLocationCode());
+                    transactionCreateReqVO.setLocationCode(consumeRecordDetailbDO.getFromLocationCode());
                     transactionCreateReqVOList.add(transactionCreateReqVO);
                 }
 
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java
index 3b7b1374..518f9b02 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java
@@ -135,7 +135,7 @@ public class RawscrapRequestDetailServiceImpl implements RawscrapRequestDetailSe
         rawscrapRequestDetailDO.setInventoryStatus(balanceDO.getInventoryStatus());
         rawscrapRequestDetailDO.setBatch(balanceDO.getBatch());
         rawscrapRequestDetailDO.setPackingNumber(balanceDO.getPackingNumber());
-        rawscrapRequestDetailDO.setFromLocationCode(balanceDO.getLocationCode());
+        rawscrapRequestDetailDO.setFromLocationCode(detailDO.getFromLocationCode());
         rawscrapRequestDetailDO.setCreateTime(LocalDateTime.now());
         rawscrapRequestDetailDO.setCreator(null);
     }