From 90d3db4f6d734184775e55434a1e60169a1b058e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Wed, 31 Dec 2025 11:35:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201=E3=80=81=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E7=94=B2=E4=B9=99=E6=96=B9=E5=BF=85=E5=A1=AB=E9=80=89?= =?UTF-8?q?=E9=A1=B9=20add=EF=BC=9A=201=E3=80=81=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E8=87=AA=E5=8A=A8=E7=BB=91=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=202=E3=80=81=E6=96=B0=E5=A2=9E=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E6=9B=B4=E6=96=B0=E5=8F=AA=E8=83=BD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=9A=84=E4=BF=A1=E6=81=AF=E3=80=81=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E7=9A=84=E7=BC=96=E7=A0=81=E5=92=8C=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/admin/base/vo/ContactSaveReqVO.java | 2 +- .../erp/controller/admin/erp/vo/ErpFactoryRespVO.java | 2 ++ .../erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java | 3 +++ .../zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java | 6 ++++++ .../plat/module/erp/service/erp/ErpFactoryServiceImpl.java | 1 + 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java index d38e8e7b..eedee95d 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java @@ -12,7 +12,7 @@ public class ContactSaveReqVO { private Long id; @Schema(description = "类型甲方/乙方", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotEmpty(message = "类型甲方/乙方不能为空") +// @NotEmpty(message = "类型甲方/乙方不能为空") private String type; @Schema(description = "联系人", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java index e71e7d22..fada3b87 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java @@ -39,4 +39,6 @@ public class ErpFactoryRespVO { @Schema(description = "是否启用") private String isEnable; + @Schema(description = "操作类型") + private String operationType; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java index 9730222d..220ba505 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java @@ -33,4 +33,7 @@ public class ErpFactorySaveReqVO { @Schema(description = "是否启用") private String isEnable; + + @Schema(description = "操作类型") + private String operationType; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java index 34b785f3..83f07e7e 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java @@ -72,4 +72,10 @@ public class ErpFactoryDO extends BusinessBaseDO { */ @TableField("IS_ENB") private String isEnable; + + /** + * 操作类型 + */ + @TableField("OPTN_TP") + private String operationType; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java index c24f8e8f..2c0025fd 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java @@ -98,6 +98,7 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { if (updateObj.getType().equals("ERP") || updateObj.getIsEnable().equals("1")) { throw exception(ERP_FACTORY_NOT_ALLOW_UPDATE); } + //不允许修改除了绑定工厂名称、绑定工厂编码和操作以外的信息 erpFactoryMapper.updateById(updateObj); }