制品返修修改

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;
+
 }

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;
+
 }

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

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

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