Merge branch 'dev' into 'test'

修改bug

See merge request jygk/dsc-base!13

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmpItmPageReqVO.java

@@ -32,4 +32,7 @@ public class TmpItmPageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDate[] createTime;
+
+    @Schema(description = "状态")
+    private String sts;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplFldPageReqVO.java

@@ -28,6 +28,10 @@ public class TmplFldPageReqVO extends PageParam {
 
     @Schema(description = "备注")
     private String rmk;
+
+    @Schema(description = "状态")
+    private String sts;
+
     @Schema(description = "是否必填")
     private String isMust;
 

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java

@@ -15,6 +15,7 @@ public interface TmplItmMapper extends BaseMapperX<TmplItmDO> {
                 .likeIfPresent(TmplItmDO::getItmName, reqVO.getItmName())
                 .likeIfPresent(TmplItmDO::getItmNum, reqVO.getItmNum())
                 .eqIfPresent(TmplItmDO::getRmk, reqVO.getRmk())
+                .eqIfPresent(TmplItmDO::getSts, reqVO.getSts())
                 .betweenIfPresent(TmplItmDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(TmplItmDO::getId));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpFldMapper.java

@@ -17,6 +17,7 @@ public interface TmplTpFldMapper extends BaseMapperX<TmplTpFldDO> {
                 .eqIfPresent(TmplTpFldDO::getFldDoc, reqVO.getFldDoc())
                 .eqIfPresent(TmplTpFldDO::getIsMust, reqVO.getIsMust())
                 .eqIfPresent(TmplTpFldDO::getDatTp, reqVO.getDatTp())
+                .eqIfPresent(TmplTpFldDO::getSts, reqVO.getSts())
                 .betweenIfPresent(TmplTpFldDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(TmplTpFldDO::getId));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpMapper.java

@@ -29,6 +29,7 @@ public interface TmplTpMapper extends BaseMapperX<TmplTpDO> {
                 .eqIfPresent(TmplTpDO::getPrnId, reqVO.getPrnId())
                 .eqIfPresent(TmplTpDO::getSrt, reqVO.getSrt())
                 .eqIfPresent(TmplTpDO::getSts, reqVO.getSts())
+                .eqIfPresent(TmplTpDO::getSts, reqVO.getSts())
                 .betweenIfPresent(TmplTpDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(TmplTpDO::getId));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java

@@ -252,8 +252,8 @@ public class TmplTpServiceImpl extends ServiceImpl<TmplTpMapper, TmplTpDO> imple
 
         // 1. 根据条件查询匹配的节点
         List<TmplTpDO> matchedNodes = baseMapper.selectList(new LambdaQueryWrapper<TmplTpDO>()
-                .eq(name != null && !name.isEmpty(), TmplTpDO::getName, name)
-                .eq(num != null && !num.isEmpty(), TmplTpDO::getNum, num));
+                .like(name != null && !name.isEmpty(), TmplTpDO::getName, name)
+                .like(num != null && !num.isEmpty(), TmplTpDO::getNum, num));
 
         if (matchedNodes.isEmpty()) {
             return new ArrayList<>();

zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TmplTpMapper.xml

@@ -21,6 +21,7 @@
           AND rel.DELETED = 0
           AND tp.DELETED = 0
           AND tp.id = #{id}
+        and itm.sts=1
 
     </select>
     <select id="getField" resultType="com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldRespVO">
@@ -33,6 +34,7 @@
           AND r.DELETED = '0'
           AND t.DELETED = '0'
           AND t.id = #{id}
+          AND f.sts=1
         ORDER BY t.SRT, f.FLD_KY
     </select>
 

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

@@ -30,4 +30,7 @@ public class Partner {
     private String partnerType;           // 客商类型
     @Schema(description = "境内/外")
     private String domesticOrOverseas;    // 境内/外
+
+    @Schema(description = "erp合同编号")
+    private String erpContractPaperNumber;    // erp合同编号
 }

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

@@ -28,5 +28,6 @@ public interface ErrorCodeConstants {
     ErrorCode CONTRACT_STATUS_NOT_SUBMIT_ERP = new ErrorCode(1_027_000_013, "{}状态合同不允许提交ERP");
     ErrorCode CONTRACT_ORDER_EXISTS = new ErrorCode(1_027_000_014, "关联订单已存在");
     ErrorCode CONTRACT_SUBMIT_ERP_FAIL = new ErrorCode(1_027_000_015, "合同提交erp失败：{}");
-    ErrorCode CONTRACT_UNKNOWN_OPERATE = new ErrorCode(1_027_000_015, "未知的操作");
+    ErrorCode CONTRACT_UNKNOWN_OPERATE = new ErrorCode(1_027_000_016, "未知的操作");
+    ErrorCode CONTRACT_PARTNER_NOT_EXISTS = new ErrorCode(1_027_000_017, "客商信息不存在");
 }

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

@@ -8,6 +8,14 @@ import lombok.Getter;
 @Getter
 public enum DictEnum {
 
+    /** 业务类型 */
+    BSN_TP_3("物流合同","3",null),
+    /** ERP合同类型编码 */
+    ERP_CTRT_HTLXBH_SAP02NCOZC("SAP铜非施工合同支出类","SAP02NCOZC",null),
+    /** 交易方式 */
+    HS_PYBL_TP_PRE_PAY("先款后货","PRE_PAY",null),
+    /** ERP合同类别 */
+    ERP_CTRT_HTLB_1("购销合同","1",null),
     /** ERP请求状态 */
     ERP_REQ_STS_RLBK("失败","RLBK",null),
     ERP_REQ_STS_RCVG("执行中","RCVG",null),