diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 9fe3c0f6..a65b39b4 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -15,6 +15,7 @@ public class UdiProductEntity { private String deviceRecordKey; private String packRatio; private String packLevel; + private String packUnit; private Integer bhxjsl; private Integer bhzxxsbzsl; private Integer zxxsbzbhsydysl; @@ -61,7 +62,6 @@ public class UdiProductEntity { private String price; - //本地生成信息 private String batchNo; private String produceDate; 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 aee543e7..4fc50118 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -38,6 +38,7 @@ public class UdiRelevanceSaveRequest { private String deviceRecordKey; private String packRatio; private String packLevel; + private String packUnit; private Integer bhxjsl; private Integer bhzxxsbzsl; private Integer zxxsbzbhsydysl; 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 05da4893..a7523f4c 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -38,6 +38,7 @@ public class UdiRelevanceResponse { private String deviceRecordKey; private String packRatio; private String packLevel; + private String packUnit; private Integer bhxjsl; private Integer bhzxxsbzsl; private Integer zxxsbzbhsydysl; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 97fee787..c7e9cd22 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?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?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 60 diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 91cb3b21..b982d6c0 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -37,7 +37,7 @@ basic_udirel.ybbm,basic_udirel.sptm,basic_udirel.isDisable, basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.manufactory,basic_udirel.measname,basic_udirel.udplatCode, - basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, + basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.packUnit, basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.bhxjcpbm,basic_products.bzcj,basic_products.addType,basic_products.deviceRecordKey, basic_products.cpmctymc,basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb, @@ -122,11 +122,10 @@ FROM basic_products WHERE (nameCode = #{nameCode}) limit 1 - replace INTO basic_products - (uuid,originUuid,nameCode,deviceRecordKey,packRatio,packLevel,bhxjsl,bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm, + (uuid,originUuid,nameCode,deviceRecordKey,packRatio,packLevel,packUnit,bhxjsl,bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm, ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,sydycpbs,sjcpbm,versionNumber,diType,ybbm,sptm,manufactory,measname,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,allowNoBatch,allowNoExpire, allowNoProduct,spmc,cplx,hchzsb,cpdls,price,basicPrductRemak1,basicPrductRemak2,basicPrductRemak3,basicPrductRemak4,basicPrductRemak5,basicPrductRemak6,basicPrductRemak7,basicPrductRemak8) values @@ -137,6 +136,7 @@ #{deviceRecordKey}, #{packRatio}, #{packLevel}, + #{packUnit}, #{bhxjsl}, #{bhzxxsbzsl }, #{zxxsbzbhsydysl}, @@ -186,7 +186,7 @@ replace INTO basic_products - (uuid,originUuid,nameCode,deviceRecordKey,packRatio,packLevel,bhxjsl,bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm, + (uuid,originUuid,nameCode,deviceRecordKey,packRatio,packLevel,packUnit,bhxjsl,bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm, ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,sydycpbs,sjcpbm,versionNumber,diType,ybbm,sptm,manufactory,measname,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,allowNoBatch,allowNoExpire, allowNoProduct,spmc,cplx,hchzsb,cpdls,price,basicPrductRemak1,basicPrductRemak2,basicPrductRemak3,basicPrductRemak4,basicPrductRemak5,basicPrductRemak6,basicPrductRemak7,basicPrductRemak8) values @@ -200,6 +200,7 @@ #{item.deviceRecordKey}, #{item.packRatio}, #{item.packLevel}, + #{item.packUnit}, #{item.bhxjsl}, #{item.bhzxxsbzsl}, #{item.zxxsbzbhsydysl}, @@ -268,6 +269,7 @@ deviceRecordKey=#{deviceRecordKey}, packRatio=#{packRatio}, packLevel=#{packLevel}, + packUnit=#{packUnit}, bhxjsl=#{bhxjsl}, bhzxxsbzsl=#{bhzxxsbzsl}, zxxsbzbhsydysl=#{zxxsbzbhsydysl}, @@ -324,6 +326,7 @@ deviceRecordKey=#{deviceRecordKey}, packRatio=#{packRatio}, packLevel=#{packLevel}, + packUnit=#{packUnit}, bhxjsl=#{bhxjsl}, bhzxxsbzsl=#{bhzxxsbzsl}, zxxsbzbhsydysl=#{zxxsbzbhsydysl}, diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 5467ea54..f6c83d61 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -6,12 +6,13 @@ resultType="com.glxp.api.res.basic.UdiRelevanceResponse"> select basic_udirel.*, basic_products.originUuid,basic_products.nameCode,basic_products.deviceRecordKey,basic_products.packRatio, - basic_products.packLevel,basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, + basic_products.packUnit,basic_products.packLevel,basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.bhxjcpbm,basic_products.bzcj,basic_products.cpmctymc,basic_products.cplb,basic_products.flbm, basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc, basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.sjcpbm, basic_products.versionNumber,basic_products.diType,basic_products.ybbm,basic_products.sptm,basic_products.manufactory, - basic_products.measname,basic_products.productType,basic_products.scbssfbhph,basic_products.scbssfbhxlh,basic_products.scbssfbhscrq,basic_products.scbssfbhsxrq, + basic_products.measname,basic_products.productType,basic_products.scbssfbhph,basic_products.scbssfbhxlh,basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq, basic_products.cpms,basic_products.allowNoBatch,basic_products.allowNoExpire,basic_products.allowNoProduct, basic_products.spmc,basic_products.cplx,basic_products.hchzsb,basic_products.cpdls,basic_products.price, basic_products.basicPrductRemak1,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3, @@ -85,6 +86,7 @@ select basic_udirel.*, basic_products.originUuid,basic_products.nameCode,basic_products.deviceRecordKey,basic_products.packRatio, + basic_products.packUnit, basic_products.packLevel,basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.bhxjcpbm,basic_products.bzcj,basic_products.cpmctymc,basic_products.cplb,basic_products.flbm, basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc, @@ -168,6 +170,7 @@ resultType="com.glxp.api.res.basic.UdiRelevanceResponse"> select basic_udirel.*, basic_products.originUuid,basic_products.nameCode,basic_products.deviceRecordKey,basic_products.packRatio, + basic_products.packUnit basic_products.packLevel,basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.bhxjcpbm,basic_products.bzcj,basic_products.cpmctymc,basic_products.cplb,basic_products.flbm, basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc, @@ -277,6 +280,7 @@ resultType="com.glxp.api.res.basic.UdiRelevanceResponse"> select basic_udirel.*, basic_products.originUuid,basic_products.nameCode,basic_products.deviceRecordKey,basic_products.packRatio, + basic_products.packUnit basic_products.packLevel,basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.bhxjcpbm,basic_products.bzcj,basic_products.cpmctymc,basic_products.cplb,basic_products.flbm, basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc,