物流单bug修复

src/custom/restcontroller/webmanage/sale/logistics/LSALogistics.java

@@ -202,13 +202,14 @@ public class LSALogistics extends Controller {
         pageSorting = pageSorting.equals("''") ? "rowno" : pageSorting;
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "st_stockbill_items",
-                "st_stockbill_itemsid","unit","qty","amount","remarks");
+                "st_stockbill_itemsid","unit","amount","remarks");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "st_stockbill", "t2", "t2.st_stockbillid =t1.st_stockbillid and t2.siteid=t1.siteid",
                 "billno");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t3.itemid =t1.itemid and t3.siteid=t1.siteid",
                 "spec","itemno", "itemname", "model");
         querySQL.addQueryFields("price","amount/qty");
+        querySQL.addQueryFields("qty","qty-ifnull(transportqty,0)");
         querySQL.setWhere("t1.siteid='" + siteid + "'");
         querySQL.setWhere("t2.sys_enterpriseid=" + sys_enterpriseid);
         querySQL.setWhere("t2.status='审核'");
@@ -418,7 +419,7 @@ public class LSALogistics extends Controller {
             for (Row item : itemsrows) {
                 Long st_stockbill_itemsid = item.getLong("st_stockbill_itemsid");
                 BigDecimal qty = item.getBigDecimal("qty");
-                sqlList.add("UPDATE st_stockbill_items SET transportqty=transportqty-" + qty + " WHERE st_stockbill_itemsid=" + st_stockbill_itemsid + " and siteid='" + siteid + "'");
+                sqlList.add("UPDATE st_stockbill_items SET transportqty=ifnull(transportqty,0)-" + qty + " WHERE st_stockbill_itemsid=" + st_stockbill_itemsid + " and siteid='" + siteid + "'");
             }
         }
         if (status.equals("新建")) {
@@ -430,7 +431,7 @@ public class LSALogistics extends Controller {
                 if (isOut(this, st_stockbill_itemsid, qty)) {
                     return getErrReturnObject().setErrMsg("超出最大可送货数量").toString();
                 }
-                sqlList.add("UPDATE st_stockbill_items SET transportqty=transportqty+" + qty + " WHERE st_stockbill_itemsid=" + st_stockbill_itemsid + " and siteid='" + siteid + "'");
+                sqlList.add("UPDATE st_stockbill_items SET transportqty=ifnull(transportqty,0)+" + qty + " WHERE st_stockbill_itemsid=" + st_stockbill_itemsid + " and siteid='" + siteid + "'");
             }
 
             sqlList.add(DataContrlLog.createLog(this, "sa_logistics", sa_logisticsid, "审核", "审核:" + sa_logisticsid).getSQL());