订单管理（楚楚）参照原楚楚E订单系统增加待手工关闭查询及经销商预提交的特殊订单明细分类默认“特价”，总部特殊订单增加“分类调整”

src/custom/restcontroller/R.java

@@ -5370,6 +5370,10 @@ public class R {
         public static class v1 {
         }
     }
+    public static class ID20230706094703 {
+        public static class v1 {
+        }
+    }
 
 }
 

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

@@ -718,6 +718,14 @@ public class Order extends Controller {
                     where.append(" and exists(SELECT * from sa_orderitems_change WHERE sa_orderid = t1.sa_orderid and siteid = t1.siteid)");
                 }
             }
+            if (whereObject.containsKey("tobeclosebyhand") && !"".equals(whereObject.getString("tobeclosebyhand"))) {
+                String tobeclosebyhand = whereObject.getStringValue("tobeclosebyhand");
+                if (tobeclosebyhand.equals("1")) {
+                    where.append(" and  t1.status !='手工关闭' and sa_orderid in (select sa_orderid from sa_orderitems t1 left join (select t2.sa_orderitemsid,t2.siteid,sum(outwarehouseqty) sumoutwarehouseqty from sa_dispatch_items t2 inner join sa_dispatch t3 on t2.sa_dispatchid=t3.sa_dispatchid and t2.siteid=t3.siteid GROUP BY sa_orderitemsid,siteid) t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid where t1.qty>ifnull(t2.sumoutwarehouseqty,0)  and t1.isfreeze=1) and sa_orderid in(select t1.sa_orderid from (select sa_orderid,t1.siteid,count(1) count from sa_orderitems t1 inner join (select t2.sa_orderitemsid,t2.siteid,sum(outwarehouseqty) sumoutwarehouseqty from sa_dispatch_items t2 inner join sa_dispatch t3 on t2.sa_dispatchid=t3.sa_dispatchid and t2.siteid=t3.siteid GROUP BY sa_orderitemsid,siteid) t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid where t1.isfreeze=0 and  t1.qty=t2.sumoutwarehouseqty group by sa_orderid,t1.siteid) t1 inner join (select sa_orderid,t1.siteid,count(1) count from sa_orderitems t1 where t1.isfreeze=0 group by sa_orderid,t1.siteid) t2 on t1.siteid=t2.siteid and t1.sa_orderid=t2.sa_orderid where t1.count=t2.count)");
+                } else {
+                    where.append(" and 1=1");
+                }
+            }
         }
 //        SQLFactory sqlFactory = new SQLFactory(this, "订单(管理端)_列表", pageSize, pageNumber, pageSorting);
 //        if (isExport) {
@@ -1240,6 +1248,29 @@ public class Order extends Controller {
         return selectDetail();
     }
 
+    @API(title = "更新订单明细分类", apiversion = R.ID20230706094703.v1.class)
+    public String updateTypemx() throws YosException {
+
+        Long sa_orderid = content.getLong("sa_orderid");
+        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("提交"))) {
+            return getErrReturnObject().setErrMsg("非预提交、提交、确认状态无法修改").toString();
+        }
+
+        SQLFactory sqlFactory = new SQLFactory(this, "更新订单明细分类");
+        sqlFactory.addParameter("siteid", siteid);
+        sqlFactory.addParameter("username", username);
+        sqlFactory.addParameter("userid", userid);
+        sqlFactory.addParameter("sa_orderid", sa_orderid);
+        sqlFactory.addParameter("typemx", typemx);
+        dbConnect.runSqlUpdate(sqlFactory);
+
+
+        return selectDetail();
+    }
+
 
     @API(title = "使用返利金", apiversion = R.ID20230218225002.v1.class)
     public String isUseRate() throws YosException {