From 1551cd46e24779d0bf59549d20ff6331bbdf795c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 11 Mar 2024 22:16:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E6=B7=BB=E5=8A=A0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8UDI=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/entity/inout/IoCodeEntity.java | 5 +++++ .../com/glxp/api/entity/inout/IoCodeTempEntity.java | 13 +++++++++++++ src/main/resources/application-dev.yml | 2 +- src/main/resources/schemas/schema_v2.4.sql | 5 ++++- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java index cb27c76ca..4b9ef193c 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java @@ -24,6 +24,11 @@ public class IoCodeEntity implements Serializable { @TableField(value = "code") private String code; + /** + * 去掉GS1符号错误条码 + */ + @TableField(value = "errUdiCode") + private String errUdiCode; /** * 主单据类型（入库，出库） */ diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java index b52d59608..f7548f44c 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java @@ -22,6 +22,19 @@ public class IoCodeTempEntity { @TableField(value = "code") private String code; + + public void setCode(String code) { + this.code = code; + this.setErrUdiCode(code.replace("\u001D", "")); + } + + /** + * 去掉GS1符号错误条码 + */ + @TableField(value = "errUdiCode") + private String errUdiCode; + + /** * 主单据类型（入库，出库） */ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 149ccc6b6..eff144325 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 0b807ba81..5dc2395c9 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -708,5 +708,8 @@ INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramType`, `paramExplain`, `updateTime`) VALUES (200320, 0, '普耗/收费出库先进先出', 'phfee_batchno_fifo', '1', 1, 0, '第三方普耗/收费出库是否按照批号先进先出先进先出', '2024-03-07 15:20:35'); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailInvBatchNo', 'tinyint NULL DEFAULT NULL COMMENT ''是否允许库存批次号先进先出''', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailInvBatchNo', + 'tinyint NULL DEFAULT NULL COMMENT ''是否允许库存批次号先进先出''', 1); +CALL Pro_Temp_ColumnWork('io_code_temp', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1); +CALL Pro_Temp_ColumnWork('io_code', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1);