Browse Source

出运明细判断面辅料

zengtx 2 years ago
parent
commit
122676b2a2

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

@@ -719,7 +719,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  }
 
 					  //判断是不是辅料数据,如果是不必维护一下内容
-					  if(!li.getInventoryCcode().equals("04") && !li.getInventoryCcode().equals("05")&& !li.getInventoryCcode().equals("06")&& !li.getInventoryCcode().equals("07")&& !li.getInventoryCcode().equals("0299")&& !li.getInventoryCcode().equals("0399")){
+					  String code = li.getInventoryCcode().substring(0,2);
+					  String codeTwo = li.getInventoryCcode().substring(0,4);
+					  if(!code.equals("04") && !code.equals("05")&& !code.equals("06")&& !code.equals("07")&& !codeTwo.equals("0299")&& !codeTwo.equals("0399")){
 						  //判断物料成份。isTc、款号是否为空,为空不允许提交
 						  if(oConvertUtils.isEmpty(li.getItemNumber()) || oConvertUtils.isEmpty(li.getMaterialComposition()) || oConvertUtils.isEmpty(li.getIsTc())){
 							  result.setSuccess(false);