Merge remote-tracking branch 'origin/dev' into dev

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

@@ -16,6 +16,15 @@ public class FactoryPageReqVO extends PageParam {
     @Schema(description = "公司编码")
     private String companyNumber;
 
+    @Schema(description = "公司名称")
+    private String cpnName;
+
+    @Schema(description = "ERP公司名称", example = "张三")
+    private String erpCompanyName;
+
+    @Schema(description = "ERP公司编码")
+    private String erpCompanyNumber;
+
     @Schema(description = "工厂名称", example = "赵六")
     private String name;
 

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

@@ -20,6 +20,18 @@ public class FactoryRespVO {
     @ExcelProperty("公司编码")
     private String companyNumber;
 
+    @Schema(description = "公司名称")
+    @ExcelProperty("公司名称")
+    private String cpnName;
+
+    @Schema(description = "ERP公司名称", example = "张三")
+    @ExcelProperty("ERP公司名称")
+    private String erpCompanyName;
+
+    @Schema(description = "ERP公司编码")
+    @ExcelProperty("ERP公司编码")
+    private String erpCompanyNumber;
+
     @Schema(description = "工厂名称", example = "赵六")
     @ExcelProperty("工厂名称")
     private String name;

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

@@ -13,6 +13,15 @@ public class FactorySaveReqVO {
     @Schema(description = "公司编码")
     private String companyNumber;
 
+    @Schema(description = "公司名称")
+    private String cpnName;
+
+    @Schema(description = "ERP公司名称", example = "张三")
+    private String erpCompanyName;
+
+    @Schema(description = "ERP公司编码")
+    private String erpCompanyNumber;
+
     @Schema(description = "工厂名称", example = "赵六")
     private String name;
 

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

@@ -22,6 +22,13 @@ public class WarehousePageReqVO extends PageParam {
     @Schema(description = "仓库编码")
     private String coding;
 
+    @Schema(description = "公司编码")
+    private String cpnName;
+    @Schema(description = "erp工厂名称")
+    private String erpFactoryName;
+    @Schema(description = "erp工厂编码")
+    private String erpFactoryNumber;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

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

@@ -20,6 +20,13 @@ public class WarehouseRespVO {
     @ExcelProperty("工厂编码")
     private String factoryNumber;
 
+    @Schema(description = "公司编码")
+    private String cpnName;
+    @Schema(description = "erp工厂名称")
+    private String erpFactoryName;
+    @Schema(description = "erp工厂编码")
+    private String erpFactoryNumber;
+
     @Schema(description = "仓库名称", example = "李四")
     @ExcelProperty("仓库名称")
     private String name;

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

@@ -13,6 +13,13 @@ public class WarehouseSaveReqVO {
     @Schema(description = "工厂编码")
     private String factoryNumber;
 
+    @Schema(description = "公司编码")
+    private String cpnName;
+    @Schema(description = "erp工厂名称")
+    private String erpFactoryName;
+    @Schema(description = "erp工厂编码")
+    private String erpFactoryNumber;
+
     @Schema(description = "仓库名称", example = "李四")
     private String name;
 

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java

@@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 /**
 * 工厂 DO
@@ -33,6 +34,24 @@ public class FactoryDO extends BusinessBaseDO {
     */
     @TableField("CPN_NUM")
     private String companyNumber;
+
+    /**
+     * 公司名称
+     */
+    @TableField("CPN_NAME")
+    private String cpnName;
+
+    /**
+     * ERP公司名称
+     */
+    @TableField("ERP_CPN_NAME")
+    private String erpCompanyName;
+
+    /**
+     * ERP公司编码
+     */
+    @TableField("ERP_CPN_NUM")
+    private String erpCompanyNumber;
     /**
     * 工厂名称
     */

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java

@@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 /**
 * 仓库 DO
@@ -33,6 +34,14 @@ public class WarehouseDO extends BusinessBaseDO {
     */
     @TableField("FACT_NUM")
     private String factoryNumber;
+
+    @TableField("CPN_NAME")
+    private String cpnName;
+    @TableField("ERP_FACT_NAME")
+    private String erpFactoryName;
+    @TableField("ERP_FACT_NUM")
+    private String erpFactoryNumber;
+
     /**
     * 仓库名称
     */

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

@@ -18,6 +18,9 @@ public interface FactoryMapper extends BaseMapperX<FactoryDO> {
     default PageResult<FactoryDO> selectPage(FactoryPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<FactoryDO>()
                 .eqIfPresent(FactoryDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .likeIfPresent(FactoryDO::getCpnName, reqVO.getCpnName())
+                .eqIfPresent(FactoryDO::getErpCompanyNumber, reqVO.getErpCompanyNumber())
+                .likeIfPresent(FactoryDO::getErpCompanyName, reqVO.getErpCompanyName())
                 .likeIfPresent(FactoryDO::getName, reqVO.getName())
                 .eqIfPresent(FactoryDO::getNumber, reqVO.getNumber())
                 .betweenIfPresent(FactoryDO::getCreateTime, reqVO.getCreateTime())

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

@@ -18,6 +18,9 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
     default PageResult<WarehouseDO> selectPage(WarehousePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<WarehouseDO>()
                 .eqIfPresent(WarehouseDO::getFactoryNumber, reqVO.getFactoryNumber())
+                .likeIfPresent(WarehouseDO::getCpnName, reqVO.getCpnName())
+                .likeIfPresent(WarehouseDO::getErpFactoryName, reqVO.getErpFactoryName())
+                .eqIfPresent(WarehouseDO::getErpFactoryNumber, reqVO.getErpFactoryNumber())
                 .likeIfPresent(WarehouseDO::getName, reqVO.getName())
                 .eqIfPresent(WarehouseDO::getCoding, reqVO.getCoding())
                 .betweenIfPresent(WarehouseDO::getCreateTime, reqVO.getCreateTime())

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

@@ -10,6 +10,6 @@
      -->
 
     <select id="selectMaxCode" resultType="java.lang.String">
-        SELECT max(CDG) FROM SPLY_WEH
+        SELECT max(CDG) FROM sply_wrh
     </select>
 </mapper>

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

@@ -0,0 +1,23 @@
+package com.zt.plat.module.contractorder.enums;
+
+import com.zt.plat.framework.common.enums.RpcConstants;
+
+/**
+ * API 相关的枚举
+ *
+ * @author ZT
+ */
+public class ApiConstants {
+
+    /**
+     * 服务名
+     *
+     * 注意，需要保证和 spring.application.name 保持一致
+     */
+    public static final String NAME = "base-server";
+
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/contract-order";
+
+    public static final String VERSION = "1.0.0";
+
+}

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ApiConstants.java

@@ -14,7 +14,7 @@ public class ApiConstants {
      *
      * 注意，需要保证和 spring.application.name 保持一致
      */
-    public static final String NAME = "erp-server";
+    public static final String NAME = "base-server";
 
     public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/erp";