托书更新面辅料判断

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -175,13 +175,17 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setStyleNumber(itemli.getItemNumber());
                         syShippingOrderItem.setNumber(itemli.getNetWeight());//数量(取实际报关数量)，2023.1.2现在改为取净重
 
-                        if(oConvertUtils.isEmpty(itemli.getU8Id())){
+                        if((itemli.getInventoryCcode().indexOf("03")!=-1&&!itemli.getInventoryCcode().equals("0399")) ||
+                                (itemli.getInventoryCcode().indexOf("02")!=-1&&!itemli.getInventoryCcode().equals("0299"))||
+                                (itemli.getInventoryCcode().indexOf("04")!=-1&&!itemli.getInventoryCcode().equals("0499"))){
+
                             syShippingOrderItem.setReadyFabric("面料");
                             syShippingOrderItem.setBoxNumber(itemli.getRolls());
                         }else{
                             syShippingOrderItem.setReadyFabric("辅料");
                             syShippingOrderItem.setBoxNumber(itemli.getRolls());
                         }
+
                         syShippingOrderItem.setGroupId(groupid);//分组ID
                         syShippingOrderItem.setContainerCode(li.getContainerCode());//集装箱代号
                         syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号