总部特殊订单当选择经销商编码为2314和2315时，无需选择领域，订单账户默认现金账户。

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

@@ -114,6 +114,15 @@ public class Order extends Controller {
         } else {
             sqlFactory.addParameter("sa_accountclassid", beans.order.Order.getDefaultAccount(siteid, type));
         }
+        Rows rows =dbConnect.runSqlQuery("select * from  sa_agents where agentnum in('2314','2315') and siteid='"+siteid+"'");
+        if(!rows.isEmpty()){
+            for (Row row:rows) {
+                if(row.getLong("sys_enterpriseid")==sys_enterpriseid && type.equals("特殊订单")){
+                    sqlFactory.addParameter("sa_accountclassid", "67");
+                }
+            }
+        }
+
         //品牌ID
         sqlFactory.addParameter("sa_brandid", sa_brandid);
         //合同ID

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

@@ -840,6 +840,14 @@ public class OrderItems extends Controller {
                 } else {
                     sqlFactory = new SQLFactory(this, "查询可添加商品列表_特殊订单", pageSize, pageNumber, pageSorting);
                 }
+                Rows rows =dbConnect.runSqlQuery("select * from  sa_agents where agentnum in('2314','2315') and siteid='"+siteid+"'");
+                if(!rows.isEmpty()){
+                    for (Row row:rows) {
+                        if(row.getLong("sys_enterpriseid")==sys_enterpriseid){
+                            sqlFactory = new SQLFactory(this, "查询可添加商品列表_总部订单", pageSize, pageNumber, pageSorting);
+                        }
+                    }
+                }
                 sqlFactory.addParameter("tradefield", tradefield);
                 if (sys_enterpriseid1 > 0) {
                     where.append(" and t1.isonsale ='1' ");

src/custom/service/DispatchAutoCloseService.java

@@ -40,7 +40,7 @@ public class DispatchAutoCloseService extends ServiceController {
             RowsMap rowsMap1 = rowsdetail.toRowsMap("billno");
             ArrayList<String> sqlList = new ArrayList<>();
             ERPDocking erpDocking = new ERPDocking();
-            JSONArray ErpSainvoices = erpDocking.queryErpSainvoices(10000, 1, new JSONArray(), "", "", "", false,true);
+            JSONArray ErpSainvoices = erpDocking.queryErpSainvoices(10000, 1, new JSONArray(), "", "", "", false,false,true);
             JSONArray dispatchids = new JSONArray();
             JSONArray unclosedispatchids = new JSONArray();
             if (!ErpSainvoices.isEmpty()) {

src/custom/utility/ERPDocking.java

@@ -269,7 +269,7 @@ public class ERPDocking {
      * @return
      * @throws YosException
      */
-    public JSONArray queryErpSainvoices(int pagerows, int pagenum,JSONArray finvonums,String fagentnum,String fsonum,String fstatus,boolean onlyNeedClosed,boolean onlyNeedPartialOuts) throws YosException {
+    public JSONArray queryErpSainvoices(int pagerows, int pagenum,JSONArray finvonums,String fagentnum,String fsonum,String fstatus,boolean onlyNeedClosed,boolean onlyNeedPartialOuts,boolean onlyWithCheckedOuts) throws YosException {
         {
 
             JSONObject object= new JSONObject();
@@ -285,6 +285,7 @@ public class ERPDocking {
             objectdetail.put("fstatus",fstatus);
             objectdetail.put("onlyNeedClosed",onlyNeedClosed);
             objectdetail.put("onlyNeedPartialOuts",onlyNeedPartialOuts);
+            objectdetail.put("onlyWithCheckedOuts",onlyWithCheckedOuts);
             object.put("content",objectdetail);
 
             HashMap<String, String> map = new HashMap<>();