Merge remote-tracking branch 'origin/develop' into develop

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

@@ -450,11 +450,11 @@ public class aftersalesmag extends Controller {
                         .toString();
             }
         }
-        Rows stockbillRows = dbConnect.runSqlQuery("select * from st_stockbill_items t1 inner join st_stockbill t2 on t1.st_stockbillid=t2.st_stockbillid and t1.siteid=t2.siteid inner join sa_aftersalesmag_items t3 on  t1.sa_dispatch_itemsid=t3.sa_aftersalesmag_itemsid and t1.siteid=t3.siteid where t2.status='审核' and t2.rb=0 and t1.siteid='" + siteid + "' and t3.sa_aftersalesmagid=" + sa_aftersalesmagid);
-        if (stockbillRows.isEmpty()) {
-            return getErrReturnObject().setErrMsg("单号为：【" + rows.get(0).getString("billno") + "】的返退单在K3中还未退货，无法复核")
-                    .toString();
-        }
+//        Rows stockbillRows = dbConnect.runSqlQuery("select * from st_stockbill_items t1 inner join st_stockbill t2 on t1.st_stockbillid=t2.st_stockbillid and t1.siteid=t2.siteid inner join sa_aftersalesmag_items t3 on  t1.sa_dispatch_itemsid=t3.sa_aftersalesmag_itemsid and t1.siteid=t3.siteid where t2.status='审核' and t2.rb=0 and t1.siteid='" + siteid + "' and t3.sa_aftersalesmagid=" + sa_aftersalesmagid);
+//        if (stockbillRows.isEmpty()) {
+//            return getErrReturnObject().setErrMsg("单号为：【" + rows.get(0).getString("billno") + "】的返退单在K3中还未退货，无法复核")
+//                    .toString();
+//        }
 
         ArrayList<String> sqlList = new ArrayList<>();
         Rows sa_aftersalesmag_itemsRows = dbConnect.runSqlQuery("select t1.qty,t1.sa_orderitemsid,t2.itemno,t2.itemname,t2.skucontrol from sa_aftersalesmag_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_aftersalesmagid=" + sa_aftersalesmagid);

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

@@ -1255,7 +1255,11 @@ public class Order extends Controller {
         String typemx = content.getStringValue("typemx");
 
         Rows orderRows = getOrderRows(this, sa_orderid);
-        if (!(orderRows.get(0).getString("status").equals("预提交") || orderRows.get(0).getString("status").equals("确认") || orderRows.get(0).getString("status").equals("提交"))) {
+        if (orderRows.isEmpty()) {
+            return getErrReturnObject().setErrMsg("订单数据不存在").toString();
+        }
+        String status = orderRows.get(0).getString("status");
+        if (!(status.equals("预提交") || status.equals("确认") || status.equals("提交"))) {
             return getErrReturnObject().setErrMsg("非预提交、提交、确认状态无法修改").toString();
         }
 
@@ -3476,6 +3480,7 @@ public class Order extends Controller {
         sqlList.add("update sa_order set sa_accountclassinfos='" + jsonArray + "' where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
         return sqlList;
     }
+
     /**
      * 判断是否在同一个月
      *