修改bug。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExcelVO.java

@@ -1,18 +1,12 @@
 package com.win.module.wms.controller.unplannedreceiptRequest.vo;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 
 /**
@@ -68,7 +62,7 @@ public class UnplannedreceiptRequestDetailExcelVO {
     private String remark;
 
     @ExcelProperty("创建时间")
-    private LocalDateTime creationTime;
+    private LocalDateTime createTime;
 
     @ExcelProperty("创建者用户名")
     private String creator;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countRequest/CountRequestDetailConvert.java

@@ -37,11 +37,16 @@ public interface CountRequestDetailConvert {
 
     CountRequestDetailCreateReqVO convert1(CountRequestDetailDO bean);
 
-    CountRequestDetailExcelVO convert(CountRequestMainDO mainDO, CountRequestDetailDO detailDO);
-
     @Mappings({
-            @Mapping(source = "mainVo.number", target = "number"),
+            @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
     })
+    CountRequestDetailExcelVO convert(CountRequestMainDO mainDO, CountRequestDetailDO detailDO);
+
     CountRequestMainImportErrorVO convert(CountRequestMainCreateReqVO mainVo, CountRequestDetailCreateReqVO detailVo);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/deliverPlan/DeliverPlanDetailConvert.java

@@ -39,6 +39,12 @@ public interface DeliverPlanDetailConvert {
 
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
+            @Mapping(source = "mainDO.available", target = "available"),
     })
     DeliverPlanDetailExcelVO convert(DeliverPlanMainDO mainDO, DeliverPlanDetailDO detailDO);
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorychangeRequest/InventorychangeRequestDetailConvert.java

@@ -39,12 +39,14 @@ public interface InventorychangeRequestDetailConvert {
 
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
     })
     InventorychangeRequestDetailExcelVO convert(InventorychangeRequestMainDO mainDO, InventorychangeRequestDetailDO detailDO);
 
-    @Mappings({
-            @Mapping(source = "mainVo.number", target = "number"),
-    })
     InventorychangeRequestMainImportErrorVO convert(InventorychangeRequestMainCreateReqVO mainVo, InventorychangeRequestDetailCreateReqVO detailVo);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRequest/InventorymoveRequestDetailConvert.java

@@ -39,6 +39,11 @@ public interface InventorymoveRequestDetailConvert {
 
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
     })
     InventorymoveRequestDetailExcelVO convert(InventorymoveRequestMainDO mainDO, InventorymoveRequestDetailDO detailDO);
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/production/ProductionDetailConvert.java

@@ -39,6 +39,12 @@ public interface ProductionDetailConvert {
 
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
+            @Mapping(source = "mainDO.available", target = "available"),
     })
     ProductionDetailExcelVO convert(ProductionMainDO mainDO, ProductionDetailDO detailDO);
 
@@ -47,5 +53,4 @@ public interface ProductionDetailConvert {
     })
     ProductionMainImportErrorVO convert(ProductionMainCreateReqVO mainVo, ProductionDetailCreateReqVO detailVo);
 
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productscrapRequest/ProductscrapRequestDetailConvert.java

@@ -41,12 +41,14 @@ public interface ProductscrapRequestDetailConvert {
 
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
     })
     ProductscrapRequestDetailExcelVO convert(ProductscrapRequestMainDO mainDO, ProductscrapRequestDetailDO detailDO);
 
-    @Mappings({
-            @Mapping(source = "mainVo.number", target = "number"),
-    })
     ProductscrapRequestMainImportErrorVO convert(ProductscrapRequestMainCreateReqVO mainVo, ProductscrapRequestDetailCreateReqVO detailVo);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasePlan/PurchasePlanDetailConvert.java

@@ -37,11 +37,17 @@ public interface PurchasePlanDetailConvert {
 
     PurchasePlanDetailCreateReqVO convert1(PurchasePlanDetailDO bean);
 
-    PurchasePlanDetailExcelVO convert(PurchasePlanMainDO mainDO, PurchasePlanDetailDO detailDO);
-
     @Mappings({
-            @Mapping(source = "mainVo.number", target = "number"),
+            @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
+            @Mapping(source = "mainDO.available", target = "available"),
     })
+    PurchasePlanDetailExcelVO convert(PurchasePlanMainDO mainDO, PurchasePlanDetailDO detailDO);
+
     PurchasePlanMainImportErrorVO convert(PurchasePlanMainCreateReqVO mainVo,PurchasePlanDetailCreateReqVO detailVo);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptRecord/PurchasereceiptRecordMainConvert.java

@@ -40,7 +40,6 @@ public interface PurchasereceiptRecordMainConvert {
             @Mapping(source = "mainDO.number", target = "number"),
             @Mapping(source = "mainDO.fromAreaCodes", target = "fromAreaCodes"),
             @Mapping(source = "mainDO.toAreaCodes", target = "toAreaCodes"),
-            @Mapping(source = "mainDO.interfaceType", target = "interfaceType"),
             @Mapping(source = "mainDO.code", target = "code"),
             @Mapping(source = "mainDO.remark", target = "remark"),
             @Mapping(source = "detailDO.remark", target = "remarkDetail"),

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptRequest/PurchasereceiptRequestDetailConvert.java

@@ -39,12 +39,14 @@ public interface PurchasereceiptRequestDetailConvert {
 
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
     })
     PurchasereceiptRequestDetailExcelVO convert(PurchasereceiptRequestMainDO mainDO, PurchasereceiptRequestDetailDO detailDO);
 
-    @Mappings({
+    PurchasereceiptRequestMainImportErrorVO convert(PurchasereceiptRequestMainCreateReqVO mainVo, PurchasereceiptRequestDetailCreateReqVO detailVo);
-            @Mapping(source = "mainVo.number", target = "number"),
-    })
-    PurchasereceiptRequestMainImportErrorVO convert( PurchasereceiptRequestMainCreateReqVO mainVo,  PurchasereceiptRequestDetailCreateReqVO detailVo);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/repleinshRequest/RepleinshRequestDetailConvert.java

@@ -39,6 +39,11 @@ public interface RepleinshRequestDetailConvert {
 
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
     })
     RepleinshRequestDetailExcelVO convert(RepleinshRequestMainDO mainDO, RepleinshRequestDetailDO detailDO);
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/sale/SaleDetailConvert.java

@@ -45,9 +45,6 @@ public interface SaleDetailConvert {
             @Mapping(source = "mainDO.updateTime", target = "updateTime"),
             @Mapping(source = "mainDO.updater", target = "updater"),
             @Mapping(source = "mainDO.available", target = "available"),
-            @Mapping(source = "mainDO.status", target = "status"),
-            @Mapping(source = "mainDO.concurrencyStamp", target = "concurrencyStamp"),
-
     })
     SaleDetailExcelVO convert(SaleMainDO mainDO, SaleDetailDO detailDO);
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/transferissueRequest/TransferissueRequestDetailConvert.java

@@ -39,12 +39,14 @@ public interface TransferissueRequestDetailConvert {
 
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
     })
     TransferissueRequestDetailExcelVO convert(TransferissueRequestMainDO mainDO, TransferissueRequestDetailDO detailDO);
 
-    @Mappings({
-            @Mapping(source = "mainVo.number", target = "number"),
-    })
     TransferissueRequestMainImportErrorVO convert(TransferissueRequestMainCreateReqVO mainVo, TransferissueRequestDetailCreateReqVO detailVo);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/unplannedreceiptRequest/UnplannedreceiptRequestDetailConvert.java

@@ -39,13 +39,14 @@ public interface UnplannedreceiptRequestDetailConvert {
 
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
     })
     UnplannedreceiptRequestDetailExcelVO convert(UnplannedreceiptRequestMainDO mainDO, UnplannedreceiptRequestDetailDO detailDO);
 
-    @Mappings({
-            @Mapping(source = "mainVo.number", target = "number"),
-    })
     UnplannedreceiptRequestMainImportErrorVO convert(UnplannedreceiptRequestMainCreateReqVO mainVo, UnplannedreceiptRequestDetailCreateReqVO detailVo);
 
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/work/WorkDetailConvert.java

@@ -39,8 +39,12 @@ public interface WorkDetailConvert {
 
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
-
+            @Mapping(source = "mainDO.remark", target = "remark"),
-
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
+            @Mapping(source = "mainDO.available", target = "available"),
     })
     WorkDetailExcelVO convert(WorkMainDO mainDO,  WorkDetailDO detailDO);
 
@@ -49,5 +53,4 @@ public interface WorkDetailConvert {
     })
     WorkMainImportErrorVO convert( WorkMainCreateReqVO mainVo,  WorkDetailCreateReqVO detailVo);
 
-
 }