Merge remote-tracking branch 'origin/develop' into develop

src/custom/restcontroller/webmanage/sale/itemgroup/SQL/商品查询.sql

@@ -3,6 +3,8 @@ SELECT t1.itemid,
        t1.itemname,
        t1.spec,
        t1.model,
+       t1.standards,
+       t1.cheek,
        t1.isonsale,
        t2.unitname,
        t1.orderaddqty,

src/custom/restcontroller/webmanage/sale/itemgroup/SQL/商品组列表查询.sql

@@ -12,11 +12,14 @@ SELECT t1.sa_itemgroupid,
        t1.groupname,
        t1.tradefield,
        t1.isonsale,
-       t1.sequence
+       t1.sequence,
+       t1.sa_customschemeid,
+       t4.schemename
 FROM sa_itemgroup t1
          LEFT JOIN plm_item t2 ON t1.itemno = t2.itemno
     AND t1.siteid = t2.siteid
          LEFT JOIN sa_brand t3 ON t3.sa_brandid = t1.sa_brandid
     AND t3.siteid = t1.siteid
+    LEFT JOIN sa_customscheme t4 ON t1.sa_customschemeid = t4.sa_customschemeid and t1.siteid=t4.siteid
 where $where$
   and t1.siteid = $siteid$

src/custom/restcontroller/webmanage/sale/itemgroup/SQL/商品组新增.sql

@@ -10,7 +10,8 @@ INSERT INTO sa_itemgroup (sa_itemgroupid,
                           groupname,
                           isonsale,
                           sa_brandid,
-                          sequence)
+                          sequence,
+                          sa_customschemeid)
 VALUES ($sa_itemgroupid$,
         $siteid$,
         $username$,
@@ -22,7 +23,9 @@ VALUES ($sa_itemgroupid$,
         $itemno$,
         $groupname$,
         0,
-        $sa_brandid$, $sequence$)
+        $sa_brandid$,
+        $sequence$,
+        $sa_customschemeid$)
 
 
 

src/custom/restcontroller/webmanage/sale/itemgroup/SQL/商品组更新.sql

@@ -3,5 +3,6 @@ SET changedate = CURRENT_TIME,
     changeby   = $username$,
     groupname  = $groupname$,
     itemno     = $itemno$,
+    sa_customschemeid=$sa_customschemeid$,
     sequence=$sequence$
 WHERE sa_itemgroupid = $sa_itemgroupid$ 

src/custom/restcontroller/webmanage/sale/itemgroup/SQL/商品组详情查询.sql

@@ -12,10 +12,13 @@ SELECT t1.sa_itemgroupid,
        t1.groupname,
        t1.tradefield,
        t1.isonsale,
-       t1.sequence
+       t1.sequence,
+       t1.sa_customschemeid,
+       t4.schemename
 FROM sa_itemgroup t1
          LEFT JOIN plm_item t2 ON t1.itemno = t2.itemno
     AND t1.siteid = t2.siteid
          LEFT JOIN sa_brand t3 ON t3.sa_brandid = t1.sa_brandid
     AND t3.siteid = t1.siteid
+        LEFT JOIN sa_customscheme t4 ON t1.sa_customschemeid = t4.sa_customschemeid and t1.siteid=t4.siteid
 where t1.sa_itemgroupid = $sa_itemgroupid$

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

@@ -42,6 +42,7 @@ public class itemgroup extends Controller {
         String groupname = content.getString("groupname");
         String itemno = content.getString("itemno");
         String tradefield = content.getStringValue("tradefield");
+        long sa_customschemeid=content.getLong("sa_customschemeid");
         Long sequence = content.getLongValue("sequence");
         JSONArray tagArray = content.getJSONArray("tag");
         ArrayList<String> list = (ArrayList<String>) JSONObject.parseArray(tagArray.toJSONString(), String.class);
@@ -72,6 +73,7 @@ public class itemgroup extends Controller {
             sqlAddFactory.addParameter("groupnum", billcode);
             sqlAddFactory.addParameter("tradefield", tradefield);
             sqlAddFactory.addParameter("sa_brandid", sa_brandid);
+            sqlAddFactory.addParameter("sa_customschemeid", sa_customschemeid);
             sqlAddFactory.addParameter("sequence", sequence);
             content.put("sa_itemgroupid", sa_itemgroupid);
 
@@ -96,6 +98,7 @@ public class itemgroup extends Controller {
             sqlUpdateFactory.addParameter("groupname", groupname);
             sqlUpdateFactory.addParameter("itemno", itemno);
             sqlUpdateFactory.addParameter("tradefield", tradefield);
+            sqlUpdateFactory.addParameter("sa_customschemeid", sa_customschemeid);
             sqlUpdateFactory.addParameter("sequence", sequence);
             sqlUpdateFactory.addParameter("username", username);
 
@@ -373,11 +376,17 @@ public class itemgroup extends Controller {
                         + " or  t1.itemno like '%" + whereObject.getString("condition") + "%')";
 
             }
-            if (whereObject.containsKey("brandname") && !"".equals(whereObject.getString("brandname"))) {
-                where = where + " and  t5.brandname ='" + whereObject.getString("brandname") + "'";
-            }
         }
         Long sa_itemgroupid = content.getLong("sa_itemgroupid");
+        long sa_customschemeid=0;
+        Rows rowscount = dbConnect.runSqlQuery(
+                "select sa_customschemeid from sa_itemgroup where siteid='"+siteid+"' and sa_itemgroupid=" + sa_itemgroupid);
+        if(rowscount.isNotEmpty()){
+            sa_customschemeid=rowscount.get(0).getLong("sa_customschemeid");
+        }
+        if(sa_customschemeid!=0){
+            where = where + " and  t1.sa_customschemeid ='" + sa_customschemeid + "'";
+        }
 //		String hrid = content.getString("hrid");
         SQLFactory sqlFactory = new SQLFactory(this, "商品查询", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter_SQL("where", where);

src/custom/restcontroller/webmanage/sale/rebatescheme/SQL/装修返利方案大类新增.sql

@@ -1,2 +1,8 @@
 insert into sa_rebatecategory (siteid, sa_rebatecategoryid,sa_rebateschemeid,itemclassid)
-values ($siteid$, $sa_rebatecategoryid$,$sa_rebateschemeid$,$itemclassid$);
+select $siteid$, $sa_rebatecategoryid$,$sa_rebateschemeid$,$itemclassid$
+FROM dual
+WHERE not exists(SELECT 1
+                 FROM sa_rebatecategory
+                 WHERE siteid = $siteid$
+                   and itemclassid = $itemclassid$
+                   )

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

@@ -109,6 +109,8 @@ public class stockbill extends Controller {
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid",
                 "enterprisename", "abbreviation");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid",
+                "agentnum" );
         querySQL.addQueryFields("enterprisephonenumber", "t2.phonenumber");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);