|
|
|
@ -979,7 +979,7 @@
|
|
|
|
updateTime, modifyTime,
|
|
|
|
updateTime, modifyTime,
|
|
|
|
createUser,
|
|
|
|
createUser,
|
|
|
|
updateUser,
|
|
|
|
updateUser,
|
|
|
|
remark, useExpireTime, dispatch, groupBuy, needCert, newNeedUpload)
|
|
|
|
remark, useExpireTime, dispatch, groupBuy, needCert, newNeedUpload, isStack)
|
|
|
|
values (#{id},
|
|
|
|
values (#{id},
|
|
|
|
#{uuid},
|
|
|
|
#{uuid},
|
|
|
|
#{mainId},
|
|
|
|
#{mainId},
|
|
|
|
@ -1002,7 +1002,7 @@
|
|
|
|
#{modifyTime},
|
|
|
|
#{modifyTime},
|
|
|
|
#{createUser},
|
|
|
|
#{createUser},
|
|
|
|
#{updateUser},
|
|
|
|
#{updateUser},
|
|
|
|
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{newNeedUpload})
|
|
|
|
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{newNeedUpload}, #{isStack})
|
|
|
|
</insert>
|
|
|
|
</insert>
|
|
|
|
|
|
|
|
|
|
|
|
<insert id="insertUdiRelevanceignore" keyProperty="id"
|
|
|
|
<insert id="insertUdiRelevanceignore" keyProperty="id"
|
|
|
|
@ -1016,7 +1016,7 @@
|
|
|
|
updateTime, modifyTime,
|
|
|
|
updateTime, modifyTime,
|
|
|
|
createUser,
|
|
|
|
createUser,
|
|
|
|
updateUser,
|
|
|
|
updateUser,
|
|
|
|
remark, useExpireTime, dispatch, groupBuy, needCert)
|
|
|
|
remark, useExpireTime, dispatch, groupBuy, needCert,isStack)
|
|
|
|
values (#{id},
|
|
|
|
values (#{id},
|
|
|
|
#{uuid},
|
|
|
|
#{uuid},
|
|
|
|
#{mainId},
|
|
|
|
#{mainId},
|
|
|
|
@ -1039,7 +1039,7 @@
|
|
|
|
#{modifyTime},
|
|
|
|
#{modifyTime},
|
|
|
|
#{createUser},
|
|
|
|
#{createUser},
|
|
|
|
#{updateUser},
|
|
|
|
#{updateUser},
|
|
|
|
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
|
|
|
|
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert},#{isStack})
|
|
|
|
</insert>
|
|
|
|
</insert>
|
|
|
|
|
|
|
|
|
|
|
|
<delete id="deleteById" parameterType="Map">
|
|
|
|
<delete id="deleteById" parameterType="Map">
|
|
|
|
@ -1168,6 +1168,10 @@
|
|
|
|
<if test="needCert != null">
|
|
|
|
<if test="needCert != null">
|
|
|
|
needCert=#{needCert},
|
|
|
|
needCert=#{needCert},
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
|
|
|
|
<if test="isStack != null">
|
|
|
|
|
|
|
|
isStack=#{isStack},
|
|
|
|
|
|
|
|
</if>
|
|
|
|
|
|
|
|
|
|
|
|
</trim>
|
|
|
|
</trim>
|
|
|
|
WHERE id = #{id}
|
|
|
|
WHERE id = #{id}
|
|
|
|
</update>
|
|
|
|
</update>
|
|
|
|
@ -1197,7 +1201,7 @@
|
|
|
|
updateTime, modifyTime,
|
|
|
|
updateTime, modifyTime,
|
|
|
|
createUser,
|
|
|
|
createUser,
|
|
|
|
updateUser,
|
|
|
|
updateUser,
|
|
|
|
remark, useExpireTime, dispatch, groupBuy, needCert)
|
|
|
|
remark, useExpireTime, dispatch, groupBuy, needCert,isStack)
|
|
|
|
values
|
|
|
|
values
|
|
|
|
|
|
|
|
|
|
|
|
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
|
|
|
|
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
|
|
|
|
@ -1223,76 +1227,76 @@
|
|
|
|
#{item.modifyTime},
|
|
|
|
#{item.modifyTime},
|
|
|
|
#{item.createUser},
|
|
|
|
#{item.createUser},
|
|
|
|
#{item.updateUser},
|
|
|
|
#{item.updateUser},
|
|
|
|
#{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert})
|
|
|
|
#{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert},#{item.isStack})
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
|
</insert>
|
|
|
|
</insert>
|
|
|
|
|
|
|
|
|
|
|
|
<select id="selectGroupByNameCode" parameterType="java.lang.String"
|
|
|
|
<select id="selectGroupByNameCode" parameterType="java.lang.String"
|
|
|
|
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
|
|
|
|
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
|
|
|
|
select basic_udirel.*,
|
|
|
|
select basic_udirel.*,
|
|
|
|
basic_products.originUuid,
|
|
|
|
basic_products.originUuid,
|
|
|
|
basic_products.nameCode,
|
|
|
|
basic_products.nameCode,
|
|
|
|
basic_products.deviceRecordKey,
|
|
|
|
basic_products.deviceRecordKey,
|
|
|
|
basic_products.packRatio,
|
|
|
|
basic_products.packRatio,
|
|
|
|
basic_products.packUnit,
|
|
|
|
basic_products.packUnit,
|
|
|
|
basic_products.packLevel,
|
|
|
|
basic_products.packLevel,
|
|
|
|
basic_products.bhxjsl,
|
|
|
|
basic_products.bhxjsl,
|
|
|
|
basic_products.bhzxxsbzsl,
|
|
|
|
basic_products.bhzxxsbzsl,
|
|
|
|
basic_products.zxxsbzbhsydysl,
|
|
|
|
basic_products.zxxsbzbhsydysl,
|
|
|
|
basic_products.bhxjcpbm,
|
|
|
|
basic_products.bhxjcpbm,
|
|
|
|
basic_products.bzcj,
|
|
|
|
basic_products.bzcj,
|
|
|
|
basic_products.cpmctymc,
|
|
|
|
basic_products.cpmctymc,
|
|
|
|
basic_products.cplb,
|
|
|
|
basic_products.cplb,
|
|
|
|
basic_products.flbm,
|
|
|
|
basic_products.flbm,
|
|
|
|
basic_products.ggxh,
|
|
|
|
basic_products.ggxh,
|
|
|
|
basic_products.qxlb,
|
|
|
|
basic_products.qxlb,
|
|
|
|
basic_products.tyshxydm,
|
|
|
|
basic_products.tyshxydm,
|
|
|
|
basic_products.ylqxzcrbarmc,
|
|
|
|
basic_products.ylqxzcrbarmc,
|
|
|
|
basic_products.zczbhhzbapzbh,
|
|
|
|
basic_products.zczbhhzbapzbh,
|
|
|
|
basic_products.ylqxzcrbarywmc,
|
|
|
|
basic_products.ylqxzcrbarywmc,
|
|
|
|
basic_products.sydycpbs,
|
|
|
|
basic_products.sydycpbs,
|
|
|
|
basic_products.sjcpbm,
|
|
|
|
basic_products.sjcpbm,
|
|
|
|
basic_products.versionNumber,
|
|
|
|
basic_products.versionNumber,
|
|
|
|
basic_products.diType,
|
|
|
|
basic_products.diType,
|
|
|
|
basic_products.ybbm,
|
|
|
|
basic_products.ybbm,
|
|
|
|
basic_products.sptm,
|
|
|
|
basic_products.sptm,
|
|
|
|
basic_products.manufactory,
|
|
|
|
basic_products.manufactory,
|
|
|
|
basic_products.measname,
|
|
|
|
basic_products.measname,
|
|
|
|
basic_products.productType,
|
|
|
|
basic_products.productType,
|
|
|
|
basic_products.scbssfbhph,
|
|
|
|
basic_products.scbssfbhph,
|
|
|
|
basic_products.scbssfbhxlh,
|
|
|
|
basic_products.scbssfbhxlh,
|
|
|
|
basic_products.scbssfbhscrq,
|
|
|
|
basic_products.scbssfbhscrq,
|
|
|
|
basic_products.scbssfbhsxrq,
|
|
|
|
basic_products.scbssfbhsxrq,
|
|
|
|
basic_products.cpms,
|
|
|
|
basic_products.cpms,
|
|
|
|
basic_products.allowNoBatch,
|
|
|
|
basic_products.allowNoBatch,
|
|
|
|
basic_products.allowNoExpire,
|
|
|
|
basic_products.allowNoExpire,
|
|
|
|
basic_products.allowNoProduct,
|
|
|
|
basic_products.allowNoProduct,
|
|
|
|
basic_products.allowNoSerial,
|
|
|
|
basic_products.allowNoSerial,
|
|
|
|
basic_products.spmc,
|
|
|
|
basic_products.spmc,
|
|
|
|
basic_products.cplx,
|
|
|
|
basic_products.cplx,
|
|
|
|
basic_products.hchzsb,
|
|
|
|
basic_products.hchzsb,
|
|
|
|
basic_products.cpdls,
|
|
|
|
basic_products.cpdls,
|
|
|
|
basic_products.price,
|
|
|
|
basic_products.price,
|
|
|
|
basic_products.basicPrductRemak1,
|
|
|
|
basic_products.basicPrductRemak1,
|
|
|
|
basic_products.basicPrductRemak2,
|
|
|
|
basic_products.basicPrductRemak2,
|
|
|
|
basic_products.basicPrductRemak3,
|
|
|
|
basic_products.basicPrductRemak3,
|
|
|
|
basic_products.basicPrductRemak4,
|
|
|
|
basic_products.basicPrductRemak4,
|
|
|
|
basic_products.basicPrductRemak5,
|
|
|
|
basic_products.basicPrductRemak5,
|
|
|
|
basic_products.basicPrductRemak6,
|
|
|
|
basic_products.basicPrductRemak6,
|
|
|
|
basic_products.basicPrductRemak7,
|
|
|
|
basic_products.basicPrductRemak7,
|
|
|
|
basic_products.basicPrductRemak8,
|
|
|
|
basic_products.basicPrductRemak8,
|
|
|
|
basic_products.sfwblztlcp,
|
|
|
|
basic_products.sfwblztlcp,
|
|
|
|
basic_products.cgzmraqxgxx,
|
|
|
|
basic_products.cgzmraqxgxx,
|
|
|
|
basic_products.sfbjwycxsy,
|
|
|
|
basic_products.sfbjwycxsy,
|
|
|
|
basic_products.zdcfsycs,
|
|
|
|
basic_products.zdcfsycs,
|
|
|
|
basic_products.sfwwjbz,
|
|
|
|
basic_products.sfwwjbz,
|
|
|
|
basic_products.syqsfxyjxmj,
|
|
|
|
basic_products.syqsfxyjxmj,
|
|
|
|
basic_products.mjfs,
|
|
|
|
basic_products.mjfs,
|
|
|
|
basic_products.categoryName,
|
|
|
|
basic_products.categoryName,
|
|
|
|
basic_products.cphhhbh
|
|
|
|
basic_products.cphhhbh
|
|
|
|
FROM basic_udirel
|
|
|
|
FROM basic_udirel
|
|
|
|
INNER JOIN basic_products
|
|
|
|
INNER JOIN basic_products
|
|
|
|
on basic_udirel.uuid = basic_products.uuid
|
|
|
|
on basic_udirel.uuid = basic_products.uuid
|
|
|
|
<where>
|
|
|
|
<where>
|
|
|
|
<if test="nameCode != null">
|
|
|
|
<if test="nameCode != null">
|
|
|
|
AND nameCode = #{nameCode}
|
|
|
|
AND nameCode = #{nameCode}
|
|
|
|
@ -1314,14 +1318,14 @@
|
|
|
|
<select id="selectProductNameByRelId" resultType="java.lang.String">
|
|
|
|
<select id="selectProductNameByRelId" resultType="java.lang.String">
|
|
|
|
select basic_products.cpmctymc
|
|
|
|
select basic_products.cpmctymc
|
|
|
|
from basic_udirel
|
|
|
|
from basic_udirel
|
|
|
|
left join basic_products on basic_udirel.uuid = basic_products.uuid
|
|
|
|
left join basic_products on basic_udirel.uuid = basic_products.uuid
|
|
|
|
where basic_udirel.id = #{relId}
|
|
|
|
where basic_udirel.id = #{relId}
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
<update id="updateBatchById" parameterType="java.util.List">
|
|
|
|
<update id="updateBatchById" parameterType="java.util.List">
|
|
|
|
<foreach collection="list" item="item" separator=";">
|
|
|
|
<foreach collection="list" item="item" separator=";">
|
|
|
|
update
|
|
|
|
update
|
|
|
|
basic_udirel
|
|
|
|
basic_udirel
|
|
|
|
set `relCode` = #{item.relCode}
|
|
|
|
set `relCode` = #{item.relCode}
|
|
|
|
where id = #{item.id}
|
|
|
|
where id = #{item.id}
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
|
@ -1343,82 +1347,82 @@
|
|
|
|
<select id="selectRelIdByNameCode" resultType="java.lang.String">
|
|
|
|
<select id="selectRelIdByNameCode" resultType="java.lang.String">
|
|
|
|
select basic_udirel.id
|
|
|
|
select basic_udirel.id
|
|
|
|
from basic_udirel
|
|
|
|
from basic_udirel
|
|
|
|
inner join basic_products on basic_udirel.uuid = basic_products.uuid
|
|
|
|
inner join basic_products on basic_udirel.uuid = basic_products.uuid
|
|
|
|
where basic_products.nameCode = #{nameCode}
|
|
|
|
where basic_products.nameCode = #{nameCode}
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
<select id="selectOneUdiJoinSup" resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
|
|
|
|
<select id="selectOneUdiJoinSup" resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
|
|
|
|
select basic_udirel.*,
|
|
|
|
select basic_udirel.*,
|
|
|
|
basic_products.originUuid,
|
|
|
|
basic_products.originUuid,
|
|
|
|
basic_products.nameCode,
|
|
|
|
basic_products.nameCode,
|
|
|
|
basic_products.deviceRecordKey,
|
|
|
|
basic_products.deviceRecordKey,
|
|
|
|
basic_products.packRatio,
|
|
|
|
basic_products.packRatio,
|
|
|
|
basic_products.packUnit,
|
|
|
|
basic_products.packUnit,
|
|
|
|
basic_products.packLevel,
|
|
|
|
basic_products.packLevel,
|
|
|
|
basic_products.bhxjsl,
|
|
|
|
basic_products.bhxjsl,
|
|
|
|
basic_products.bhzxxsbzsl,
|
|
|
|
basic_products.bhzxxsbzsl,
|
|
|
|
basic_products.zxxsbzbhsydysl,
|
|
|
|
basic_products.zxxsbzbhsydysl,
|
|
|
|
basic_products.bhxjcpbm,
|
|
|
|
basic_products.bhxjcpbm,
|
|
|
|
basic_products.bzcj,
|
|
|
|
basic_products.bzcj,
|
|
|
|
basic_products.cpmctymc,
|
|
|
|
basic_products.cpmctymc,
|
|
|
|
basic_products.cplb,
|
|
|
|
basic_products.cplb,
|
|
|
|
basic_products.flbm,
|
|
|
|
basic_products.flbm,
|
|
|
|
basic_products.ggxh,
|
|
|
|
basic_products.ggxh,
|
|
|
|
basic_products.qxlb,
|
|
|
|
basic_products.qxlb,
|
|
|
|
basic_products.tyshxydm,
|
|
|
|
basic_products.tyshxydm,
|
|
|
|
basic_products.ylqxzcrbarmc,
|
|
|
|
basic_products.ylqxzcrbarmc,
|
|
|
|
basic_products.zczbhhzbapzbh,
|
|
|
|
basic_products.zczbhhzbapzbh,
|
|
|
|
basic_products.ylqxzcrbarywmc,
|
|
|
|
basic_products.ylqxzcrbarywmc,
|
|
|
|
basic_products.sydycpbs,
|
|
|
|
basic_products.sydycpbs,
|
|
|
|
basic_products.sjcpbm,
|
|
|
|
basic_products.sjcpbm,
|
|
|
|
basic_products.versionNumber,
|
|
|
|
basic_products.versionNumber,
|
|
|
|
basic_products.diType,
|
|
|
|
basic_products.diType,
|
|
|
|
basic_products.ybbm,
|
|
|
|
basic_products.ybbm,
|
|
|
|
basic_products.sptm,
|
|
|
|
basic_products.sptm,
|
|
|
|
basic_products.manufactory,
|
|
|
|
basic_products.manufactory,
|
|
|
|
basic_products.measname,
|
|
|
|
basic_products.measname,
|
|
|
|
basic_products.productType,
|
|
|
|
basic_products.productType,
|
|
|
|
basic_products.scbssfbhph,
|
|
|
|
basic_products.scbssfbhph,
|
|
|
|
basic_products.scbssfbhxlh,
|
|
|
|
basic_products.scbssfbhxlh,
|
|
|
|
basic_products.scbssfbhscrq,
|
|
|
|
basic_products.scbssfbhscrq,
|
|
|
|
basic_products.scbssfbhsxrq,
|
|
|
|
basic_products.scbssfbhsxrq,
|
|
|
|
basic_products.cpms,
|
|
|
|
basic_products.cpms,
|
|
|
|
basic_products.allowNoBatch,
|
|
|
|
basic_products.allowNoBatch,
|
|
|
|
basic_products.allowNoExpire,
|
|
|
|
basic_products.allowNoExpire,
|
|
|
|
basic_products.allowNoProduct,
|
|
|
|
basic_products.allowNoProduct,
|
|
|
|
basic_products.allowNoSerial,
|
|
|
|
basic_products.allowNoSerial,
|
|
|
|
basic_products.spmc,
|
|
|
|
basic_products.spmc,
|
|
|
|
basic_products.cplx,
|
|
|
|
basic_products.cplx,
|
|
|
|
basic_products.hchzsb,
|
|
|
|
basic_products.hchzsb,
|
|
|
|
basic_products.cpdls,
|
|
|
|
basic_products.cpdls,
|
|
|
|
company_product_relevance.price,
|
|
|
|
company_product_relevance.price,
|
|
|
|
basic_products.basicPrductRemak1,
|
|
|
|
basic_products.basicPrductRemak1,
|
|
|
|
basic_products.basicPrductRemak2,
|
|
|
|
basic_products.basicPrductRemak2,
|
|
|
|
basic_products.basicPrductRemak3,
|
|
|
|
basic_products.basicPrductRemak3,
|
|
|
|
basic_products.basicPrductRemak4,
|
|
|
|
basic_products.basicPrductRemak4,
|
|
|
|
basic_products.basicPrductRemak5,
|
|
|
|
basic_products.basicPrductRemak5,
|
|
|
|
basic_products.basicPrductRemak6,
|
|
|
|
basic_products.basicPrductRemak6,
|
|
|
|
basic_products.basicPrductRemak7,
|
|
|
|
basic_products.basicPrductRemak7,
|
|
|
|
basic_products.basicPrductRemak8,
|
|
|
|
basic_products.basicPrductRemak8,
|
|
|
|
basic_products.sfwblztlcp,
|
|
|
|
basic_products.sfwblztlcp,
|
|
|
|
basic_products.cgzmraqxgxx,
|
|
|
|
basic_products.cgzmraqxgxx,
|
|
|
|
basic_products.sfbjwycxsy,
|
|
|
|
basic_products.sfbjwycxsy,
|
|
|
|
basic_products.zdcfsycs,
|
|
|
|
basic_products.zdcfsycs,
|
|
|
|
basic_products.sfwwjbz,
|
|
|
|
basic_products.sfwwjbz,
|
|
|
|
basic_products.syqsfxyjxmj,
|
|
|
|
basic_products.syqsfxyjxmj,
|
|
|
|
basic_products.mjfs,
|
|
|
|
basic_products.mjfs,
|
|
|
|
basic_products.categoryName,
|
|
|
|
basic_products.categoryName,
|
|
|
|
basic_products.requireScanCode,
|
|
|
|
basic_products.requireScanCode,
|
|
|
|
company_product_relevance.unitFk,
|
|
|
|
company_product_relevance.unitFk,
|
|
|
|
basic_corp.name companyName,
|
|
|
|
basic_corp.name companyName,
|
|
|
|
basic_products.cphhhbh
|
|
|
|
basic_products.cphhhbh
|
|
|
|
FROM basic_udirel
|
|
|
|
FROM basic_udirel
|
|
|
|
inner JOIN basic_products
|
|
|
|
inner JOIN basic_products
|
|
|
|
ON basic_products.uuid = basic_udirel.uuid
|
|
|
|
ON basic_products.uuid = basic_udirel.uuid
|
|
|
|
left join company_product_relevance
|
|
|
|
left join company_product_relevance
|
|
|
|
on basic_udirel.id = company_product_relevance.udiRlIdFk
|
|
|
|
on basic_udirel.id = company_product_relevance.udiRlIdFk
|
|
|
|
left JOIN basic_corp
|
|
|
|
left JOIN basic_corp
|
|
|
|
on basic_corp.erpId = company_product_relevance.customerId
|
|
|
|
on basic_corp.erpId = company_product_relevance.customerId
|
|
|
|
|
|
|
|
|
|
|
|
<where>
|
|
|
|
<where>
|
|
|
|
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
|
|
|
|
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
|
|
|
|
@ -1478,7 +1482,7 @@
|
|
|
|
AND nameCode = #{uniqueNameCode}
|
|
|
|
AND nameCode = #{uniqueNameCode}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="relIds != null and relIds.size() > 0">
|
|
|
|
<if test="relIds != null and relIds.size() > 0">
|
|
|
|
and basic_udirel.id in
|
|
|
|
and basic_udirel.id in
|
|
|
|
<foreach collection="relIds" item="item" index="index" separator="," open="(" close=")">
|
|
|
|
<foreach collection="relIds" item="item" index="index" separator="," open="(" close=")">
|
|
|
|
#{item}
|
|
|
|
#{item}
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
|
|
anthonywj
8 months ago