新增库位新表的相关功能，修复合同收发货规则

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

@@ -59,6 +59,35 @@ public class DetailRespDTO {
     @Schema(description = "长度")
     private String length;
 
+    // 中文牌名
+    @Schema(description = "中文牌名")
+    private String chineseNo;
+
+    // 英文牌名
+    @Schema(description = "英文牌名")
+    private String englishNo;
+
+    // 技术规格
+    @Schema(description = "技术规格")
+    private String technicalSpecification;
+
+    // 技术标准1
+    @Schema(description = "技术标准1")
+    private String technicalStandard1;
+
+    // 技术标准2
+    @Schema(description = "技术标准2")
+    private String technicalStandard2;
+
+    // 线别
+    @Schema(description = "线别")
+    private String lineLevel;
+
+    // 包装
+    @Schema(description = "包装")
+    private String pack;
+
+
     @Schema(description = "交货计划")
     private List<PlanRespDTO> plans;
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.contractorder.api.vo.contract;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -59,6 +60,36 @@ public class DetailRespVO {
     @Schema(description = "长度")
     private String length;
 
+
+    // 中文牌名
+    @Schema(description = "中文牌名")
+    private String chineseNo;
+
+    // 英文牌名
+    @Schema(description = "英文牌名")
+    private String englishNo;
+
+    // 技术规格
+    @Schema(description = "技术规格")
+    private String technicalSpecification;
+
+    // 技术标准1
+    @Schema(description = "技术标准1")
+    private String technicalStandard1;
+
+    // 技术标准2
+    @Schema(description = "技术标准2")
+    private String technicalStandard2;
+
+    // 线别
+    @Schema(description = "线别")
+    private String lineLevel;
+
+    // 包装
+    @Schema(description = "包装")
+    private String pack;
+
     // 交货计划
+    @Schema(description = "交货计划")
     private List<PlanRespVO> plans;
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailSaveReqVO.java

@@ -55,6 +55,35 @@ public class DetailSaveReqVO {
     @Schema(description = "长度")
     private String length;
 
+    // 中文牌名
+    @Schema(description = "中文牌名")
+    private String chineseNo;
+
+    // 英文牌名
+    @Schema(description = "英文牌名")
+    private String englishNo;
+
+    // 技术规格
+    @Schema(description = "技术规格")
+    private String technicalSpecification;
+
+    // 技术标准1
+    @Schema(description = "技术标准1")
+    private String technicalStandard1;
+
+    // 技术标准2
+    @Schema(description = "技术标准2")
+    private String technicalStandard2;
+
+    // 线别
+    @Schema(description = "线别")
+    private String lineLevel;
+
+    // 包装
+    @Schema(description = "包装")
+    private String pack;
+
+
     // 交货计划
     private List<PlanSaveReqVO> plans;
 }

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

@@ -19,6 +19,7 @@ public interface ErrorCodeConstants {
     ErrorCode CONTRACT_ID_NOT_EXISTS = new ErrorCode(1_027_000_004, "合同主键为空");
     ErrorCode CONTRACT_STATUS_NOT_UPDATE = new ErrorCode(1_027_000_005, "{}状态合同不允许修改");
     ErrorCode CONTRACT_DATA_NOT_EXISTS = new ErrorCode(1_027_000_006, "{}不存在");
+    ErrorCode CONTRACT_PARAMS_ERROR = new ErrorCode(1_027_000_100, "{}");
     ErrorCode CONTRACT_STATUS_NOT_SUBMIT_APPROVAL = new ErrorCode(1_027_000_007, "{}状态合同不允许提交审核");
     ErrorCode CONTRACT_STATUS_NOT_APPROVAL = new ErrorCode(1_027_000_008, "{}状态合同不允许审核");
     ErrorCode CONTRACT_ERP_COMPANY_PLEASE_BIND = new ErrorCode(1_027_000_009, "请先绑定{}ERP公司信息");

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDetailDO.java

@@ -98,4 +98,33 @@ public class ContractDetailDO extends BusinessBaseDO {
      */
     @TableField("LEN")
     private String length;
+
+
+    // 中文牌名
+    @TableField("CHS_NO")
+    private String chineseNo;
+
+    // 英文牌名
+    @TableField("EN_NO")
+    private String englishNo;
+
+    // 技术规格
+    @TableField("TCHI_SPEC")
+    private String technicalSpecification;
+
+    // 技术标准1
+    @TableField("TCHL_STD1")
+    private String technicalStandard1;
+
+    // 技术标准2
+    @TableField("TCHI_STD2")
+    private String technicalStandard2;
+
+    // 线别
+    @TableField("LINE_LVL")
+    private String lineLevel;
+
+    // 包装
+    @TableField("PACK")
+    private String pack;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java

@@ -126,11 +126,19 @@ public class ContractServiceImpl implements ContractService {
     public PageResult<ContractMainDO> getContractPage(ContractPageReqVO pageReqVO) {
         return contractMainMapper.selectContractPage(pageReqVO);
     }
+    boolean isContractReceiveSendValid(List<ContractReceiveSendSaveReqVO> contractReceiveSends){
+        if (CollectionUtils.isEmpty(contractReceiveSends)) {
+            return true;
+        }
+        return false;
+
+    }
 
     @Transactional
     @Override
     public Long createContract(ContractSaveReqVO reqVO) {
-
+        //校验收发货的规则的合法性
+        isContractReceiveSendValid(reqVO.getContractReceiveSends());
         // 校验合同名称是否存在
         ContractMainDO contract = contractMainMapper
                 .selectOne(TableFieldConstants.BSE_CTRT_MAIN_CTRT_NAME, reqVO.getContractName());