发货单订单手工关闭功能状态由关闭变为手工关闭

src/custom/restcontroller/webmanage/sale/dispatch/SQL/发货单关闭.sql

@@ -1 +1 @@
-update sa_dispatch set status='关闭',closeby=$closeby$,closedate=CURRENT_TIMESTAMP where sa_dispatchid = $sa_dispatchid$ and siteid=$siteid$
+update sa_dispatch set status='手工关闭',closeby=$closeby$,closedate=CURRENT_TIMESTAMP where sa_dispatchid = $sa_dispatchid$ and siteid=$siteid$

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

@@ -2462,7 +2462,9 @@ public class Order extends Controller {
         if (orderRow.get(0).getString("status").equals("关闭")) {
             return getErrReturnObject().setErrMsg("订单已关闭，无法再次手工关闭").toString();
         }
-
+        if (!orderRow.get(0).getString("status").equals("审核")) {
+            return getErrReturnObject().setErrMsg("非审核状态无法手工关闭").toString();
+        }
 
         Long sys_enterpriseid = orderRow.get(0).getLong("sys_enterpriseid");
         Long sa_accountclassid = orderRow.get(0).getLong("sa_accountclassid");
@@ -2471,7 +2473,7 @@ public class Order extends Controller {
             return getErrReturnObject().setErrMsg("存在未关闭的发货单，无法关闭").toString();
         }
         ArrayList<String> sqlList = new ArrayList<>();
-        sqlList.add("UPDATE sa_order SET STATUS='关闭' WHERE sa_orderid='" + sa_orderid + "' and siteid = '" + siteid + "'");
+        sqlList.add("UPDATE sa_order SET STATUS='手工关闭' WHERE sa_orderid='" + sa_orderid + "' and siteid = '" + siteid + "'");
         sqlList.add("UPDATE sa_orderitems SET isclose=1 WHERE sa_orderid='" + sa_orderid + "' and siteid = '" + siteid + "'");
 
         Rows rows = dbConnect.runSqlQuery("SELECT sum(undeliqty*price) totalprice from sa_orderitems WHERE sa_orderid="+sa_orderid+" and siteid = '"+siteid+"'");

src/custom/restcontroller/webmanage/sale/order/SQL/订单商品明细_所有列表.sql

@@ -66,4 +66,4 @@ from sa_orderitems t1
          LEFT JOIN sys_enterprise t7 on t7.sys_enterpriseid = t5.sys_enterpriseid and t7.siteid = t5.siteid
 where t1.siteid = $siteid$
   and $where$
-  and t5.status in ('审核', '关闭')
+  and t5.status in ('审核', '关闭','手工关闭')