查询可添加商品bug修复

src/custom/restcontroller/sale/creditbill/SQL/信用额度调整单列表查询.sql

@@ -12,5 +12,5 @@ SELECT
     t1.checkby,
     t1.checkdate
 FROM
-    sa_creditbill t1  
+    sa_creditbill t1
 where $where$ and t1.siteid=$siteid$

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -194,25 +194,32 @@ public class Item extends Controller {
         // 添加领域
         if (content.containsKey("tradefields")) {
             JSONArray tradefields = content.getJSONArray("tradefields");
-            for (Object obj : tradefields) {
-                String tradefield = (String) obj;
-                sqlFactory = new SQLFactory(this, "新增领域");
-                sqlFactory.addParameter("siteid", siteid);
-                sqlFactory.addParameter("plm_item_tradefieldid", createTableID("plm_item_tradefield"));
-                sqlFactory.addParameter("tradefield", tradefield);
-                sqlFactory.addParameter("userid", userid);
-                sqlFactory.addParameter("itemid", itemid);
-                sqlList.add(sqlFactory.getSQL());
-            }
+            if(!tradefields.isEmpty()){
+                if(tradefields.size()>1){
+                    return getErrReturnObject().setErrMsg("商品只能维护一个领域").toString();
+                }
+                sqlList.add("delete from plm_item_tradefield where itemid ="+itemid+" and siteid='"+siteid+"'");
+                for (Object obj : tradefields) {
+                    String tradefield = (String) obj;
+                    sqlFactory = new SQLFactory(this, "新增领域");
+                    sqlFactory.addParameter("siteid", siteid);
+                    sqlFactory.addParameter("plm_item_tradefieldid", createTableID("plm_item_tradefield"));
+                    sqlFactory.addParameter("tradefield", tradefield);
+                    sqlFactory.addParameter("userid", userid);
+                    sqlFactory.addParameter("itemid", itemid);
+                    sqlList.add(sqlFactory.getSQL());
+                }
 
-            if (tradefields.size() > 0) {
-                sqlFactory = new SQLFactory(this, "删除多余的领域");
-                sqlFactory.addParameter("siteid", siteid);
-                sqlFactory.addParameter_in("tradefield", tradefields.toArray());
-                sqlFactory.addParameter("userid", userid);
-                sqlFactory.addParameter("itemid", itemid);
-                sqlList.add(sqlFactory.getSQL());
+//                if (tradefields.size() > 0) {
+//                    sqlFactory = new SQLFactory(this, "删除多余的领域");
+//                    sqlFactory.addParameter("siteid", siteid);
+//                    sqlFactory.addParameter_in("tradefield", tradefields.toArray());
+//                    sqlFactory.addParameter("userid", userid);
+//                    sqlFactory.addParameter("itemid", itemid);
+//                    sqlList.add(sqlFactory.getSQL());
+//                }
             }
+
         }
 
         if (content.containsKey("itemclassids")) {

src/custom/restcontroller/webmanage/sale/order/SQL/查询可添加商品列表.sql

@@ -32,7 +32,7 @@ WHERE t1.siteid = $siteid$
   and t1.itemid in (SELECT t1.itemid
                     from sa_itemsaleclass t1
                              INNER JOIN plm_itemclass t2 ON t1.itemclassid = t2.itemclassid and t1.siteid = t2.siteid
-                             inner join plm_item_tradefield t3 on t1.siteid=t3.siteid and t3.tradefield =  $tradefield$
+                             inner join plm_item_tradefield t3 on t1.itemid=t3.itemid and t1.siteid=t3.siteid and t3.tradefield =  $tradefield$
                     WHERE t1.siteid = $siteid$
                       and t2.sa_brandid = $sa_brandid$
                       and $where2$)