订单复制bug修复

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

@@ -2051,8 +2051,12 @@ public class Order extends Controller {
         //订货企业id
         if (sys_enterpriseid == 0) {
             sqlFactory.addParameter("sys_enterpriseid", row.getLong("sys_enterpriseid"));
+            //结算单位
+            sqlFactory.addParameter("pay_enterpriseid", row.getLong("sys_enterpriseid"));
         } else {
             sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
+            //结算单位
+            sqlFactory.addParameter("pay_enterpriseid", sys_enterpriseid);
         }
 
         //营销账户类型ID
@@ -2081,8 +2085,6 @@ public class Order extends Controller {
         }
         // 领域
         sqlFactory.addParameter("tradefield", row.getString("tradefield"));
-        //结算单位
-        sqlFactory.addParameter("pay_enterpriseid", row.getLong("pay_enterpriseid"));
         //单据日期
         sqlFactory.addParameter("billdate", row.getString("billdate"));
         sqlFactory.addParameter("rebate_userate", row.getBigDecimal("rebate_userate"));

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

@@ -762,20 +762,26 @@ public class OrderItems extends Controller {
         Long sa_brandid = 0L;
         String tradefield = "";
         String type = "";
+        String typemx = "";
         Long sys_enterpriseid = 0L;
         if (orderRows.isNotEmpty()) {
             sa_brandid = orderRows.get(0).getLong("sa_brandid");
             tradefield = orderRows.get(0).getString("tradefield");
             type = orderRows.get(0).getString("type");
+            typemx = orderRows.get(0).getString("typemx");
             sys_enterpriseid = orderRows.get(0).getLong("sys_enterpriseid");
         }
         SQLFactory sqlFactory = new SQLFactory(this, "查询可添加商品列表", pageSize, pageNumber, pageSorting);
         switch (type) {
-            case "总部订单":
-                sqlFactory = new SQLFactory(this, "查询可添加商品列表_总部订单", pageSize, pageNumber, pageSorting);
-                break;
+//            case "总部订单":
+//                sqlFactory = new SQLFactory(this, "查询可添加商品列表_总部订单", pageSize, pageNumber, pageSorting);
+//                break;
             case "特殊订单":
-                sqlFactory = new SQLFactory(this, "查询可添加商品列表_特殊订单", pageSize, pageNumber, pageSorting);
+                if(typemx.equals("电商") || typemx.equals("工程") ){
+                    sqlFactory = new SQLFactory(this, "查询可添加商品列表_总部订单", pageSize, pageNumber, pageSorting);
+                }else {
+                    sqlFactory = new SQLFactory(this, "查询可添加商品列表_特殊订单", pageSize, pageNumber, pageSorting);
+                }
                 sqlFactory.addParameter("tradefield", tradefield);
                 if (sys_enterpriseid1 > 0) {
                     where.append(" and t1.isonsale ='1' ");