发料 新增字段 备料计划单号

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainBaseVO.java

@@ -150,6 +150,7 @@ public class IssueJobMainBaseVO {
     @Schema(description = "出库库存状态范围")
     private String outInventoryStatuses;
 
-
+    @Schema(description = "备料计划单号")
+    private String preparetoissuePlanNumber;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExcelVO.java

@@ -219,4 +219,7 @@ public class IssueJobMainExcelVO {
 
     @ExcelProperty("到货主代码")
     private String toOwnerCode;
+
+    @ExcelProperty("备料计划单号")
+    private String preparetoissuePlanNumber;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExportReqVO.java

@@ -133,5 +133,6 @@ public class IssueJobMainExportReqVO {
 
     @Schema(description = "允许修改批次")
     private String allowModifyBatch;
-
+    @Schema(description = "备料计划单号")
+    private String preparetoissuePlanNumber;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainPageReqVO.java

@@ -142,4 +142,7 @@ public class IssueJobMainPageReqVO extends PageParam {
     @Schema(description = "出库库存状态范围")
     private String outInventoryStatuses;
 
+    @Schema(description = "备料计划单号")
+    private String preparetoissuePlanNumber;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainBaseVO.java

@@ -104,4 +104,7 @@ public class IssueRecordMainBaseVO {
     @Schema(description = "是否可用")
     private String available;
 
+    @Schema(description = "备料计划单号")
+    private String preparetoissuePlanNumber;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExcelVO.java

@@ -175,4 +175,7 @@ public class IssueRecordMainExcelVO {
     @ExcelProperty(value = "计量单位", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.UOM)
     private String uom;
+
+    @ExcelProperty("备料计划单号")
+    private String preparetoissuePlanNumber;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExportReqVO.java

@@ -93,4 +93,7 @@ public class IssueRecordMainExportReqVO {
     @Schema(description = "是否可用")
     private String available;
 
+    @Schema(description = "备料计划单号")
+    private String preparetoissuePlanNumber;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainPageReqVO.java

@@ -95,4 +95,7 @@ public class IssueRecordMainPageReqVO extends PageParam {
     @Schema(description = "是否可用")
     private String available;
 
+    @Schema(description = "备料计划单号")
+    private String preparetoissuePlanNumber;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainBaseVO.java

@@ -97,4 +97,7 @@ public class IssueRequestMainBaseVO {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "备料计划单号")
+    private String preparetoissuePlanNumber;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java

@@ -145,5 +145,7 @@ public class IssueRequestMainExcelVO {
     @ExcelProperty("备注子")
     private String remarkDetail;
 
+    @ExcelProperty("备料计划单号")
+    private String preparetoissuePlanNumber;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExportReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.issueRequest.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -86,4 +87,7 @@ public class IssueRequestMainExportReqVO {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @ExcelProperty("备料计划单号")
+    private String preparetoissuePlanNumber;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainPageReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.issueRequest.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -88,4 +89,7 @@ public class IssueRequestMainPageReqVO extends PageParam {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @ExcelProperty("备料计划单号")
+    private String preparetoissuePlanNumber;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobMainDO.java

@@ -228,4 +228,9 @@ public class IssueJobMainDO extends BaseDO {
      */
     private String outInventoryStatuses;
 
+    /**
+     * 备料计划单号
+     */
+    private String preparetoissuePlanNumber;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRecord/IssueRecordMainDO.java

@@ -143,5 +143,8 @@ public class IssueRecordMainDO extends BaseDO {
      * 是否可用
      */
     private String available;
-
+    /**
+     * 备料计划单号
+     */
+    private String preparetoissuePlanNumber;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java

@@ -146,5 +146,10 @@ public class IssueRequestMainDO extends BaseDO {
      */
     private String outInventoryStatuses;
 
+    /**
+     * 备料计划单号
+     */
+    private String preparetoissuePlanNumber;
+
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java

@@ -48,6 +48,7 @@ public interface IssueRecordMainMapper extends BaseMapperX<IssueRecordMainDO> {
                 .eqIfPresent(IssueRecordMainDO::getToAreaCodes, reqVO.getToAreaCodes())
                 .eqIfPresent(IssueRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation())
                 .eqIfPresent(IssueRecordMainDO::getAvailable, reqVO.getAvailable())
+                .eqIfPresent(IssueRecordMainDO::getPreparetoissuePlanNumber, reqVO.getPreparetoissuePlanNumber())
                 .orderByDesc(IssueRecordMainDO::getId));
     }
     default PageResult<IssueRecordMainDO> selectSenior(CustomConditions conditions) {
@@ -80,6 +81,7 @@ public interface IssueRecordMainMapper extends BaseMapperX<IssueRecordMainDO> {
                 .eqIfPresent(IssueRecordMainDO::getToAreaCodes, reqVO.getToAreaCodes())
                 .eqIfPresent(IssueRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation())
                 .eqIfPresent(IssueRecordMainDO::getAvailable, reqVO.getAvailable())
+                .eqIfPresent(IssueRecordMainDO::getPreparetoissuePlanNumber, reqVO.getPreparetoissuePlanNumber())
                 .orderByDesc(IssueRecordMainDO::getId));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java

@@ -46,6 +46,7 @@ public interface IssueRequestMainMapper extends BaseMapperX<IssueRequestMainDO>
                 .eqIfPresent(IssueRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(IssueRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
                 .eqIfPresent(IssueRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
+                .eqIfPresent(IssueRequestMainDO::getPreparetoissuePlanNumber, reqVO.getPreparetoissuePlanNumber())
                 .orderByDesc(IssueRequestMainDO::getId));
     }
     default PageResult<IssueRequestMainDO> selectSenior(CustomConditions conditions) {
@@ -76,6 +77,7 @@ public interface IssueRequestMainMapper extends BaseMapperX<IssueRequestMainDO>
                 .eqIfPresent(IssueRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(IssueRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
                 .eqIfPresent(IssueRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
+                .eqIfPresent(IssueRequestMainDO::getPreparetoissuePlanNumber, reqVO.getPreparetoissuePlanNumber())
                 .orderByDesc(IssueRequestMainDO::getId));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java

@@ -316,7 +316,7 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
                         transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
                         transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
                         transactionCreateReqVO.setBusinessType(issueRecordMainDO.getBusinessType());
-                        transactionCreateReqVO.setOwnerCode(issueRecordDetailDO.getFromOwnerCode());
+                        transactionCreateReqVO.setOwnerCode(issueRecordDetailDO.getToOwnerCode());
                         transactionCreateReqVO.setRecordNumber(number);
                         transactionCreateReqVO.setId(null);
                         transactionCreateReqVO.setPackingNumber(issueRecordDetailDO.getToPackingNumber());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java

@@ -644,6 +644,7 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
         for(String mapKey : listMap.keySet()) {
             // 任务主表信息
             IssueJobMainDO issueJobMainDO = new IssueJobMainDO();
+            issueJobMainDO.setPreparetoissuePlanNumber(mainDO.getNumber());
             issueJobMainDO.setRequestNumber(mainDO.getNumber());
             issueJobMainDO.setWorkShopCode(mainDO.getWorkshopCode());
             issueJobMainDO.setUseOnTheWayLocation(mainDO.getUseOnTheWayLocation());