订单提交bug 修复

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

@@ -923,7 +923,7 @@ public class Order extends Controller {
         if (sys_enterpriseid <= 0) {
             return getErrReturnObject().setErrMsg("请选择订货企业信息").toString();
         }
-        if (!((row.getString("status").equals("新建") && !row.getString("type").equals("特殊订单")) || !(row.getString("status").equals("确认") && row.getString("type").equals("特殊订单")))) {
+        if (!((row.getString("status").equals("新建") && !row.getString("type").equals("特殊订单")) || (row.getString("status").equals("确认") && row.getString("type").equals("特殊订单")))) {
             return getErrReturnObject().setErrMsg("新建或非确认无法提交").toString();
         }
 
@@ -1392,6 +1392,9 @@ public class Order extends Controller {
             return getErrReturnObject().setErrMsg("订单不存在").toString();
         }
         Row row = rows.get(0);
+        if(!row.getString("status").equals("提交")){
+            return getErrReturnObject().setErrMsg("非提交状态无法撤回").toString();
+        }
         Long sa_accountclassid = row.getLong("sa_accountclassid");
         //验证结算企业
         Long pay_enterpriseid = row.getLong("pay_enterpriseid");

src/custom/restcontroller/webmanage/sale/order/SQL/订单_提交.sql

@@ -8,4 +8,4 @@ set changeuserid=$userid$,
     freightstatus = $freightstatus$
 where siteid = $siteid$
   and sa_orderid = $sa_orderid$
-  and status = '新建'
+  and status in ('新建','确认')