Merge branch 'dev' into test

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/originalmaterialprocessing/ErrorCodeConstants.java

@@ -0,0 +1,17 @@
+package com.zt.plat.module.contractorder.enums.originalmaterialprocessing;
+
+import com.zt.plat.framework.common.exception.ErrorCode;
+
+/**
+ * contract-order 错误码枚举类
+ *
+ * contract-order 系统，使用 1-xxx-xxx-xxx 段
+ *
+ * @author ZT
+ */
+public interface ErrorCodeConstants {
+
+    // ========== 合同模块 1-027-000-000 ==========
+    ErrorCode ORIGINAL_MATERIAL_PROCESSING_DETAIL_NOT_EXISTS = new ErrorCode(1_027_130_000, "来料加工订单明细不存在");
+    ErrorCode ORIGINAL_MATERIAL_PROCESSING_DO_NOT_EXISTS = new ErrorCode(1_027_130_001, "来料加工订单不存在");
+}

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.contractorder.controller.admin.entrustorder.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -17,6 +18,9 @@ public class EntrustOrderDetailPageReqVO extends PageParam {
     @Schema(description = "收货工厂名称", example = "赵六")
     private String receiveFactoryName;
 
+    @Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8625")
+    private Long orderId;
+
     @Schema(description = "收货工厂编码")
     private String receiveFactoryNumber;
 
@@ -59,4 +63,27 @@ public class EntrustOrderDetailPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "税码")
+    private String taxNumber;
+    //科目类别
+    @Schema(description = "科目类别")
+    private String accountingItemType;
+    //MTRL_CPNT_NUM 物料组
+    @Schema(description = "物料组")
+    private String materialGroup;
+    //RET_ITM  退货标识
+    @Schema(description = "退货标识")
+    private String returnItem;
+    //免费标识FREE_ITM
+    @Schema(description = "免费标识")
+    private String freeItem;
+    //VNDB 外部行号
+    @Schema(description = "外部行号")
+    private String externalLineNumber;
+    //ACTS_CTGR_DTL 科目分配
+    @Schema(description = "科目分配")
+    private String accountingItemAllocation;
+    @Schema(description = "备注")
+    private String remark;
+
 }

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

@@ -17,6 +17,8 @@ public class EntrustOrderDetailRespVO {
     @ExcelProperty("主键ID")
     private Long id;
 
+    @Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8625")
+    private Long orderId;
     @Schema(description = "收货工厂名称", example = "赵六")
     @ExcelProperty("收货工厂名称")
     private String receiveFactoryName;
@@ -73,4 +75,35 @@ public class EntrustOrderDetailRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "税码")
+    @ExcelProperty("税码")
+    private String taxNumber;
+    //科目类别
+    @Schema(description = "科目类别")
+    @ExcelProperty("科目类别")
+    private String accountingItemType;
+    //MTRL_CPNT_NUM 物料组
+    @Schema(description = "物料组")
+    @ExcelProperty("物料组")
+    private String materialGroup;
+    //RET_ITM  退货标识
+    @Schema(description = "退货标识")
+    @ExcelProperty("退货标识")
+    private String returnItem;
+    //免费标识FREE_ITM
+    @Schema(description = "免费标识")
+    @ExcelProperty("免费标识")
+    private String freeItem;
+    //VNDB 外部行号
+    @Schema(description = "外部行号")
+    @ExcelProperty("外部行号")
+    private String externalLineNumber;
+    //ACTS_CTGR_DTL 科目分配
+    @Schema(description = "科目分配")
+    @ExcelProperty("科目分配")
+    private String accountingItemAllocation;
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
 }

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

@@ -12,9 +12,13 @@ import java.time.LocalDateTime;
 @Data
 public class EntrustOrderDetailSaveReqVO {
 
+
     @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8625")
     private Long id;
 
+    @Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8625")
+    private Long orderId;
+
     @Schema(description = "收货工厂名称", example = "赵六")
     private String receiveFactoryName;
 
@@ -54,4 +58,27 @@ public class EntrustOrderDetailSaveReqVO {
     @Schema(description = "短文本")
     private String shortText;
 
+    @Schema(description = "税码")
+    private String taxNumber;
+    //科目类别
+    @Schema(description = "科目类别")
+    private String accountingItemType;
+    //MTRL_CPNT_NUM 物料组
+    @Schema(description = "物料组")
+    private String materialGroup;
+    //RET_ITM  退货标识
+    @Schema(description = "退货标识")
+    private String returnItem;
+    //免费标识FREE_ITM
+    @Schema(description = "免费标识")
+    private String freeItem;
+    //VNDB 外部行号
+    @Schema(description = "外部行号")
+    private String externalLineNumber;
+    //ACTS_CTGR_DTL 科目分配
+    @Schema(description = "科目分配")
+    private String accountingItemAllocation;
+    @Schema(description = "备注")
+    private String remark;
+
 }

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

@@ -20,7 +20,7 @@ public class EntrustOrderOrderPageReqVO extends PageParam {
     private String systemOrderNumber;
 
     @Schema(description = "公司编码;推送ERP（必须）")
-    private String companyNumber;
+    private String cpName;
 
     @Schema(description = "客商编码;推送ERP（必须）")
     private String supplierNumber;

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

@@ -5,6 +5,8 @@ import lombok.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 采购订单 Response VO")
@@ -26,7 +28,7 @@ public class EntrustOrderOrderRespVO {
 
     @Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("公司编码;推送ERP（必须）")
-    private String companyNumber;
+    private String cpName;
 
     @Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("客商编码;推送ERP（必须）")
@@ -160,4 +162,8 @@ public class EntrustOrderOrderRespVO {
     @ExcelProperty("采购组名称")
     private String purchaseGroupName;
 
+    @Schema(description = "委托加工订单明细")
+    @ExcelProperty("委托加工订单明细")
+    private List<EntrustOrderDetailRespVO> entrustOrderDetails;
+
 }

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

@@ -23,7 +23,7 @@ public class EntrustOrderOrderSaveReqVO {
 
     @Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     //@NotEmpty(message = "公司编码;推送ERP（必须）不能为空")
-    private String companyNumber;
+    private String cpName;
 
     @Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     //@NotEmpty(message = "客商编码;推送ERP（必须）不能为空")