智业接口对接，第三方产品信息，仓库修改

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java

@@ -164,9 +164,12 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
                 Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
                 if (null != thirdId) {
                     ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
+                    if (thrInvWarehouseEntity != null) {
                         response.setThirdId(thrInvWarehouseEntity.getCode());
                         response.setThirdName(thrInvWarehouseEntity.getName());
                     }
+
+                }
                 result.add(response);
             } else if (sys.getThirdId().equals("thirdId1")) {
                 InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
@@ -175,9 +178,11 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
                 Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
                 if (null != thirdId) {
                     ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
+                    if (thrInvWarehouseEntity != null) {
                         response.setThirdId(thrInvWarehouseEntity.getCode());
                         response.setThirdName(thrInvWarehouseEntity.getName());
                     }
+                }
                 result.add(response);
             } else if (sys.getThirdId().equals("thirdId2")) {
                 InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
@@ -186,9 +191,11 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
                 Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
                 if (null != thirdId) {
                     ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
+                    if (thrInvWarehouseEntity != null) {
                         response.setThirdId(thrInvWarehouseEntity.getCode());
                         response.setThirdName(thrInvWarehouseEntity.getName());
                     }
+                }
                 result.add(response);
             } else if (sys.getThirdId().equals("thirdId3")) {
                 InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
@@ -197,9 +204,11 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
                 Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
                 if (null != thirdId) {
                     ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
+                    if (thrInvWarehouseEntity != null) {
                         response.setThirdId(thrInvWarehouseEntity.getCode());
                         response.setThirdName(thrInvWarehouseEntity.getName());
                     }
+                }
                 result.add(response);
             } else if (sys.getThirdId().equals("thirdId4")) {
                 InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
@@ -208,9 +217,11 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
                 Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
                 if (null != thirdId) {
                     ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
+                    if (thrInvWarehouseEntity != null) {
                         response.setThirdId(thrInvWarehouseEntity.getCode());
                         response.setThirdName(thrInvWarehouseEntity.getName());
                     }
+                }
                 result.add(response);
             }
         }

api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java

@@ -119,7 +119,7 @@ public class ThrProductsDlService {
         }
 
         int page = 1;
-        int limit = 100;
+        int limit = 50;
         while (page != -1) {
             FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest();
             BeanUtils.copyProperties(filterThrProductsRequest, filterErpGoodsRequest);

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml

@@ -30,7 +30,7 @@
         (
         code,name,measname,spec,registerNo,manufactory,
         cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms,
-        thirdSysFk,updateTime ,genKeyFk ,supName   )
+        thirdSysFk,updateTime ,genKeyFk ,supName,price   )
         values
             (
            #{code},
@@ -41,7 +41,7 @@
             #{manufactory},
             #{cplb}, #{flbm}, #{qxlb}, #{ybbm},#{sptm},
             #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms}
-            #{thirdSysFk},#{updateTime},#{genKeyFk},#{supName}
+            #{thirdSysFk},#{updateTime},#{genKeyFk},#{supName},#{price}
                  )
     </insert>
 
@@ -50,7 +50,7 @@
         (
         code,name,measname,spec,registerNo,manufactory,
         cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms,
-        thirdSysFk ,updateTime ,genKeyFk,supName )
+        thirdSysFk ,updateTime ,genKeyFk,supName,price )
         values
         <foreach collection="products" item="item" index="index"
                  separator=",">
@@ -63,7 +63,7 @@
             #{item.manufactory},
             #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm},#{item.sptm},
             #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc},#{item.cpms},
-            #{item.thirdSysFk}  ,#{item.updateTime},#{item.genKeyFk}   ,#{item.supName}       )
+            #{item.thirdSysFk}  ,#{item.updateTime},#{item.genKeyFk}   ,#{item.supName}   ,{item.price}    )
         </foreach>
     </insert>
     <delete id="deleteById" parameterType="Map">