diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java
index 0fdba7ff..2787948f 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java
@@ -164,8 +164,11 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
if (null != thirdId) {
ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
- response.setThirdId(thrInvWarehouseEntity.getCode());
- response.setThirdName(thrInvWarehouseEntity.getName());
+ if (thrInvWarehouseEntity != null) {
+ response.setThirdId(thrInvWarehouseEntity.getCode());
+ response.setThirdName(thrInvWarehouseEntity.getName());
+ }
+
}
result.add(response);
} else if (sys.getThirdId().equals("thirdId1")) {
@@ -175,8 +178,10 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
if (null != thirdId) {
ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
- response.setThirdId(thrInvWarehouseEntity.getCode());
- response.setThirdName(thrInvWarehouseEntity.getName());
+ if (thrInvWarehouseEntity != null) {
+ response.setThirdId(thrInvWarehouseEntity.getCode());
+ response.setThirdName(thrInvWarehouseEntity.getName());
+ }
}
result.add(response);
} else if (sys.getThirdId().equals("thirdId2")) {
@@ -186,8 +191,10 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
if (null != thirdId) {
ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
- response.setThirdId(thrInvWarehouseEntity.getCode());
- response.setThirdName(thrInvWarehouseEntity.getName());
+ if (thrInvWarehouseEntity != null) {
+ response.setThirdId(thrInvWarehouseEntity.getCode());
+ response.setThirdName(thrInvWarehouseEntity.getName());
+ }
}
result.add(response);
} else if (sys.getThirdId().equals("thirdId3")) {
@@ -197,8 +204,10 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
if (null != thirdId) {
ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
- response.setThirdId(thrInvWarehouseEntity.getCode());
- response.setThirdName(thrInvWarehouseEntity.getName());
+ if (thrInvWarehouseEntity != null) {
+ response.setThirdId(thrInvWarehouseEntity.getCode());
+ response.setThirdName(thrInvWarehouseEntity.getName());
+ }
}
result.add(response);
} else if (sys.getThirdId().equals("thirdId4")) {
@@ -208,8 +217,10 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
if (null != thirdId) {
ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
- response.setThirdId(thrInvWarehouseEntity.getCode());
- response.setThirdName(thrInvWarehouseEntity.getName());
+ if (thrInvWarehouseEntity != null) {
+ response.setThirdId(thrInvWarehouseEntity.getCode());
+ response.setThirdName(thrInvWarehouseEntity.getName());
+ }
}
result.add(response);
}
diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java
index 795061fb..b803301a 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java
+++ b/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);
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml
index cee62bdb..7e1078e4 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml
+++ b/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}
)
@@ -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
@@ -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} )