u8拉取面辅料获取物料分类

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -522,13 +522,13 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						if(item.getNetWeight()!=null){
 							item.setTotalPrice(item.getNetWeight().multiply(item.getPrice()));//净重*单价
 						}else{
-							throw new JeecgBootException("单位为kg的物料请填写净重,用于计算金额");
+							//throw new JeecgBootException("单位为kg的物料请填写净重,用于计算金额");
 						}
 					}else{
 						if(item.getActualDeclaredQuantity()!=null){
 							item.setTotalPrice(item.getActualDeclaredQuantity().multiply(item.getPrice()));//实际报关数量*单价
 						}else{
-							throw new JeecgBootException("单位不为kg的物料请填写实际报关数量,用于计算金额");
+							//throw new JeecgBootException("单位不为kg的物料请填写实际报关数量,用于计算金额");
 						}
 					}
 					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().indexOf("04")>-1
@@ -595,13 +595,13 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						if(item.getNetWeight()!=null){
 							item.setTotalPrice(item.getNetWeight().multiply(item.getPrice()));//净重*单价
 						}else{
-							throw new JeecgBootException("单位为kg的物料请填写净重,用于计算金额");
+							//throw new JeecgBootException("单位为kg的物料请填写净重,用于计算金额");
 						}
 					}else{
 						if(item.getActualDeclaredQuantity()!=null){
 							item.setTotalPrice(item.getActualDeclaredQuantity().multiply(item.getPrice()));//实际报关数量*单价
 						}else{
-							throw new JeecgBootException("单位不为kg的物料请填写实际报关数量,用于计算金额");
+							//throw new JeecgBootException("单位不为kg的物料请填写实际报关数量,用于计算金额");
 						}
 					}
 				}
@@ -1426,6 +1426,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						queryWrapper2.last("limit 1");
 						SyShippingDetailsItem syShippingDetailsItem = syShippingDetailsItemMapper.selectOne(queryWrapper2);
 						if (syShippingDetailsItem != null) {
+							sy1.setInventoryCcode(syShippingDetailsItem.getInventoryCcode()); 
 							String elementsId = syShippingDetailsItem.getElementsId();//申报要素id
 							if (oConvertUtils.isNotEmpty(elementsId)) {
 								SyDeclarationElements syDeclarationElements = syDeclarationElementsMapper.selectById(elementsId);