diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
index 54be9e7f1..85bd2cb2f 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -34,65 +34,65 @@
replace
- INTO basic_products
+ INTO basic_products
(id, 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, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
- basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
- basicPrductRemak8, updateTime
- , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName,
- pinyinInitial,
- updateUser,
- createTime,
- createUser,
- catalogname1,
- catalogname2,
- catalogname3,
- matrial,
- destinyType,
- productsType, prepnUnit, prepnSpec, storageCondition, transportCondition, indate, packMatrial, majorType,
- majorStatus, physicType, medicareType, bzgg,
- requireScanCode)
+ 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, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
+ basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
+ basicPrductRemak8, updateTime
+ , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName,
+ pinyinInitial,
+ updateUser,
+ createTime,
+ createUser,
+ catalogname1,
+ catalogname2,
+ catalogname3,
+ matrial,
+ destinyType,
+ productsType, prepnUnit, prepnSpec, storageCondition, transportCondition, indate, packMatrial, majorType,
+ majorStatus, physicType, medicareType, bzgg,
+ requireScanCode, detailSort)
values (#{id}, #{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}, #{allowNoSerial},
- #{spmc},
- #{cplx},
- #{hchzsb},
- #{cpdls},
- #{price},
- #{basicPrductRemak1},
- #{basicPrductRemak2},
- #{basicPrductRemak3},
- #{basicPrductRemak4},
- #{basicPrductRemak5},
- #{basicPrductRemak6},
- #{basicPrductRemak7},
- #{basicPrductRemak8}, #{updateTime}
- , #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs},
- #{categoryName}, #{pinyinInitial},
- #{updateUser},
- #{createTime},
- #{createUser},
- #{catalogname1},
- #{catalogname2},
- #{catalogname3},
- #{matrial},
- #{destinyType},
- #{productsType},
- #{prepnUnit},
- #{prepnSpec},
- #{storageCondition},
- #{transportCondition},
- #{indate},
- #{packMatrial},
- #{majorType},
- #{majorStatus},
- #{physicType},
- #{medicareType},
- #{bzgg},
- #{requireScanCode})
+ #{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}, #{allowNoSerial},
+ #{spmc},
+ #{cplx},
+ #{hchzsb},
+ #{cpdls},
+ #{price},
+ #{basicPrductRemak1},
+ #{basicPrductRemak2},
+ #{basicPrductRemak3},
+ #{basicPrductRemak4},
+ #{basicPrductRemak5},
+ #{basicPrductRemak6},
+ #{basicPrductRemak7},
+ #{basicPrductRemak8}, #{updateTime}
+ , #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs},
+ #{categoryName}, #{pinyinInitial},
+ #{updateUser},
+ #{createTime},
+ #{createUser},
+ #{catalogname1},
+ #{catalogname2},
+ #{catalogname3},
+ #{matrial},
+ #{destinyType},
+ #{productsType},
+ #{prepnUnit},
+ #{prepnSpec},
+ #{storageCondition},
+ #{transportCondition},
+ #{indate},
+ #{packMatrial},
+ #{majorType},
+ #{majorStatus},
+ #{physicType},
+ #{medicareType},
+ #{bzgg},
+ #{requireScanCode}.#{detailSort})
replace INTO basic_products
(id, 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, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
- basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
- basicPrductRemak8, updateTime, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj,
- mjfs, categoryName, pinyinInitial)
+ 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, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
+ basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
+ basicPrductRemak8, updateTime, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj,
+ mjfs, categoryName, pinyinInitial, detailSort)
values
(#{item.id},
- #{item.uuid},
- #{item.originUuid},
- #{item.nameCode},
- #{item.deviceRecordKey},
- #{item.packRatio},
- #{item.packLevel},
- #{item.packUnit},
- #{item.bhxjsl},
- #{item.bhzxxsbzsl},
- #{item.zxxsbzbhsydysl},
- #{item.bhxjcpbm},
- #{item.bzcj},
- #{item.cpmctymc},
- #{item.cplb},
- #{item.flbm},
- #{item.ggxh},
- #{item.qxlb},
- #{item.tyshxydm},
- #{item.ylqxzcrbarmc},
- #{item.zczbhhzbapzbh},
- #{item.ylqxzcrbarywmc},
- #{item.sydycpbs},
- #{item.sjcpbm},
- #{item.versionNumber},
- #{item.diType},
- #{item.ybbm},
- #{item.sptm},
- #{item.manufactory},
- #{item.measname},
- #{item.productType},
- #{item.scbssfbhph},
- #{item.scbssfbhxlh},
- #{item.scbssfbhscrq},
- #{item.scbssfbhsxrq},
- #{item.cpms},
- #{item.allowNoBatch},
- #{item.allowNoExpire},
- #{item.allowNoProduct}, #{item.allowNoSerial},
- #{item.spmc},
- #{item.cplx},
- #{item.hchzsb},
- #{item.cpdls},
- #{item.price},
- #{item.basicPrductRemak1},
- #{item.basicPrductRemak2},
- #{item.basicPrductRemak3},
- #{item.basicPrductRemak4},
- #{item.basicPrductRemak5},
- #{item.basicPrductRemak6},
- #{item.basicPrductRemak7},
- #{item.basicPrductRemak8}, #{item.updateTime}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx}, #{item.sfbjwycxsy},
- #{item.zdcfsycs},
- #{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.mjfs},
- #{item.categoryName}, #{item.pinyinInitial})
+ #{item.uuid},
+ #{item.originUuid},
+ #{item.nameCode},
+ #{item.deviceRecordKey},
+ #{item.packRatio},
+ #{item.packLevel},
+ #{item.packUnit},
+ #{item.bhxjsl},
+ #{item.bhzxxsbzsl},
+ #{item.zxxsbzbhsydysl},
+ #{item.bhxjcpbm},
+ #{item.bzcj},
+ #{item.cpmctymc},
+ #{item.cplb},
+ #{item.flbm},
+ #{item.ggxh},
+ #{item.qxlb},
+ #{item.tyshxydm},
+ #{item.ylqxzcrbarmc},
+ #{item.zczbhhzbapzbh},
+ #{item.ylqxzcrbarywmc},
+ #{item.sydycpbs},
+ #{item.sjcpbm},
+ #{item.versionNumber},
+ #{item.diType},
+ #{item.ybbm},
+ #{item.sptm},
+ #{item.manufactory},
+ #{item.measname},
+ #{item.productType},
+ #{item.scbssfbhph},
+ #{item.scbssfbhxlh},
+ #{item.scbssfbhscrq},
+ #{item.scbssfbhsxrq},
+ #{item.cpms},
+ #{item.allowNoBatch},
+ #{item.allowNoExpire},
+ #{item.allowNoProduct}, #{item.allowNoSerial},
+ #{item.spmc},
+ #{item.cplx},
+ #{item.hchzsb},
+ #{item.cpdls},
+ #{item.price},
+ #{item.basicPrductRemak1},
+ #{item.basicPrductRemak2},
+ #{item.basicPrductRemak3},
+ #{item.basicPrductRemak4},
+ #{item.basicPrductRemak5},
+ #{item.basicPrductRemak6},
+ #{item.basicPrductRemak7},
+ #{item.basicPrductRemak8}, #{item.updateTime}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx}, #{item.sfbjwycxsy},
+ #{item.zdcfsycs},
+ #{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.mjfs},
+ #{item.categoryName}, #{item.pinyinInitial}, #{item.detailSort})
@@ -587,9 +587,13 @@
packMatrial=#{packMatrial},
+
+ packMatrial=#{packMatrial},
+
+
WHERE nameCode = #{nameCode}
- and uuid = #{uuid}
+ and uuid = #{uuid}
@@ -798,6 +802,10 @@
workPlaceCount=#{workPlaceCount},
+
+ workPlaceCount=#{workPlaceCount},
+
+
where uuid = #{uuid}
@@ -1003,6 +1011,9 @@
matrial=#{matrial},
+
+ workPlaceCount=#{workPlaceCount},
+
where id = #{id}
@@ -1034,7 +1045,7 @@
@@ -1168,6 +1179,9 @@
basicPrductRemak8=#{basicPrductRemak8},
+
+ workPlaceCount=#{workPlaceCount},
+
pinyinInitial=#{pinyinInitial},
@@ -1209,13 +1223,13 @@
@@ -1224,64 +1238,64 @@