diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java index e19f9df45..ff4cbf19f 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java @@ -48,5 +48,7 @@ public class ThrProductsResponse { private String updateUser; private Date updateTime; private String remark; + private String manufactoryCode; + private String supCode; } diff --git a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java index 414030578..fb4431d22 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java @@ -240,7 +240,7 @@ public class BasicBackUpdateProductService { udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode()); udiRelevanceEntity1.setUpdateTime(new Date()); udiRelevanceEntity1.setModifyTime(new Date()); - udiRelevanceEntity1.setId(IdUtil.getSnowflakeNextId()); + udiRelevanceEntity1.setId(gennerOrderUtils.getRelId()); udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1); } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 4bd4fcc4a..b486399d1 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -295,6 +295,8 @@ public class ThrProductsServiceImpl extends ServiceImpl - - @@ -93,33 +101,36 @@ @@ -153,58 +166,60 @@ replace - INTO thr_products - (id,code, `name`, measname, spec, registerNo, manufactory, + INTO thr_products + (id, code, `name`, measname, spec, registerNo, manufactory, cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, - thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,price,createUser,createTime,updateUser) - values ( - #{id}, - #{code}, - #{name}, - #{measname}, - #{spec}, - #{registerNo}, - #{manufactory}, - #{cplb}, - #{flbm}, - #{qxlb}, - #{ybbm}, - #{sptm}, - #{tyshxydm}, - #{zczbhhzbapzbh}, - #{ylqxzcrbarmc}, - #{ylqxzcrbarywmc}, - #{cpms}, - #{thirdSysFk}, - #{updateTime}, - #{supName}, - #{model}, - #{standard}, - #{qtbm}, - #{zczyxqz}, - #{remark}, - #{remark1}, - #{remark2}, - #{remark3}, - #{price}, - #{createUser}, - #{createTime}, - #{updateUser} - ) + thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3, + price, createUser, createTime, updateUser, manufactoryCode, supCode) + values (#{id}, + #{code}, + #{name}, + #{measname}, + #{spec}, + #{registerNo}, + #{manufactory}, + #{cplb}, + #{flbm}, + #{qxlb}, + #{ybbm}, + #{sptm}, + #{tyshxydm}, + #{zczbhhzbapzbh}, + #{ylqxzcrbarmc}, + #{ylqxzcrbarywmc}, + #{cpms}, + #{thirdSysFk}, + #{updateTime}, + #{supName}, + #{model}, + #{standard}, + #{qtbm}, + #{zczyxqz}, + #{remark}, + #{remark1}, + #{remark2}, + #{remark3}, + #{price}, + #{createUser}, + #{createTime}, + #{updateUser}, #{manufactoryCode}, #{supCode}) replace - INTO thr_products - (code, `name`, measname, spec, registerNo, manufactory, - cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, - thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3, price, - createUser, createTime, updateUser) - values + INTO thr_products + (code, `name`, measname, spec, registerNo, manufactory, + cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, + thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3, + price, + createUser, createTime, updateUser, manufactoryCode, supCode) + values #{item.code}, #{item.name}, @@ -236,7 +251,7 @@ #{item.price}, #{item.createUser}, #{item.createTime}, - #{item.updateUser} + #{item.updateUser}, #{manufactoryCode}, #{supCode} @@ -268,7 +283,9 @@ remark1, remark2, remark3, - price + price, + manufactoryCode, + supCode from thr_products @@ -283,33 +300,35 @@ update thr_products - code = #{code,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, - measname = #{measname,jdbcType=VARCHAR}, - spec = #{spec,jdbcType=VARCHAR}, - registerNo = #{registerNo,jdbcType=VARCHAR}, - manufactory = #{manufactory,jdbcType=VARCHAR}, - cplb = #{cplb,jdbcType=VARCHAR}, - flbm = #{flbm,jdbcType=VARCHAR}, - qxlb = #{qxlb,jdbcType=VARCHAR}, - ybbm = #{ybbm,jdbcType=VARCHAR}, - sptm = #{sptm,jdbcType=VARCHAR}, - tyshxydm = #{tyshxydm,jdbcType=VARCHAR}, - zczbhhzbapzbh = #{zczbhhzbapzbh,jdbcType=VARCHAR}, - ylqxzcrbarmc = #{ylqxzcrbarmc,jdbcType=VARCHAR}, - ylqxzcrbarywmc = #{ylqxzcrbarywmc,jdbcType=VARCHAR}, - cpms = #{cpms,jdbcType=LONGVARCHAR}, - updateTime = #{updateTime,jdbcType=TIMESTAMP}, - supName = #{supName,jdbcType=VARCHAR}, - model = #{model,jdbcType=VARCHAR}, - standard = #{standard,jdbcType=VARCHAR}, - qtbm = #{qtbm,jdbcType=VARCHAR}, - zczyxqz = #{zczyxqz,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - remark1 = #{remark1,jdbcType=VARCHAR}, - remark2 = #{remark2,jdbcType=VARCHAR}, - remark3 = #{remark3,jdbcType=VARCHAR}, - price = #{price,jdbcType=VARCHAR} + code = #{code,jdbcType=VARCHAR}, + name = #{name,jdbcType=VARCHAR}, + measname = #{measname,jdbcType=VARCHAR}, + spec = #{spec,jdbcType=VARCHAR}, + registerNo = #{registerNo,jdbcType=VARCHAR}, + manufactory = #{manufactory,jdbcType=VARCHAR}, + cplb = #{cplb,jdbcType=VARCHAR}, + flbm = #{flbm,jdbcType=VARCHAR}, + qxlb = #{qxlb,jdbcType=VARCHAR}, + ybbm = #{ybbm,jdbcType=VARCHAR}, + sptm = #{sptm,jdbcType=VARCHAR}, + tyshxydm = #{tyshxydm,jdbcType=VARCHAR}, + zczbhhzbapzbh = #{zczbhhzbapzbh,jdbcType=VARCHAR}, + ylqxzcrbarmc = #{ylqxzcrbarmc,jdbcType=VARCHAR}, + ylqxzcrbarywmc = #{ylqxzcrbarywmc,jdbcType=VARCHAR}, + cpms = #{cpms,jdbcType=LONGVARCHAR}, + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + supName = #{supName,jdbcType=VARCHAR}, + model = #{model,jdbcType=VARCHAR}, + standard = #{standard,jdbcType=VARCHAR}, + qtbm = #{qtbm,jdbcType=VARCHAR}, + zczyxqz = #{zczyxqz,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + remark1 = #{remark1,jdbcType=VARCHAR}, + remark2 = #{remark2,jdbcType=VARCHAR}, + remark3 = #{remark3,jdbcType=VARCHAR}, + price = #{price,jdbcType=VARCHAR}, + manufactoryCode = #{manufactoryCode,jdbcType=VARCHAR}, + supCode = #{supCode,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER}