自动任务增加启动条件

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

@@ -257,8 +257,6 @@ public class invbal extends Controller {
 			row.put("canbesale", ((row.getBigDecimal("invbalqty").subtract(row.getBigDecimal("unsoldqty"))).subtract(row.getBigDecimal("undelqtysum"))).stripTrailingZeros().toPlainString());
 		}
 		if(isExport){
-
-
 			//去除不需要导出项
 			rows.getFieldList().remove("itemid");
 			rows.getFieldList().remove("packageqty");

src/custom/service/AftersalesmagAutoRecheckService.java

@@ -10,12 +10,14 @@ import common.data.Row;
 import common.data.Rows;
 import common.data.RowsMap;
 import common.data.SQLFactory;
+import common.parameter.properties;
 import org.apache.log4j.Logger;
 import utility.ERPDocking;
 import utility.tools.WebRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Properties;
 
 
 /**
@@ -24,97 +26,99 @@ import java.util.HashMap;
 public class AftersalesmagAutoRecheckService extends ServiceController {
 
     private static Logger logger = Logger.getLogger(AftersalesmagAutoRecheckService.class);
+
     @Override
 
     public void serviceRun() throws YosException {
-    	 //
-        Rows rows = dbConnect.runSqlQuery("select * from sa_aftersalesmag where status='审核' and type='换货单' and siteid='CCYOSG'");
-        RowsMap rowsMap1 = rows.toRowsMap("billno");
-        ArrayList<String> sqlList = new ArrayList<>();
-        ERPDocking erpDocking =new ERPDocking();
-        JSONArray ErpSareturns = erpDocking.queryErpSareturns(10000, 1, new JSONArray(), "", "", "换货", "",true);
-        if(!ErpSareturns.isEmpty()){
-            for (Object ErpSareturn:ErpSareturns) {
-                JSONObject erpSareturn = (JSONObject) ErpSareturn;
-                String billno = erpSareturn.getString("freturnnum");
-                long sa_aftersalesmagid=0;
-                if(rowsMap1.containsKey(billno)){
-                    if(rowsMap1.get(billno).isNotEmpty()){
-                        sa_aftersalesmagid=rowsMap1.get(billno).get(0).getLong("sa_aftersalesmagid");
-                    }else{
-                        logger.info("退货单【"+billno+"】不存在:");
+        //
+        Properties yosProperties = properties.getYosProperties();
+        if (yosProperties.getProperty("system.runmode.debug").equalsIgnoreCase("false")) {
+            Rows rows = dbConnect.runSqlQuery("select * from sa_aftersalesmag where status='审核' and type='换货单' and siteid='CCYOSG'");
+            RowsMap rowsMap1 = rows.toRowsMap("billno");
+            ArrayList<String> sqlList = new ArrayList<>();
+            ERPDocking erpDocking = new ERPDocking();
+            JSONArray ErpSareturns = erpDocking.queryErpSareturns(10000, 1, new JSONArray(), "", "", "换货", "", true);
+            if (!ErpSareturns.isEmpty()) {
+                for (Object ErpSareturn : ErpSareturns) {
+                    JSONObject erpSareturn = (JSONObject) ErpSareturn;
+                    String billno = erpSareturn.getString("freturnnum");
+                    long sa_aftersalesmagid = 0;
+                    if (rowsMap1.containsKey(billno)) {
+                        if (rowsMap1.get(billno).isNotEmpty()) {
+                            sa_aftersalesmagid = rowsMap1.get(billno).get(0).getLong("sa_aftersalesmagid");
+                        } else {
+                            logger.info("退货单【" + billno + "】不存在:");
+                            continue;
+                        }
+                    } else {
+                        logger.info("退货单【" + billno + "】不存在:");
                         continue;
                     }
-                }else {
-                    logger.info("退货单【"+billno+"】不存在:");
-                    continue;
-                }
-                JSONObject object= new JSONObject();
-                JSONObject objectdetail= new JSONObject();
-                object.put("access_token","basicDrp");
-                object.put("classname","Sareturn");
-                object.put("method","closeSareturn");
-                objectdetail.put("freturnnum",billno);
-                objectdetail.put("isManual",false);
-                object.put("content",objectdetail);
+                    JSONObject object = new JSONObject();
+                    JSONObject objectdetail = new JSONObject();
+                    object.put("access_token", "basicDrp");
+                    object.put("classname", "Sareturn");
+                    object.put("method", "closeSareturn");
+                    objectdetail.put("freturnnum", billno);
+                    objectdetail.put("isManual", false);
+                    object.put("content", objectdetail);
 
-                HashMap<String, String> map = new HashMap<>();
-                map.put("content-Type", "application/json");
-                String result = new WebRequest().doPost(object.toString(), "http://124.71.196.182:8001/rest/ws_v2/basicDrp", map);
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("content-Type", "application/json");
+                    String result = new WebRequest().doPost(object.toString(), "http://124.71.196.182:8001/rest/ws_v2/basicDrp", map);
 
-                JSONObject resultobject = JSONObject.parseObject(result);
-                try {
-                    Rows erpupdatelogRows = dbConnect.runSqlQuery(
-                            "select * from sys_erpupdatelog where ownertable='sa_aftersalesmag' and type='复核erp退/换货单' and ownerid=" + sa_aftersalesmagid);
-                    SQLFactory sqlFactory;
-                    if (!erpupdatelogRows.isEmpty()) {
-                        sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志更新");
-                        sqlFactory.addParameter("sys_erpupdatelogid", erpupdatelogRows.get(0).getLong("sys_erpupdatelogid"));
-                    } else {
-                        sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志新增");
-                        sqlFactory.addParameter("sys_erpupdatelogid", createTableID("sys_erpupdatelog"));
-                    }
-                    sqlFactory.addParameter("siteid", "CCYOSG");
-                    sqlFactory.addParameter("userid", 1);
-                    sqlFactory.addParameter("username","admin");
-                    sqlFactory.addParameter("ownerid", sa_aftersalesmagid);
-                    sqlFactory.addParameter("ownertable", "sa_aftersalesmag");
-                    sqlFactory.addParameter("type", "复核erp退/换货单");
-                    sqlFactory.addParameter("request", object.toString());
-                    sqlFactory.addParameter("response", resultobject.toJSONString());
+                    JSONObject resultobject = JSONObject.parseObject(result);
+                    try {
+                        Rows erpupdatelogRows = dbConnect.runSqlQuery(
+                                "select * from sys_erpupdatelog where ownertable='sa_aftersalesmag' and type='复核erp退/换货单' and ownerid=" + sa_aftersalesmagid);
+                        SQLFactory sqlFactory;
+                        if (!erpupdatelogRows.isEmpty()) {
+                            sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志更新");
+                            sqlFactory.addParameter("sys_erpupdatelogid", erpupdatelogRows.get(0).getLong("sys_erpupdatelogid"));
+                        } else {
+                            sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志新增");
+                            sqlFactory.addParameter("sys_erpupdatelogid", createTableID("sys_erpupdatelog"));
+                        }
+                        sqlFactory.addParameter("siteid", "CCYOSG");
+                        sqlFactory.addParameter("userid", 1);
+                        sqlFactory.addParameter("username", "admin");
+                        sqlFactory.addParameter("ownerid", sa_aftersalesmagid);
+                        sqlFactory.addParameter("ownertable", "sa_aftersalesmag");
+                        sqlFactory.addParameter("type", "复核erp退/换货单");
+                        sqlFactory.addParameter("request", object.toString());
+                        sqlFactory.addParameter("response", resultobject.toJSONString());
 
-                    if ("0".equals(resultobject.getString("errcode"))) {
-                        sqlFactory.addParameter("erpbillno", billno);
-                        sqlFactory.addParameter("errmsg", "");
+                        if ("0".equals(resultobject.getString("errcode"))) {
+                            sqlFactory.addParameter("erpbillno", billno);
+                            sqlFactory.addParameter("errmsg", "");
+                        } else {
+                            sqlFactory.addParameter("erpbillno", "");
+                            sqlFactory.addParameter("errmsg", resultobject.getString("errmsg"));
+                        }
+                        sqlFactory.addParameter("status", resultobject.getString("errcode"));
+                        sqlList.add(sqlFactory.getSQL());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    if (resultobject.getString("errcode").equals("0")) {
+                        sqlList.add("update sa_aftersalesmag set status='复核' where sa_aftersalesmagid='" + sa_aftersalesmagid + "' and siteid='CCYOSG'");
+                        SQLFactory sqlFactory = new SQLFactory(new DataContrlLog(), "数据操作日志新增");
+                        sqlFactory.addParameter("ownertable", "sa_aftersalesmag");
+                        sqlFactory.addParameter("ownerid", sa_aftersalesmagid);
+                        sqlFactory.addParameter("action", "自动复核");
+                        sqlFactory.addParameter("remarks", "换货单自动复核成功");
+                        sqlFactory.addParameter("actionuserid", "1");
+                        sqlFactory.addParameter("actionby", "admin");
+                        sqlFactory.addParameter("siteid", "CCYOSG");
+                        sqlList.add(sqlFactory.getSQL());
                     } else {
-                        sqlFactory.addParameter("erpbillno", "");
-                        sqlFactory.addParameter("errmsg", resultobject.getString("errmsg"));
+                        logger.info("换货单自动复核错误:" + resultobject.getString("errmsg"));
                     }
-                    sqlFactory.addParameter("status", resultobject.getString("errcode"));
-                    sqlList.add(sqlFactory.getSQL());
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if(resultobject.getString("errcode").equals("0")){
-                    sqlList.add("update sa_aftersalesmag set status='复核' where sa_aftersalesmagid='"+sa_aftersalesmagid+"' and siteid='CCYOSG'");
-                    SQLFactory sqlFactory = new SQLFactory(new DataContrlLog(), "数据操作日志新增");
-                    sqlFactory.addParameter("ownertable", "sa_aftersalesmag");
-                    sqlFactory.addParameter("ownerid", sa_aftersalesmagid);
-                    sqlFactory.addParameter("action", "自动复核");
-                    sqlFactory.addParameter("remarks", "换货单自动复核成功");
-                    sqlFactory.addParameter("actionuserid", "1");
-                    sqlFactory.addParameter("actionby", "admin");
-                    sqlFactory.addParameter("siteid", "CCYOSG");
-                    sqlList.add(sqlFactory.getSQL());
-                }else {
-                    logger.info("换货单自动复核错误:"+resultobject.getString("errmsg"));
                 }
             }
+            dbConnect.runSqlUpdate(sqlList);
         }
-        dbConnect.runSqlUpdate(sqlList);
     }
 
-   
-
 
 }

src/custom/service/DispatchAutoCloseService.java

@@ -10,12 +10,14 @@ import common.data.Row;
 import common.data.Rows;
 import common.data.RowsMap;
 import common.data.SQLFactory;
+import common.parameter.properties;
 import org.apache.log4j.Logger;
 import utility.ERPDocking;
 import utility.tools.WebRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Properties;
 
 
 /**
@@ -24,140 +26,142 @@ import java.util.HashMap;
 public class DispatchAutoCloseService extends ServiceController {
 
     private static Logger logger = Logger.getLogger(DispatchAutoCloseService.class);
+
     @Override
 
     public void serviceRun() throws YosException {
-    	 //
-        Rows rows = dbConnect.runSqlQuery("select * from sa_dispatch where status='复核' and siteid='CCYOSG'");
-        Rows rowsdetail = dbConnect.runSqlQuery("select t1.* from sa_dispatch_items t1 inner join sa_dispatch t2 on t1.sa_dispatchid=t2.sa_dispatchid and t1.siteid=t2.siteid where t2.status='复核' and t1.siteid='CCYOSG'");
-        RowsMap rowsMap = rowsdetail.toRowsMap("sa_dispatchid");
-        RowsMap rowsMap1 = rowsdetail.toRowsMap("billno");
-        ArrayList<String> sqlList = new ArrayList<>();
-        ERPDocking erpDocking =new ERPDocking();
-        JSONArray ErpSainvoices = erpDocking.queryErpSainvoices(10000, 1, new JSONArray(), "", "", "", true);
-        JSONArray dispatchids =new JSONArray();
-        if(!ErpSainvoices.isEmpty()){
-            for (Object ErpSainvoice:ErpSainvoices) {
-                JSONObject erpSainvoice = (JSONObject) ErpSainvoice;
-                String billno = erpSainvoice.getString("finvonum");
-                long sa_dispatchid=0;
-                if(rowsMap1.containsKey(billno)){
-                    if(rowsMap1.get(billno).isNotEmpty()){
-                        sa_dispatchid=rowsMap1.get(billno).get(0).getLong("sa_dispatchid");
-                        dispatchids.add(sa_dispatchid);
-                    }else{
-                        logger.info("发货单【"+billno+"】不存在:");
+        //
+        Properties yosProperties = properties.getYosProperties();
+        if (yosProperties.getProperty("system.runmode.debug").equalsIgnoreCase("false")) {
+            Rows rows = dbConnect.runSqlQuery("select * from sa_dispatch where status='复核' and siteid='CCYOSG'");
+            Rows rowsdetail = dbConnect.runSqlQuery("select t1.* from sa_dispatch_items t1 inner join sa_dispatch t2 on t1.sa_dispatchid=t2.sa_dispatchid and t1.siteid=t2.siteid where t2.status='复核' and t1.siteid='CCYOSG'");
+            RowsMap rowsMap = rowsdetail.toRowsMap("sa_dispatchid");
+            RowsMap rowsMap1 = rowsdetail.toRowsMap("billno");
+            ArrayList<String> sqlList = new ArrayList<>();
+            ERPDocking erpDocking = new ERPDocking();
+            JSONArray ErpSainvoices = erpDocking.queryErpSainvoices(10000, 1, new JSONArray(), "", "", "", true);
+            JSONArray dispatchids = new JSONArray();
+            if (!ErpSainvoices.isEmpty()) {
+                for (Object ErpSainvoice : ErpSainvoices) {
+                    JSONObject erpSainvoice = (JSONObject) ErpSainvoice;
+                    String billno = erpSainvoice.getString("finvonum");
+                    long sa_dispatchid = 0;
+                    if (rowsMap1.containsKey(billno)) {
+                        if (rowsMap1.get(billno).isNotEmpty()) {
+                            sa_dispatchid = rowsMap1.get(billno).get(0).getLong("sa_dispatchid");
+                            dispatchids.add(sa_dispatchid);
+                        } else {
+                            logger.info("发货单【" + billno + "】不存在:");
+                            continue;
+                        }
+                    } else {
+                        logger.info("发货单【" + billno + "】不存在:");
                         continue;
                     }
-                }else {
-                    logger.info("发货单【"+billno+"】不存在:");
-                    continue;
-                }
-                JSONArray jsonArray = erpDocking.queryErpSainvoice(billno);
-
-                JSONObject object= new JSONObject();
-                JSONObject objectdetail= new JSONObject();
-                object.put("access_token","basicDrp");
-                object.put("classname","Sainvoice");
-                object.put("method","closeSainvoice");
-                objectdetail.put("finvonum",billno);
-                objectdetail.put("isManual",false);
-                object.put("content",objectdetail);
-
-                HashMap<String, String> map = new HashMap<>();
-                map.put("content-Type", "application/json");
-                String result = new WebRequest().doPost(object.toString(), "http://124.71.196.182:8001/rest/ws_v2/basicDrp", map);
-                JSONObject resultobject = JSONObject.parseObject(result);
-
-                try {
-                    Rows erpupdatelogRows = dbConnect.runSqlQuery(
-                            "select * from sys_erpupdatelog where ownertable='sa_dispatch' and type='关闭发货单' and ownerid=" + sa_dispatchid);
-                    SQLFactory sqlFactory;
-                    if (!erpupdatelogRows.isEmpty()) {
-                        sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志更新");
-                        sqlFactory.addParameter("sys_erpupdatelogid", erpupdatelogRows.get(0).getLong("sys_erpupdatelogid"));
-                    } else {
-                        sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志新增");
-                        sqlFactory.addParameter("sys_erpupdatelogid", createTableID("sys_erpupdatelog"));
+                    JSONArray jsonArray = erpDocking.queryErpSainvoice(billno);
+
+                    JSONObject object = new JSONObject();
+                    JSONObject objectdetail = new JSONObject();
+                    object.put("access_token", "basicDrp");
+                    object.put("classname", "Sainvoice");
+                    object.put("method", "closeSainvoice");
+                    objectdetail.put("finvonum", billno);
+                    objectdetail.put("isManual", false);
+                    object.put("content", objectdetail);
+
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("content-Type", "application/json");
+                    String result = new WebRequest().doPost(object.toString(), "http://124.71.196.182:8001/rest/ws_v2/basicDrp", map);
+                    JSONObject resultobject = JSONObject.parseObject(result);
+
+                    try {
+                        Rows erpupdatelogRows = dbConnect.runSqlQuery(
+                                "select * from sys_erpupdatelog where ownertable='sa_dispatch' and type='关闭发货单' and ownerid=" + sa_dispatchid);
+                        SQLFactory sqlFactory;
+                        if (!erpupdatelogRows.isEmpty()) {
+                            sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志更新");
+                            sqlFactory.addParameter("sys_erpupdatelogid", erpupdatelogRows.get(0).getLong("sys_erpupdatelogid"));
+                        } else {
+                            sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志新增");
+                            sqlFactory.addParameter("sys_erpupdatelogid", createTableID("sys_erpupdatelog"));
+                        }
+                        sqlFactory.addParameter("siteid", "CCYOSG");
+                        sqlFactory.addParameter("userid", 1);
+                        sqlFactory.addParameter("username", "admin");
+                        sqlFactory.addParameter("ownerid", sa_dispatchid);
+                        sqlFactory.addParameter("ownertable", "sa_dispatch");
+                        sqlFactory.addParameter("type", "关闭发货单");
+                        sqlFactory.addParameter("request", object.toString());
+                        sqlFactory.addParameter("response", resultobject.toJSONString());
+
+                        if ("0".equals(resultobject.getString("errcode"))) {
+                            sqlFactory.addParameter("erpbillno", billno);
+                            sqlFactory.addParameter("errmsg", "");
+                        } else {
+                            sqlFactory.addParameter("erpbillno", "");
+                            sqlFactory.addParameter("errmsg", resultobject.getString("errmsg"));
+                        }
+                        sqlFactory.addParameter("status", resultobject.getString("errcode"));
+                        sqlList.add(sqlFactory.getSQL());
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
-                    sqlFactory.addParameter("siteid", "CCYOSG");
-                    sqlFactory.addParameter("userid", 1);
-                    sqlFactory.addParameter("username","admin");
-                    sqlFactory.addParameter("ownerid", sa_dispatchid);
-                    sqlFactory.addParameter("ownertable", "sa_dispatch");
-                    sqlFactory.addParameter("type", "关闭发货单");
-                    sqlFactory.addParameter("request", object.toString());
-                    sqlFactory.addParameter("response", resultobject.toJSONString());
-
-                    if ("0".equals(resultobject.getString("errcode"))) {
-                        sqlFactory.addParameter("erpbillno", billno);
-                        sqlFactory.addParameter("errmsg", "");
+
+                    if (resultobject.getString("errcode").equals("0")) {
+                        sqlList.add("update sa_dispatch set status='关闭',closedate=current_time,closeby='admin' where sa_dispatchid='" + sa_dispatchid + "' and siteid='CCYOSG'");
+                        SQLFactory sqlFactory = new SQLFactory(new DataContrlLog(), "数据操作日志新增");
+                        sqlFactory.addParameter("ownertable", "sa_dispatch");
+                        sqlFactory.addParameter("ownerid", sa_dispatchid);
+                        sqlFactory.addParameter("action", "自动关闭");
+                        sqlFactory.addParameter("remarks", "发货单自动关闭成功");
+                        sqlFactory.addParameter("actionuserid", "1");
+                        sqlFactory.addParameter("actionby", "admin");
+                        sqlFactory.addParameter("siteid", "CCYOSG");
+                        sqlList.add(sqlFactory.getSQL());
                     } else {
-                        sqlFactory.addParameter("erpbillno", "");
-                        sqlFactory.addParameter("errmsg", resultobject.getString("errmsg"));
+                        logger.info("发货单自动关闭错误:" + resultobject.getString("errmsg"));
                     }
-                    sqlFactory.addParameter("status", resultobject.getString("errcode"));
-                    sqlList.add(sqlFactory.getSQL());
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
-                if(resultobject.getString("errcode").equals("0")){
-                    sqlList.add("update sa_dispatch set status='关闭',closedate=current_time,closeby='admin' where sa_dispatchid='"+sa_dispatchid+"' and siteid='CCYOSG'");
-                    SQLFactory sqlFactory = new SQLFactory(new DataContrlLog(), "数据操作日志新增");
-                    sqlFactory.addParameter("ownertable", "sa_dispatch");
-                    sqlFactory.addParameter("ownerid", sa_dispatchid);
-                    sqlFactory.addParameter("action", "自动关闭");
-                    sqlFactory.addParameter("remarks", "发货单自动关闭成功");
-                    sqlFactory.addParameter("actionuserid", "1");
-                    sqlFactory.addParameter("actionby", "admin");
-                    sqlFactory.addParameter("siteid", "CCYOSG");
-                    sqlList.add(sqlFactory.getSQL());
-                }else {
-                    logger.info("发货单自动关闭错误:"+resultobject.getString("errmsg"));
-                }
-                if(!jsonArray.isEmpty()){
-                    for (Object object1:jsonArray) {
-                        JSONObject jsonObject = (JSONObject)object1;
-                        sqlList.add("update sa_dispatch_items set outwarehousedate=current_time,outwarehouseqty="+jsonObject.getBigDecimalValue("fqty1")+" where rowno ="+jsonObject.getIntValue("frownum")+" and sa_dispatchid='"+sa_dispatchid+"' and siteid='CCYOSG'");
+                    if (!jsonArray.isEmpty()) {
+                        for (Object object1 : jsonArray) {
+                            JSONObject jsonObject = (JSONObject) object1;
+                            sqlList.add("update sa_dispatch_items set outwarehousedate=current_time,outwarehouseqty=" + jsonObject.getBigDecimalValue("fqty1") + " where rowno =" + jsonObject.getIntValue("frownum") + " and sa_dispatchid='" + sa_dispatchid + "' and siteid='CCYOSG'");
+                        }
                     }
-                }
 
 
+                }
             }
-        }
-        dbConnect.runSqlUpdate(sqlList);
+            dbConnect.runSqlUpdate(sqlList);
 
 
-        //判断当前单据是否已实际发完货，如果发完，则生把订单变为关闭状态
-        Rows orderRows =new Rows();
-        if(dispatchids.size()>0){
-            String sql ="select distinct t1.sa_orderid from sa_orderitems t1 inner join sa_dispatch_items t2 on t1.siteid=t2.siteid and t1.sa_orderitemsid=t2.sa_orderitemsid where t1.siteid='CCYOSG' and t2.sa_dispatchid in" + dispatchids.toJSONString();
-            sql = sql.replace("[", "(").replace("]", ")");
-            logger.info("sql:"+sql);
-            orderRows =dbConnect.runSqlQuery(sql);
-        }
-        //总数量
-        Rows totalRows = dbConnect.runSqlQuery("select count(1) count,sa_orderid from sa_orderitems where siteid='CCYOSG' group by sa_orderid");
-        RowsMap totalRowsMap=totalRows.toRowsMap("sa_orderid");
-        //已发完数量
-        Rows deliRows = dbConnect.runSqlQuery("select count(1) count,sa_orderid from sa_orderitems t1 inner join (SELECT  t1.sa_orderitemsid,t1.siteid,SUM(ifnull(t1.outwarehouseqty,0)) outwarehouseqty FROM sa_dispatch_items t1 WHERE t1.siteid='CCYOSG' group by t1.sa_orderitemsid,t1.siteid) t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid where t1.qty=t2.outwarehouseqty and t1.siteid='CCYOSG' group by sa_orderid");
-        RowsMap deliRowsMap=deliRows.toRowsMap("sa_orderid");
-        if(orderRows.size()>0){
-            for (Row row:orderRows) {
-                logger.info("订单id:"+row.getString("sa_orderid"));
-                if(totalRowsMap.containsKey(row.getString("sa_orderid")) && deliRowsMap.containsKey(row.getString("sa_orderid"))){
-                    if (totalRowsMap.get(row.getString("sa_orderid")).get(0).getLong("count") ==deliRowsMap.get(row.getString("sa_orderid")).get(0).getLong("count")) {
-                        logger.info("订单关闭:update sa_order set status='关闭' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='CCYOSG'");
-                        dbConnect.runSqlUpdate("update sa_order set status='关闭' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='CCYOSG'");
+            //判断当前单据是否已实际发完货，如果发完，则生把订单变为关闭状态
+            Rows orderRows = new Rows();
+            if (dispatchids.size() > 0) {
+                String sql = "select distinct t1.sa_orderid from sa_orderitems t1 inner join sa_dispatch_items t2 on t1.siteid=t2.siteid and t1.sa_orderitemsid=t2.sa_orderitemsid where t1.siteid='CCYOSG' and t2.sa_dispatchid in" + dispatchids.toJSONString();
+                sql = sql.replace("[", "(").replace("]", ")");
+                logger.info("sql:" + sql);
+                orderRows = dbConnect.runSqlQuery(sql);
+            }
+            //总数量
+            Rows totalRows = dbConnect.runSqlQuery("select count(1) count,sa_orderid from sa_orderitems where siteid='CCYOSG' group by sa_orderid");
+            RowsMap totalRowsMap = totalRows.toRowsMap("sa_orderid");
+            //已发完数量
+            Rows deliRows = dbConnect.runSqlQuery("select count(1) count,sa_orderid from sa_orderitems t1 inner join (SELECT  t1.sa_orderitemsid,t1.siteid,SUM(ifnull(t1.outwarehouseqty,0)) outwarehouseqty FROM sa_dispatch_items t1 WHERE t1.siteid='CCYOSG' group by t1.sa_orderitemsid,t1.siteid) t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid where t1.qty=t2.outwarehouseqty and t1.siteid='CCYOSG' group by sa_orderid");
+            RowsMap deliRowsMap = deliRows.toRowsMap("sa_orderid");
+            if (orderRows.size() > 0) {
+                for (Row row : orderRows) {
+                    logger.info("订单id:" + row.getString("sa_orderid"));
+                    if (totalRowsMap.containsKey(row.getString("sa_orderid")) && deliRowsMap.containsKey(row.getString("sa_orderid"))) {
+                        if (totalRowsMap.get(row.getString("sa_orderid")).get(0).getLong("count") == deliRowsMap.get(row.getString("sa_orderid")).get(0).getLong("count")) {
+                            logger.info("订单关闭:update sa_order set status='关闭' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='CCYOSG'");
+                            dbConnect.runSqlUpdate("update sa_order set status='关闭' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='CCYOSG'");
+                        }
                     }
                 }
             }
-        }
 
+        }
     }
 
-   
-
 
 }