委托加工和来料加工feign接口字段映射

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OrdDtlDTO.java

@@ -342,4 +342,33 @@ public class OrdDtlDTO {
      */
     @Schema(description = "来料加工原料详情")
     private String originDetail;
+    //=====================================委托加工订单=======================================
+    @Schema(description = "发货工厂名称", example = "张三")
+    private String sendFactoryName;
+    @Schema(description = "发货工厂编码")
+    private String sendFactoryNumber;
+    @Schema(description = "发货库位名称", example = "李四")
+    private String sendWarehouseName;
+    @Schema(description = "发货库位编码")
+    private String sendWarehouseNumber;
+    @Schema(description = "收货工厂名称", example = "赵六")
+    private String receiveFactoryName;
+    @Schema(description = "收货工厂编码")
+    private String receiveFactoryNumber;
+    @Schema(description = "收货库位名称", example = "张三")
+    private String receiveWarehouseName;
+    @Schema(description = "收货库位编码")
+    private String receiveWarehouseNumber;
+    @Schema(description = "发货物料名称", example = "张三")
+    private String sendMaterialName;
+    @Schema(description = "发货物料编码", example = "李四")
+    private String sendMaterialNumber;
+    @Schema(description = "收货物料名称", example = "王五")
+    private String receiveMaterialName;
+    @Schema(description = "收货物料编码", example = "王五")
+    private String receiveMaterialNumber;
+    @Schema(description = "发货计量单位")
+    private String sendUnit;
+    @Schema(description = "收货计量单位")
+    private String receiveUnit;
 }

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

@@ -14,4 +14,5 @@ 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, "来料加工订单不存在");
+    ErrorCode ORIGINAL_MATERIAL_PROCESSING_NOT_ALLOW_CALL_ERP = new ErrorCode(1_027_130_002, "当前订单类型为【{}】不允许调用该erp接口");
 }

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

@@ -107,4 +107,6 @@ public class OriginalMaterialProcessingDetailController implements BusinessContr
                         BeanUtils.toBean(list, OriginalMaterialProcessingDetailRespVO.class));
     }
 
+
+
 }

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

@@ -115,4 +115,16 @@ public class OriginalMaterialProcessingDetailPageReqVO extends PageParam {
     @Schema(description = "金属元素编码")
     private String elementNumber;
 
+    @Schema(description = "行号")
+    private Integer lineNumber;
+
+    @Schema(description = "发票类型")
+    private String invoiceType;
+
+    @Schema(description = "物料科目分配组")
+    private String metalAcctasscatGroup;
+
+    @Schema(description = "税率")
+    private BigDecimal taxRte;
+
 }

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

@@ -145,5 +145,16 @@ public class OriginalMaterialProcessingDetailRespVO {
     @ExcelProperty("金属元素编码")
     @Schema(description = "金属元素编码")
     private String elementNumber;
+    @ExcelProperty("行号")
+    @Schema(description = "行号")
+    private Integer lineNumber;
+    @ExcelProperty("发票类型")
+    @Schema(description = "发票类型")
+    private String invoiceType;
+    @ExcelProperty("物料科目分配组")
+    @Schema(description = "物料科目分配组")
+    private String metalAcctasscatGroup;
 
+    @Schema(description = "税率")
+    private BigDecimal taxRte;
 }

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

@@ -2,10 +2,15 @@ package com.zt.plat.module.contractorder.controller.admin.originalmaterialproces
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.util.*;
+
 import jakarta.validation.constraints.*;
+
 import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 来料加工订单明细新增/修改 Request VO")
@@ -101,8 +106,22 @@ public class OriginalMaterialProcessingDetailSaveReqVO {
 
     @Schema(description = "金属元素缩写")
     private String elementAbbreviation;
+
     @Schema(description = "金属元素名称")
     private String elementName;
+
     @Schema(description = "金属元素编码")
     private String elementNumber;
+
+    @Schema(description = "行号")
+    private Integer lineNumber;
+
+    @Schema(description = "发票类型")
+    private String invoiceType;
+
+    @Schema(description = "物料科目分配组")
+    private String metalAcctasscatGroup;
+
+    @Schema(description = "税率")
+    private BigDecimal taxRte;
 }

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

@@ -127,5 +127,20 @@ public class OriginalMaterialProcessingPageReqVO extends PageParam {
     @Schema(description = "相关订单ID")
     private Long relatedOrderId;
 
+    @Schema(description = "销售组织代码")
+    private String saleOrgzCd;
+    @Schema(description = "付款方名称")
+    private String payerName;
+    @Schema(description = "销售组织名称")
+    private String saleOrgzName;
+    @Schema(description = "分销聚道编码")
+    private String saleAcsCdg;
+    @Schema(description = "产品组编码")
+    private String pdtGrpCdg;
+    @Schema(description = "产品组名称")
+    private String pdtGrpName;
+    @Schema(description = "分销聚道名称")
+    private String saleAcsName;
+
 
 }

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

@@ -172,5 +172,26 @@ public class OriginalMaterialProcessingRespVO {
     //绑定的来料采购订单
     @Schema(description = "绑定的来料采购订单")
     private OriginalMaterialProcessingRespVO relatedOrder;
+    @Schema(description = "销售组织代码")
+    @ExcelProperty("销售组织代码")
+    private String saleOrgzCd;
+    @Schema(description = "付款方名称")
+    @ExcelProperty("付款方名称")
+    private String payerName;
+    @Schema(description = "销售组织名称")
+    @ExcelProperty("销售组织名称")
+    private String saleOrgzName;
+    @Schema(description = "分销聚道编码")
+    @ExcelProperty("分销聚道编码")
+    private String saleAcsCdg;
+    @Schema(description = "产品组编码")
+    @ExcelProperty("产品组编码")
+    private String pdtGrpCdg;
+    @Schema(description = "产品组名称")
+    @ExcelProperty("产品组名称")
+    private String pdtGrpName;
+    @Schema(description = "分销聚道名称")
+    @ExcelProperty("分销聚道名称")
+    private String saleAcsName;
 
 }

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

@@ -166,4 +166,19 @@ public class OriginalMaterialProcessingSaveReqVO {
     @Schema(description = "相关订单ID")
     private Long relatedOrderId;
 
+    @Schema(description = "销售组织代码")
+    private String saleOrgzCd;
+    @Schema(description = "付款方名称")
+    private String payerName;
+    @Schema(description = "销售组织名称")
+    private String saleOrgzName;
+    @Schema(description = "分销聚道编码")
+    private String saleAcsCdg;
+    @Schema(description = "产品组编码")
+    private String pdtGrpCdg;
+    @Schema(description = "产品组名称")
+    private String pdtGrpName;
+    @Schema(description = "分销聚道名称")
+    private String saleAcsName;
+
 }