tntdc hace 2 años
padre
commit
abc8b7835d

+ 1 - 1
adm/src/main/java/com/minpay/guomao/giveoutmanage/giveOutManageAction.java

@@ -380,7 +380,7 @@ public class giveOutManageAction implements IMINAction {
 			for (Object object : excelArray) {
 				Map<String,String> excelMap = (Map<String,String>)object;
 				//判断是否都为空,空的话直接下一个
-				if(CommonUtil.isEmpty(excelMap.get("specName")) && CommonUtil.isEmpty(excelMap.get("carNumber"))
+				if(CommonUtil.isEmpty(excelMap.get("specName")) /*&& CommonUtil.isEmpty(excelMap.get("carNumber"))*/
 						&& CommonUtil.isEmpty(excelMap.get("caseNo")) && CommonUtil.isEmpty(excelMap.get("weight")) && CommonUtil.isEmpty(excelMap.get("abfName"))){
 					   continue;
 				}

+ 1 - 1
adm/src/main/webapp/admin/warehouseChargesManage/queryWareChargeByType.html

@@ -258,7 +258,7 @@
    				supplier:supplier,
    				detailIdStr : detailIdStr,
    				awiId : awiId, 
-   				state : "00"
+   				state : state
    			}
 		});
 	}