委托加工添加发货工厂字段和明细添加金属元素字段

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanOrderServiceImpl.java

@@ -49,6 +49,8 @@ public class PlanOrderServiceImpl implements PlanOrderService {
     public PageResult<OrderDTO>  getBoundOrder(String id) {
         OrderAndPlanDataReqDTO reqVO = new OrderAndPlanDataReqDTO();
         reqVO.setPlanId(id);
+        reqVO.setPageNo(0);
+        reqVO.setPageNo(10000);
         CommonResult<PageResult<OrderDTO>> pageResultCommonResult = orderApi.queryOrderPlanData(reqVO);
         return pageResultCommonResult.getData();
     }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderPageReqVO.java

@@ -140,5 +140,7 @@ public class EntrustOrderOrderPageReqVO extends PageParam {
     private String sendWarehouseNumber;
     @Schema(description = "物权转移", example = "张三")
     private String meteringType;
+    @Schema(description = "订单类型，(字典：SPLY_BSN_TP)")
+    private String splyBsnTp;
 
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java

@@ -189,4 +189,8 @@ public class EntrustOrderOrderRespVO {
     private String sendWarehouseNumber;
     @Schema(description = "物权转移", example = "张三")
     private String meteringType;
+    @ExcelProperty("订单类型")
+    @Schema(description = "订单类型，(字典：SPLY_BSN_TP)")
+    private String splyBsnTp;
+
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java

@@ -161,4 +161,7 @@ public class EntrustOrderOrderSaveReqVO {
     private String sendWarehouseNumber;
     @Schema(description = "物权转移", example = "张三")
     private String meteringType;
+    @Schema(description = "订单类型，(字典：SPLY_BSN_TP)")
+    private String splyBsnTp;
+
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailPageReqVO.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.contractorder.controller.admin.originalmaterialprocessing.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -48,7 +49,7 @@ public class OriginalMaterialProcessingDetailPageReqVO extends PageParam {
     private String materialNumber;
 
     @Schema(description = "计量单位")
-    private String uom;
+    private String unit;
 
     @Schema(description = "暂估数量")
     private BigDecimal forecastQuantity;
@@ -104,4 +105,14 @@ public class OriginalMaterialProcessingDetailPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+
+    @Schema(description = "金属元素名称")
+    private String elementName;
+
+    @Schema(description = "金属元素编码")
+    private String elementNumber;
+
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailRespVO.java

@@ -63,7 +63,7 @@ public class OriginalMaterialProcessingDetailRespVO {
 
     @Schema(description = "计量单位")
     @ExcelProperty("计量单位")
-    private String uom;
+    private String unit;
 
     @Schema(description = "暂估数量")
     @ExcelProperty("暂估数量")
@@ -133,4 +133,17 @@ public class OriginalMaterialProcessingDetailRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "删除标识")
+    @ExcelProperty("删除标识")
+    private Boolean deleted;
+    @ExcelProperty("金属元素缩写")
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+    @ExcelProperty("金属元素名称")
+    @Schema(description = "金属元素名称")
+    private String elementName;
+    @ExcelProperty("金属元素编码")
+    @Schema(description = "金属元素编码")
+    private String elementNumber;
+
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailSaveReqVO.java

@@ -49,7 +49,7 @@ public class OriginalMaterialProcessingDetailSaveReqVO {
     private String materialNumber;
 
     @Schema(description = "计量单位")
-    private String uom;
+    private String unit;
 
     @Schema(description = "暂估数量")
     private BigDecimal forecastQuantity;
@@ -99,4 +99,10 @@ public class OriginalMaterialProcessingDetailSaveReqVO {
     @Schema(description = "价格条件")
     private String priceCondition;
 
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+    @Schema(description = "金属元素名称")
+    private String elementName;
+    @Schema(description = "金属元素编码")
+    private String elementNumber;
 }