Commit d0711e21ea5f0a565fe7c69d80a2389e830517ff
1 parent
b967d36b
fix: 修复MOM同步入库单时,存货类别编码为null报错的bug
Showing
1 changed file
with
6 additions
and
3 deletions
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
@@ -156,10 +156,10 @@ public class MesServiceImpl implements IMesService { | @@ -156,10 +156,10 @@ public class MesServiceImpl implements IMesService { | ||
156 | receiptDetail.setInventorySts("good"); | 156 | receiptDetail.setInventorySts("good"); |
157 | receiptDetail.setCreatedBy("MOM"); | 157 | receiptDetail.setCreatedBy("MOM"); |
158 | //判断是否为必须入库平库物料 | 158 | //判断是否为必须入库平库物料 |
159 | - if (judgeIsFlatWarehouse(material)) { | ||
160 | - receiptDetail.setIsMustFlatWarehouseMaterial(true); | ||
161 | - } else { | 159 | + if (material == null || !judgeIsFlatWarehouse(material)) { |
162 | receiptDetail.setIsMustFlatWarehouseMaterial(false); | 160 | receiptDetail.setIsMustFlatWarehouseMaterial(false); |
161 | + } else { | ||
162 | + receiptDetail.setIsMustFlatWarehouseMaterial(true); | ||
163 | } | 163 | } |
164 | shipemtnDetailList.add(receiptDetail); | 164 | shipemtnDetailList.add(receiptDetail); |
165 | } | 165 | } |
@@ -180,6 +180,9 @@ public class MesServiceImpl implements IMesService { | @@ -180,6 +180,9 @@ public class MesServiceImpl implements IMesService { | ||
180 | private boolean judgeIsFlatWarehouse(Material material) { | 180 | private boolean judgeIsFlatWarehouse(Material material) { |
181 | String cinvccode = material.getCinvccode(); | 181 | String cinvccode = material.getCinvccode(); |
182 | String defWareHouse = material.getDefWareHouse(); | 182 | String defWareHouse = material.getDefWareHouse(); |
183 | + if (cinvccode == null || defWareHouse == null) { | ||
184 | + return false; | ||
185 | + } | ||
183 | List<FlatWarehouseMaterial> list = flatWarehouseMaterialService.list(new LambdaQueryWrapper<FlatWarehouseMaterial>() | 186 | List<FlatWarehouseMaterial> list = flatWarehouseMaterialService.list(new LambdaQueryWrapper<FlatWarehouseMaterial>() |
184 | .eq(FlatWarehouseMaterial::getWarehouseCode, defWareHouse) | 187 | .eq(FlatWarehouseMaterial::getWarehouseCode, defWareHouse) |
185 | .eq(FlatWarehouseMaterial::getClassificationCode, cinvccode)); | 188 | .eq(FlatWarehouseMaterial::getClassificationCode, cinvccode)); |