From 0723c45b96db500f26d2083508899c385fed0c9f Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Sun, 28 Sep 2025 10:47:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E3=80=81=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E6=96=B0=E5=A2=9Eui=E5=AF=B9=E5=BA=94=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/base/vo/FactoryPageReqVO.java | 9 +++++++++ .../admin/base/vo/FactoryRespVO.java | 12 ++++++++++++ .../admin/base/vo/FactorySaveReqVO.java | 9 +++++++++ .../admin/base/vo/WarehousePageReqVO.java | 7 +++++++ .../admin/base/vo/WarehouseRespVO.java | 7 +++++++ .../admin/base/vo/WarehouseSaveReqVO.java | 7 +++++++ .../base/dal/dataobject/base/FactoryDO.java | 19 +++++++++++++++++++ .../base/dal/dataobject/base/WarehouseDO.java | 9 +++++++++ .../base/dal/mysql/base/FactoryMapper.java | 3 +++ .../base/dal/mysql/base/WarehouseMapper.java | 3 +++ 10 files changed, 85 insertions(+) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryPageReqVO.java index b1ec876..b775e07 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryPageReqVO.java +++ b/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; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryRespVO.java index 4777ca6..1412d51 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryRespVO.java +++ b/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; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactorySaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactorySaveReqVO.java index df8598f..a5feb30 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactorySaveReqVO.java +++ b/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; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehousePageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehousePageReqVO.java index 2d3d802..b7fea5c 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehousePageReqVO.java +++ b/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; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseRespVO.java index bf2852b..d12fd74 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseRespVO.java +++ b/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; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseSaveReqVO.java index 482b0b9..439ff67 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseSaveReqVO.java +++ b/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; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java index 8a82037..8dda521 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java +++ b/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; /** * 工厂名称 */ diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java index 68ff193..2bbd0e8 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java +++ b/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; + /** * 仓库名称 */ diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java index 53883ae..05b5d31 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java +++ b/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 { default PageResult selectPage(FactoryPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .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()) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java index ec28235..60d3a7b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java +++ b/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 { default PageResult selectPage(WarehousePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .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()) From 1fb32bc43f307c4f0f5a0c35b9d4750149095cf6 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Sun, 28 Sep 2025 11:09:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=9C=80=E5=A4=A7code?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/base/WarehouseMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/WarehouseMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/WarehouseMapper.xml index 006534d..5e965aa 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/WarehouseMapper.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/WarehouseMapper.xml @@ -10,6 +10,6 @@ --> \ No newline at end of file From 2e629b8dc9423a24ec241c1a094f4c9681d8df7f Mon Sep 17 00:00:00 2001 From: chenbowen Date: Sun, 28 Sep 2025 12:17:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=AE=BE=E7=BD=AE=20api?= =?UTF-8?q?=20=E8=B0=83=E7=94=A8=E6=97=B6=E8=B7=AF=E7=94=B1=E7=9A=84?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contractorder/enums/ApiConstants.java | 23 +++++++++++++++++++ .../plat/module/erp/enums/ApiConstants.java | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ApiConstants.java diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ApiConstants.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ApiConstants.java new file mode 100644 index 0000000..f99bcef --- /dev/null +++ b/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"; + +} diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ApiConstants.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ApiConstants.java index 18dd594..1a4ca8c 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ApiConstants.java +++ b/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";