From ace5595719bfb2c3e2f0074ff42427729c686328 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sat, 31 Aug 2024 16:19:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=98=AF=E5=90=A6=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=B5=8B=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/UdiRelevanceController.java | 1 + .../java/com/glxp/api/entity/basic/UdiRelevanceEntity.java | 7 +++++++ .../java/com/glxp/api/req/basic/AddProductRequest.java | 1 + .../com/glxp/api/req/basic/UdiRelevanceSaveRequest.java | 1 + .../java/com/glxp/api/res/basic/UdiRelevanceResponse.java | 1 + .../java/com/glxp/api/service/basic/UdiProductService.java | 3 +++ .../resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 3 +++ src/main/resources/schemas/schema_v2.4.sql | 4 ++++ 8 files changed, 21 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index ff2bea311..46c6ecc49 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -355,6 +355,7 @@ public class UdiRelevanceController extends BaseController { udiRelevanceEntity.setUseMuti(udiRelevanceEntity.getUseMuti()); udiRelevanceEntity.setUseLeverCount(udiRelevanceSaveRequest.getUseLeverCount()); udiRelevanceEntity.setSplitEnable(udiRelevanceSaveRequest.getSplitEnable()); + udiRelevanceEntity.setAutoCode(udiRelevanceSaveRequest.getAutoCode()); udiRelevanceEntity.setUseLevelDi(udiRelevanceSaveRequest.getUseLevelDi()); udiRelevanceEntity.setUseLevelUnit(udiRelevanceSaveRequest.getUseLevelUnit()); udiRelevanceEntity.setUseLevel(udiRelevanceSaveRequest.getUseLevel()); diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index c348550c6..2376f1e1e 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -258,6 +258,13 @@ public class UdiRelevanceEntity { private Integer useLevel; + /** + * 是否自动赋码 + */ + @TableField(value = "autoCode") + private Boolean autoCode; + + /** * 是否拆零 */ diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java index c9c31aba1..07cfb71ab 100644 --- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java @@ -272,6 +272,7 @@ public class AddProductRequest { private String useLevelUnit; private Integer useLeverCount; private Boolean splitEnable; + private Boolean autoCode; /** * 收费编码 diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index 4211b4cfa..a3a58c7c5 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -117,6 +117,7 @@ public class UdiRelevanceSaveRequest { private String certIdFk; private Integer zdcfsycs; private Boolean splitEnable; + private Boolean autoCode; /** * 包装规格 diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 9308ed69a..484cce1df 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -127,6 +127,7 @@ public class UdiRelevanceResponse { private boolean groupBuy; //是否集采产品 private boolean needCert; //是否需要资质材料 private Boolean splitEnable; + private Boolean autoCode; private String classifyName; //物资分类名称 private Integer zdcfsycs; diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index 79d162c1e..7430a5f14 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -229,6 +229,7 @@ public class UdiProductService { udiRelevanceEntity.setUuid(udiProductEntity.getUuid()); udiRelevanceEntity.setNeedCert(false); udiRelevanceEntity.setSplitEnable(false); + udiRelevanceEntity.setAutoCode(false); udiRelevanceEntity.setPurType(1); udiRelevanceEntity.setAttributeType(addProductRequest.getAttributeType()); udiRelevanceEntity.setHcType(addProductRequest.getHcType()); @@ -272,6 +273,7 @@ public class UdiProductService { //修改关联表 udiRelevanceEntity.setUseLeverCount(addProductRequest.getUseLeverCount()); udiRelevanceEntity.setSplitEnable(addProductRequest.getSplitEnable()); + udiRelevanceEntity.setAutoCode(addProductRequest.getAutoCode()); udiRelevanceEntity.setUseLevelDi(addProductRequest.getUseLevelDi()); udiRelevanceEntity.setUseLevelUnit(addProductRequest.getUseLevelUnit()); udiRelevanceEntity.setUseLevel(addProductRequest.getUseLevel()); @@ -290,6 +292,7 @@ public class UdiProductService { udiRelevanceEntity.setUuid(IdUtil.getSnowflakeNextId() + ""); udiRelevanceEntity.setNeedCert(false); udiRelevanceEntity.setSplitEnable(false); + udiRelevanceEntity.setAutoCode(false); udiRelevanceEntity.setPurType(1); udiRelevanceEntity.setProductsType(2); udiRelevanceEntity.setAttributeType(addProductRequest.getAttributeType()); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 2e9e0ef26..03d248093 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1506,6 +1506,9 @@ payFeeCode=#{payFeeCode}, + + autoCode=#{autoCode}, + splitEnable=#{splitEnable}, diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index ae553768b..932e744e8 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4304,3 +4304,7 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'useLeverCount', CALL Pro_Temp_ColumnWork('sys_workplace_document', 'workplaceType', ' tinyint NULL DEFAULT NULL COMMENT ''作业类型 1拆零;2取整;3:全部''', 1); + +CALL Pro_Temp_ColumnWork('basic_udirel', 'autoCode', + ' tinyint NULL DEFAULT b''0'' COMMENT ''是否自动赋码 0否 1是''', + 1); \ No newline at end of file