Explorar o código

发运明细导出面辅料调整

zengtx %!s(int64=2) %!d(string=hai) anos
pai
achega
fe18635262

+ 2 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -507,6 +507,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				}
 			  	//如果面料是光还 供应商(柒厂) =供应商 如果是印花布 则根据 将供应商柒厂) 是印花布的材料来源供应商 这2列都需要带值
 				  String sub = li.getInventoryCcode().substring(0,2);
+			  	  String subTwo = li.getInventoryCcode().substring(0,4);
 			  	//03 = 光坯,04 = 印花
                 if(sub.equals("03")){
 					li.setSupplier(li.getSupplier());
@@ -527,7 +528,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  }
 				  }
 				  //如果是辅料,报关数量取发运明细数量
-				  if(li.getInventoryCcode().equals("05")||li.getInventoryCcode().equals("06")||li.getInventoryCcode().equals("07")|| li.getInventoryCcode().equals("0299")|| li.getInventoryCcode().equals("0399") || li.getInventoryCcode().equals("0499")){
+				  if(sub.equals("05")||sub.equals("06")||sub.equals("07")|| subTwo.equals("0299")|| subTwo.equals("0399") || subTwo.equals("0499")){
 					 li.setCustomsQuantity(li.getShipmentQuantity().toString());
 				  }else{
 					  li.setCustomsQuantity("");