订单一键出库

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1516,6 +1516,9 @@ public class Order extends Controller {
         if (rows.isEmpty()) {
             return getErrReturnObject().setErrMsg("订单不存在").toString();
         }
+        if (!rows.get(0).getString("status").equals("审核")) {
+            return getErrReturnObject().setErrMsg("非审核状态的订单无法一键出库").toString();
+        }
         if(sa_orderitemsids.isEmpty()){
             return getErrReturnObject().setErrMsg("未选择订单明细,无法一键出库").toString();
         }
@@ -1524,8 +1527,8 @@ public class Order extends Controller {
         }
         ArrayList<String> sqlList = new ArrayList<>();
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_orderitems","*");
-        stockbillQuerySQL.setTableAlias("t1");
-        stockbillQuerySQL.addJoinTable(JOINTYPE.inner, "plm_item", "t2", "t2.itemid=t1.itemid and t1.siteid=t2.siteid","skucontrol");
+        querySQL.setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.inner, "plm_item", "t2", "t2.itemid=t1.itemid and t1.siteid=t2.siteid","skucontrol");
         querySQL.setWhere("t1.siteid",siteid);
         querySQL.setWhere("t1.sa_orderitemsid",sa_orderitemsids);
         Rows rowsdetail = querySQL.query();

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

@@ -310,6 +310,10 @@ public class stockbill extends Controller {
 
             dbConnect.runSqlUpdate(
                     "delete from st_stockbill where siteid='" + siteid + "' and st_stockbillid=" + st_stockbillid);
+            dbConnect.runSqlUpdate(
+                    "delete from st_stockbill_items where siteid='" + siteid + "' and st_stockbillid=" + st_stockbillid);
+            dbConnect.runSqlUpdate(
+                    "delete from st_stockbill_items_sku where siteid='" + siteid + "' and st_stockbillid=" + st_stockbillid);
         }
         return batchDeleteErr.getReturnObject().toString();
 

src/custom/restcontroller/webmanage/sale/stockbill/stockbillitems.java

@@ -301,6 +301,8 @@ public class stockbillitems extends Controller {
             ArrayList<String> list = new ArrayList<>();
             list.add("delete from st_stockbill_items where siteid='" + siteid
                     + "' and st_stockbill_itemsid=" + st_stockbill_itemsid);
+            list.add("delete from st_stockbill_items_sku where siteid='" + siteid
+                    + "' and st_stockbill_itemsid=" + st_stockbill_itemsid);
 
             dbConnect.runSqlUpdate(list);
         }