bug修复

src/custom/restcontroller/webmanage/lsak3/item/item.java

@@ -113,6 +113,7 @@ public class item extends Controller {
                 long itemid = createTableID("plm_item");
                 sqlFactory = new SQLFactory(this,"货品档案新增");
                 sqlFactory.addParameter("itemid",itemid);
+                sqlFactory.addParameter("sa_customschemeid", 0);
                 // 货品档案扩展属性字段表
                 SQLFactory sqlFactory1 = new SQLFactory(this, "货品档案-扩展新增");
                 sqlFactory1.addParameter("siteid", "lsa");
@@ -149,6 +150,7 @@ public class item extends Controller {
                 long itemid = itemRows.get(0).getLong("itemid");
                 sqlFactory = new SQLFactory(this,"货品档案更新");
                 sqlFactory.addParameter("itemid",itemid);
+                sqlFactory.addParameter("sa_customschemeid", itemRows.get(0).getLong("sa_customschemeid"));
                 Rows itemextendRows= dbConnect.runSqlQuery("select * from plm_itemextend where siteid='lsa' and itemid="+itemid);
                 SQLFactory sqlFactory1;
                 if(itemextendRows.isEmpty()){
@@ -254,7 +256,6 @@ public class item extends Controller {
             sqlFactory.addParameter("packageqty", fpackingqty);
             sqlFactory.addParameter("iswoodproducts", 0);
 
-            sqlFactory.addParameter("sa_customschemeid", 0);
             sqlFactory.addParameter("financeclasstype","");
             sqlFactory.addParameter("stockno","");
             sqlFactory.addParameter("volume", 0);

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

@@ -184,6 +184,16 @@ public class Order extends Controller {
                 if(sa_accountclassid<=0){
                     return getErrReturnObject().setErrMsg("账户不存在").toString();
                 }
+                if(type.equals("特殊订单") || type.equals("标准订单")){
+                    Rows accountclassrows = dbConnect.runSqlQuery("select * from sa_accountclass where siteid='"+siteid+"' and sa_accountclassid="+sa_accountclassid);
+                    if(accountclassrows.isEmpty()){
+                        return getErrReturnObject().setErrMsg("账户不存在").toString();
+                    }else{
+                        if(accountclassrows.get(0).getString("accountname").equals("活动账户")){
+                            return getErrReturnObject().setErrMsg("标准订单或特殊订单禁止选择活动账户").toString();
+                        }
+                    }
+                }
                 sqlFactory.addParameter("sa_accountclassid", sa_accountclassid);
                 sqlList.addAll(updateAccountclassinfos(sa_orderid,sa_accountclassid, sys_enterpriseid));
             }
@@ -201,6 +211,12 @@ public class Order extends Controller {
                             return getErrReturnObject().setErrMsg("物料账户只能添加物料商品，请检查").toString();
                         }
                     }
+
+                    if(type.equals("特殊订单") || type.equals("标准订单")){
+                        if(accountclassRows.get(0).getString("accountname").equals("活动账户")){
+                            return getErrReturnObject().setErrMsg("标准订单或特殊订单禁止选择活动账户").toString();
+                        }
+                    }
                 }else {
                     return getErrReturnObject().setErrMsg("账户不存在").toString();
                 }

src/custom/restcontroller/webmanage/sale/salearea/salearea.java

@@ -414,7 +414,7 @@ public class salearea extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid",
-                "enterprisename", "phonenumber", "contact", "province", "city", "county", "address", "limitreturnday", "freefreightamount", "invoicingpoint");
+                "enterprisename", "phonenumber", "contact", "province", "city", "county", "address", "limitreturnday", "freefreightamount", "invoicingpoint","saleclassauth");
         querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t4", "t1.sys_enterpriseid = t4.ownerid and ownertable = 'sys_enterprise' and t1.siteid = t4.siteid",
                 "erpagentnum");
         querySQL.setWhere("t1.siteid", siteid);