返退单审核时传k3

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/返退单反复核.sql

@@ -1 +1 @@
-update sa_aftersalesmag set status='审核',recheckby='',recheckdate=null,updatek3flag=2 where sa_aftersalesmagid = $sa_aftersalesmagid$ and siteid=$siteid$
+update sa_aftersalesmag set status='审核',recheckby='',recheckdate=null where sa_aftersalesmagid = $sa_aftersalesmagid$ and siteid=$siteid$

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/返退单反审核.sql

@@ -1 +1 @@
-update sa_aftersalesmag set status='提交',checkby='',checkdate=null  where sa_aftersalesmagid = $sa_aftersalesmagid$ and siteid=$siteid$
+update sa_aftersalesmag set status='提交',checkby='',checkdate=null,=2  where sa_aftersalesmagid = $sa_aftersalesmagid$ and siteid=$siteid$updatek3flag

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/返退单复核.sql

@@ -1 +1 @@
-update sa_aftersalesmag set status='复核',recheckby=$recheckby$,recheckdate=CURRENT_TIMESTAMP,updatek3flag=0 where sa_aftersalesmagid = $sa_aftersalesmagid$ and siteid=$siteid$
+update sa_aftersalesmag set status='复核',recheckby=$recheckby$,recheckdate=CURRENT_TIMESTAMP where sa_aftersalesmagid = $sa_aftersalesmagid$ and siteid=$siteid$

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/返退单审核.sql

@@ -1 +1 @@
-update sa_aftersalesmag set status='审核',checkby=$checkby$,checkdate=CURRENT_TIMESTAMP where sa_aftersalesmagid = $sa_aftersalesmagid$ and siteid=$siteid$
+update sa_aftersalesmag set status='审核',checkby=$checkby$,checkdate=CURRENT_TIMESTAMP,updatek3flag=0 where sa_aftersalesmagid = $sa_aftersalesmagid$ and siteid=$siteid$

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

@@ -500,6 +500,22 @@ public class dispatch extends Controller {
             return getErrReturnObject().setErrMsg("中间表存在未同步的销售出库单，无法手工关闭")
                     .toString();
         }
+        //
+        JSONObject object1 = new JSONObject();
+        object1.put("classname", "getIcinvbal");
+        object1.put("method", "canCloseSainvoiceByHand");
+
+        JSONObject content1 = new JSONObject();
+        content1.put("billno", rows.get(0).getString("billno"));
+        object1.put("content", content1);
+
+        String canCloseSainvoiceByHand = request.doPost(object1.toString(),
+                "http://60.190.151.198:8092/BYESB/jaxrs/webclientrest");
+
+        if(!canCloseSainvoiceByHand.equals("true")){
+            return getErrReturnObject().setErrMsg("中间表状态不为1，无法手工关闭")
+                    .toString();
+        }
 
 
         //对接erp生成erp发货单
@@ -549,6 +565,18 @@ public class dispatch extends Controller {
         sqlList.add(sqlFactoryupdate.getSQL());
         sqlList.add(DataContrlLog.createLog(this, "sa_dispatch", sa_dispatchid, "手工关闭", "发货单手工关闭成功").getSQL());
         dbConnect.runSqlUpdate(sqlList);
+
+        JSONObject objectfeek = new JSONObject();
+        objectfeek.put("classname", "getIcinvbal");
+        objectfeek.put("method", "updateSainvoiceStatus");
+
+        JSONObject contentfeek = new JSONObject();
+        contentfeek.put("billno", rows.get(0).getString("billno"));
+        objectfeek.put("content", contentfeek);
+
+         request.doPost(objectfeek.toString(),
+                "http://60.190.151.198:8092/BYESB/jaxrs/webclientrest");
+
         return getSucReturnObject().toString();
     }
 

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

@@ -136,7 +136,7 @@ public class itemgroup extends Controller {
                 where = where + " and (t3.brandname ='" + whereObject.getString("brandname") + "') ";
             }
             if (whereObject.containsKey("tradefield") && !"".equals(whereObject.getString("tradefield"))) {
-                where = where + " and (t1.tradefield like '%" + whereObject.getString("tradefield") + "%') ";
+                where=where+" and t1.sa_itemgroupid in(select t1.sa_itemgroupid from sa_itemgroupmx t1 left join plm_item_tradefield t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t2.tradefield like '%"+whereObject.getString("tradefield")+"%') ";
             }
             if (whereObject.containsKey("itemclassname") && !"".equals(whereObject.getString("itemclassname"))) {
                 where = where + " and (t5.itemclassname ='" + whereObject.getString("itemclassname") + "') ";