查询库存bug修复

src/custom/restcontroller/webmanage/sale/invbal/SQL/商品未发货数量汇总.sql

@@ -4,5 +4,5 @@ FROM sa_orderitems t1
          inner join plm_item t2 on t1.siteid = t2.siteid and t1.itemid = t2.itemid
          inner join sa_order t3 on t1.siteid=t3.siteid and t1.sa_orderid=t3.sa_orderid
          left join plm_unit t4 on t2.unitid=t4.unitid and t2.siteid=t4.siteid
-WHERE t3.STATUS = '审核'
+WHERE t3.STATUS = ('提交','审核')
 and  t1.siteid=$siteid$ group by t1.itemno

src/custom/restcontroller/webmanage/sale/invbal/SQL/订单明细未发商品列表.sql

@@ -8,7 +8,7 @@ FROM sa_orderitems t1
          inner join plm_item t2 on t1.siteid = t2.siteid and t1.itemid = t2.itemid
          inner join sa_order t3 on t1.siteid=t3.siteid and t1.sa_orderid=t3.sa_orderid
          left join plm_unit t4 on t2.unitid=t4.unitid and t2.siteid=t4.siteid
-WHERE t3.STATUS = '审核'
+WHERE t3.STATUS in ('提交','审核')
   and ifnull(t1.undeliqty, 0) !=0
 	AND t1.siteid = $siteid$
 	AND ifnull( t1.isclose, 0 )= 0

src/custom/restcontroller/webmanage/sale/invbal/invbal.java

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 import beans.invbal.Invbal;
+import com.sun.tools.internal.xjc.reader.gbind.ElementSets;
 import common.Controller;
 import common.YosException;
 import common.annotation.API;
@@ -183,21 +184,20 @@ public class invbal extends Controller {
 		}
 		for (Row row:rows) {
 			row.put("itemclass", itemclassRowsMap.get(row.getString("itemid")));
-			if(sumQtyRowsMap.containsKey(row.getString("itemno"))){
-				if(sumQtyRowsMap.get(row.getString("itemno")).isNotEmpty()){
-					row.put("unsoldqty", sumQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("qty"));
-				}else {
-					row.put("unsoldqty", BigDecimal.ZERO);
-				}
-                if(sumUnQtyRowsMap.get(row.getString("itemno")).isNotEmpty()){
-                    row.put("undelqty", sumUnQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("undeliqty"));
-                }else {
-                    row.put("undelqty", BigDecimal.ZERO);
-                }
-				if(!row.containsKey("invbalqty")){
-					row.put("invbalqty",BigDecimal.ZERO);
-				}
+			if(sumQtyRowsMap.get(row.getString("itemno")).isNotEmpty()){
+				row.put("unsoldqty", sumQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("qty"));
+			}else {
+				row.put("unsoldqty", BigDecimal.ZERO);
+			}
+			if(sumUnQtyRowsMap.get(row.getString("itemno")).isNotEmpty()){
+				row.put("undelqty", sumUnQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("undeliqty"));
+			}else {
+				row.put("undelqty", BigDecimal.ZERO);
 			}
+			if(!row.containsKey("invbalqty")){
+				row.put("invbalqty",BigDecimal.ZERO);
+			}
+
 		}
 		return getSucReturnObject().setData(rows).toString();
 	}