erp对接改为楚楚

src/custom/service/AftersalesmagAutoRecheckService.java

@@ -27,13 +27,15 @@ public class AftersalesmagAutoRecheckService extends ServiceController {
 
     private static Logger logger = Logger.getLogger(AftersalesmagAutoRecheckService.class);
 
+    String siteid="CCYOSG";
+
     @Override
 
     public void serviceRun() throws YosException {
         //
         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='dlb'");
+            Rows rows = dbConnect.runSqlQuery("select * from sa_aftersalesmag where status='审核' and type='换货单' and siteid='"+siteid+"'");
             RowsMap rowsMap1 = rows.toRowsMap("billno");
             ArrayList<String> sqlList = new ArrayList<>();
             ERPDocking erpDocking = new ERPDocking();
@@ -79,7 +81,7 @@ public class AftersalesmagAutoRecheckService extends ServiceController {
                             sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志新增");
                             sqlFactory.addParameter("sys_erpupdatelogid", createTableID("sys_erpupdatelog"));
                         }
-                        sqlFactory.addParameter("siteid", "dlb");
+                        sqlFactory.addParameter("siteid", siteid);
                         sqlFactory.addParameter("userid", 1);
                         sqlFactory.addParameter("username", "admin");
                         sqlFactory.addParameter("ownerid", sa_aftersalesmagid);
@@ -101,7 +103,7 @@ public class AftersalesmagAutoRecheckService extends ServiceController {
                         e.printStackTrace();
                     }
                     if (resultobject.getString("errcode").equals("0")) {
-                        sqlList.add("update sa_aftersalesmag set status='复核' where sa_aftersalesmagid='" + sa_aftersalesmagid + "' and siteid='dlb'");
+                        sqlList.add("update sa_aftersalesmag set status='复核' where sa_aftersalesmagid='" + sa_aftersalesmagid + "' and siteid='"+siteid+"'");
                         SQLFactory sqlFactory = new SQLFactory(this, "数据操作日志新增");
                         sqlFactory.addParameter("sys_contrllogid", createTableID("sys_contrllog"));
                         sqlFactory.addParameter("ownertable", "sa_aftersalesmag");
@@ -110,7 +112,7 @@ public class AftersalesmagAutoRecheckService extends ServiceController {
                         sqlFactory.addParameter("remarks", "换货单自动复核成功");
                         sqlFactory.addParameter("actionuserid", "1");
                         sqlFactory.addParameter("actionby", "admin");
-                        sqlFactory.addParameter("siteid", "dlb");
+                        sqlFactory.addParameter("siteid", siteid);
                         sqlList.add(sqlFactory.getSQL());
                     } else {
                         logger.info("换货单自动复核错误:" + resultobject.getString("errmsg"));

src/custom/service/AutoDockItemService.java

@@ -25,7 +25,7 @@ public class AutoDockItemService extends ServiceController {
     @Override
     public void serviceRun() throws YosException {
         ArrayList<String> sqlList = new ArrayList<>();
-        String siteid ="DLB";
+        String siteid="CCYOSG";
         Rows rows = new DBConnect().runSqlQuery("select * from sys_parameter where paramname='AutoDockItemServiceTime'");
         Date date =new Date();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

src/custom/service/DispatchAutoCloseService.java

@@ -28,15 +28,15 @@ import java.util.Properties;
 public class DispatchAutoCloseService extends ServiceController {
 
     private static Logger logger = Logger.getLogger(DispatchAutoCloseService.class);
-
+    String siteid="CCYOSG";
     @Override
 
     public void serviceRun() throws YosException {
         //
         Properties yosProperties = properties.getYosProperties();
         if (yosProperties.getProperty("system.runmode.debug").equalsIgnoreCase("false")) {
-            Rows rows = dbConnect.runSqlQuery("select * from sa_dispatch where status='复核' and siteid='dlb'");
-            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='dlb'");
+            Rows rows = dbConnect.runSqlQuery("select * from sa_dispatch where status='复核' and siteid='"+siteid+"'");
+            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='"+siteid+"'");
             RowsMap rowsMap = rowsdetail.toRowsMap("sa_dispatchid");
             RowsMap rowsMap1 = rowsdetail.toRowsMap("billno");
             ArrayList<String> sqlList = new ArrayList<>();
@@ -88,7 +88,7 @@ public class DispatchAutoCloseService extends ServiceController {
                             sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志新增");
                             sqlFactory.addParameter("sys_erpupdatelogid", createTableID("sys_erpupdatelog"));
                         }
-                        sqlFactory.addParameter("siteid", "dlb");
+                        sqlFactory.addParameter("siteid", siteid);
                         sqlFactory.addParameter("userid", 1);
                         sqlFactory.addParameter("username", "admin");
                         sqlFactory.addParameter("ownerid", sa_dispatchid);
@@ -111,7 +111,7 @@ public class DispatchAutoCloseService extends ServiceController {
                     }
 
                     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='dlb'");
+                        sqlList.add("update sa_dispatch set status='关闭',closedate=current_time,closeby='admin' where sa_dispatchid='" + sa_dispatchid + "' and siteid='"+siteid+"'");
                         SQLFactory sqlFactory = new SQLFactory(this, "数据操作日志新增");
                         sqlFactory.addParameter("sys_contrllogid", createTableID("sys_contrllog"));
                         sqlFactory.addParameter("ownertable", "sa_dispatch");
@@ -120,7 +120,7 @@ public class DispatchAutoCloseService extends ServiceController {
                         sqlFactory.addParameter("remarks", "发货单自动关闭成功");
                         sqlFactory.addParameter("actionuserid", "1");
                         sqlFactory.addParameter("actionby", "admin");
-                        sqlFactory.addParameter("siteid", "dlb");
+                        sqlFactory.addParameter("siteid", siteid);
                         sqlList.add(sqlFactory.getSQL());
                     } else {
                         unclosedispatchids.add(sa_dispatchid);
@@ -129,7 +129,7 @@ public class DispatchAutoCloseService extends ServiceController {
                     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='dlb'");
+                            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='"+siteid+"'");
                         }
                     }
 
@@ -142,24 +142,24 @@ public class DispatchAutoCloseService extends ServiceController {
             //判断当前单据是否已实际发完货，如果发完，则生把订单变为关闭状态
             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='dlb' and t2.sa_dispatchid in" + dispatchids.toJSONString();
+                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='"+siteid+"' 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='dlb' group by sa_orderid");
+            Rows totalRows = dbConnect.runSqlQuery("select count(1) count,sa_orderid from sa_orderitems where siteid='"+siteid+"' 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='dlb' 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='dlb' group by 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='"+siteid+"' 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='"+siteid+"' 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='关闭',closedate=current_time,closeby='admin' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='dlb'");
-                            dbConnect.runSqlUpdate("update sa_order set status='关闭',closedate=current_time,closeby='admin' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='dlb'");
+                            logger.info("订单关闭:update sa_order set status='关闭',closedate=current_time,closeby='admin' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='"+siteid+"'");
+                            dbConnect.runSqlUpdate("update sa_order set status='关闭',closedate=current_time,closeby='admin' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='"+siteid+"'");
                             SQLFactory sqlFactory = new SQLFactory(this, "数据操作日志新增");
                             sqlFactory.addParameter("sys_contrllogid", createTableID("sys_contrllog"));
                             sqlFactory.addParameter("ownertable", "sa_order");
@@ -168,7 +168,7 @@ public class DispatchAutoCloseService extends ServiceController {
                             sqlFactory.addParameter("remarks", "订单数量发完自动关闭");
                             sqlFactory.addParameter("actionuserid", "1");
                             sqlFactory.addParameter("actionby", "admin");
-                            sqlFactory.addParameter("siteid", "dlb");
+                            sqlFactory.addParameter("siteid", siteid);
                             dbConnect.runSqlUpdate(sqlFactory.getSQL());
                         }
                     }
@@ -181,7 +181,7 @@ public class DispatchAutoCloseService extends ServiceController {
                 for (Object object : unclosedispatchids) {
                     Long sa_dispatchid = Long.valueOf(object.toString());
                     String billno = "";
-                    Rows dispatchRows = dbConnect.runSqlQuery("select * from sa_dispatch where sa_dispatchid=" + sa_dispatchid + " and siteid='dlb'");
+                    Rows dispatchRows = dbConnect.runSqlQuery("select * from sa_dispatch where sa_dispatchid=" + sa_dispatchid + " and siteid='"+siteid+"'");
                     if (!dispatchRows.isEmpty()) {
                         billno = dispatchRows.get(0).getString("billno");
                     } else {
@@ -216,7 +216,7 @@ public class DispatchAutoCloseService extends ServiceController {
 //                    for (Row row:orderRows) {
 //                        sqlList.add("update sa_order set status='审核' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='" + siteid + "'");
 //                    }
-                        uncloseSqlList.add("update sa_dispatch set status='关闭',closedate=current_time,closeby='admin' where sa_dispatchid='" + sa_dispatchid + "' and siteid='dlb'");
+                        uncloseSqlList.add("update sa_dispatch set status='关闭',closedate=current_time,closeby='admin' where sa_dispatchid='" + sa_dispatchid + "' and siteid='"+siteid+"'");
                         SQLFactory sqlFactory = new SQLFactory(this, "数据操作日志新增");
                         sqlFactory.addParameter("sys_contrllogid", createTableID("sys_contrllog"));
                         sqlFactory.addParameter("ownertable", "sa_dispatch");
@@ -225,7 +225,7 @@ public class DispatchAutoCloseService extends ServiceController {
                         sqlFactory.addParameter("remarks", "发货单自动关闭成功(未全部发完,未发完数量退回订单并自动关闭)");
                         sqlFactory.addParameter("actionuserid", "1");
                         sqlFactory.addParameter("actionby", "admin");
-                        sqlFactory.addParameter("siteid", "dlb");
+                        sqlFactory.addParameter("siteid", siteid);
                         uncloseSqlList.add(sqlFactory.getSQL());
                     } else {
                         logger.info("发货单手工关闭错误:" + resultobject.getString("errmsg") + "发货单id:" + sa_dispatchid);
@@ -239,7 +239,7 @@ public class DispatchAutoCloseService extends ServiceController {
                             sqlFactory = new SQLFactory(new UploadDataToERP_HY(), "erp上传日志新增");
                             sqlFactory.addParameter("sys_erpupdatelogid", createTableID("sys_erpupdatelog"));
                         }
-                        sqlFactory.addParameter("siteid", "dlb");
+                        sqlFactory.addParameter("siteid", siteid);
                         sqlFactory.addParameter("userid", 1);
                         sqlFactory.addParameter("username", "admin");
                         sqlFactory.addParameter("ownerid", sa_dispatchid);
@@ -261,7 +261,7 @@ public class DispatchAutoCloseService extends ServiceController {
                 Rows rows1 = dbConnect.runSqlQuery("select t2.userid from sa_dispatch t1 inner join sys_enterprise_hr t2 on t1.siteid=t2.siteid and t1.sys_enterpriseid=t2.sys_enterpriseid where sa_dispatchid=" + o);
                 HashMap<String, Object> dataextra = new HashMap<>();
                 dataextra.put("extraUseridList", rows1.toArrayList("userid"));
-                Executor.sendEml(this, "dispatch_close", (Long) o, "dlb", dataextra);
+                Executor.sendEml(this, "dispatch_close", (Long) o, siteid, dataextra);
             }
 
         }

src/custom/service/StockAutoDockAftersalesmagService.java

@@ -23,7 +23,7 @@ import java.util.Properties;
 public class StockAutoDockAftersalesmagService extends ServiceController {
 
     private static Logger logger = Logger.getLogger(DispatchAutoCloseService.class);
-
+    String siteid="CCYOSG";
     @Override
     public void serviceRun() throws YosException {
         //
@@ -34,15 +34,14 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
             ERPDocking erpDocking = new ERPDocking();
             JSONArray ErpSainvoices = erpDocking.queryErpStockBill(500, 1,"销售退货");
             JSONArray flags=new JSONArray();
-            String siteid = "dlb";
             if (!ErpSainvoices.isEmpty()) {
                 for (Object ErpSainvoice : ErpSainvoices) {
                     JSONObject erpSainvoice = (JSONObject) ErpSainvoice;
                     // 经销商编号
                     String fagentnum = erpSainvoice.getString("fagentnum");
                     long sys_enterpriseid = 0;
-                    if (dbConnect.runSqlQuery("select sys_enterpriseid from sa_agents where siteid='dlb' and  agentnum='" + fagentnum + "'").isNotEmpty()) {
-                        sys_enterpriseid = dbConnect.runSqlQuery("select sys_enterpriseid from sa_agents where siteid='dlb' and  agentnum='" + fagentnum + "'").get(0).getLong("sys_enterpriseid");
+                    if (dbConnect.runSqlQuery("select sys_enterpriseid from sa_agents where siteid='"+siteid+"' and  agentnum='" + fagentnum + "'").isNotEmpty()) {
+                        sys_enterpriseid = dbConnect.runSqlQuery("select sys_enterpriseid from sa_agents where siteid='"+siteid+"' and  agentnum='" + fagentnum + "'").get(0).getLong("sys_enterpriseid");
                     } else {
                         JSONObject flag =new JSONObject();
                         flag.put("syncyosid",erpSainvoice.getStringValue("syncyosid"));
@@ -78,8 +77,8 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
                     String fsourcebillno = erpSainvoice.getString("fsourcebillno");
                     long sa_aftersalesmagid=0;
                     if(StringUtils.isNotBlank(fsourcebillno)){
-                        if (dbConnect.runSqlQuery("select sa_aftersalesmagid from sa_aftersalesmag where siteid='dlb' and  billno='" + fsourcebillno + "'").isNotEmpty()) {
-                            sa_aftersalesmagid = dbConnect.runSqlQuery("select sa_aftersalesmagid from sa_aftersalesmag where siteid='dlb' and  billno='" + fsourcebillno + "'").get(0).getLong("sa_aftersalesmagid");
+                        if (dbConnect.runSqlQuery("select sa_aftersalesmagid from sa_aftersalesmag where siteid='"+siteid+"' and  billno='" + fsourcebillno + "'").isNotEmpty()) {
+                            sa_aftersalesmagid = dbConnect.runSqlQuery("select sa_aftersalesmagid from sa_aftersalesmag where siteid='"+siteid+"' and  billno='" + fsourcebillno + "'").get(0).getLong("sa_aftersalesmagid");
                         } else {
                             JSONObject flag =new JSONObject();
                             flag.put("syncyosid",erpSainvoice.getStringValue("syncyosid"));
@@ -100,7 +99,7 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
 
                     Long sa_cashbillid = 0L;
 
-                    Rows stockbillRows = dbConnect.runSqlQuery("select * from st_stockbill where siteid='dlb' and status='审核' and billno='" + fbillnum + "'");
+                    Rows stockbillRows = dbConnect.runSqlQuery("select * from st_stockbill where siteid='"+siteid+"' and status='审核' and billno='" + fbillnum + "'");
                     Long st_stockbillid = 0L;
                     if (stockbillRows.isEmpty() && "审核".equals(fstatus)) {
                         /**
@@ -108,7 +107,7 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
                          */
                         SQLFactory sqlFactory = new SQLFactory(this, "销售出库单新增");
                         st_stockbillid = createTableID("st_stockbill");
-                        sqlFactory.addParameter("siteid", "dlb");
+                        sqlFactory.addParameter("siteid", siteid);
                         sqlFactory.addParameter("st_stockbillid", st_stockbillid);
                         sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
                         sqlFactory.addParameter("billno", fbillnum);
@@ -137,15 +136,15 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
                         }
                         Rows rows;
                         if (!str.toString().equals("")) {
-                            rows = dbConnect.runSqlQuery("select * from plm_item  where siteid='dlb' and itemno in " + "(" + str.toString() + ")");
+                            rows = dbConnect.runSqlQuery("select * from plm_item  where siteid='"+siteid+"' and itemno in " + "(" + str.toString() + ")");
                         } else {
-                            rows = dbConnect.runSqlQuery("select * from plm_item  where siteid='dlb' and itemno in('')");
+                            rows = dbConnect.runSqlQuery("select * from plm_item  where siteid='"+siteid+"' and itemno in('')");
                         }
                         RowsMap itemRowsMap = rows.toRowsMap("itemno");
-//                        Rows distiptchRows = dbConnect.runSqlQuery("select t2.price,t1.sa_dispatch_itemsid,t1.rowno,t1.sa_orderitemsid,t2.sa_orderid,t3.sys_enterpriseid,t4.sonum,t5.itemno,t5.itemname from sa_dispatch_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid inner join sa_dispatch t3 on t1.sa_dispatchid=t3.sa_dispatchid and t1.siteid=t3.siteid left join sa_order t4 on t2.sa_orderid=t4.sa_orderid and t2.siteid=t4.siteid left join plm_item t5 on t1.itemid=t5.itemid and t1.siteid=t5.siteid where t3.status in('审核','复核','关闭') and  t1.siteid='dlb' and  t1.sa_dispatchid = " + sa_dispatchid);
+//                        Rows distiptchRows = dbConnect.runSqlQuery("select t2.price,t1.sa_dispatch_itemsid,t1.rowno,t1.sa_orderitemsid,t2.sa_orderid,t3.sys_enterpriseid,t4.sonum,t5.itemno,t5.itemname from sa_dispatch_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid inner join sa_dispatch t3 on t1.sa_dispatchid=t3.sa_dispatchid and t1.siteid=t3.siteid left join sa_order t4 on t2.sa_orderid=t4.sa_orderid and t2.siteid=t4.siteid left join plm_item t5 on t1.itemid=t5.itemid and t1.siteid=t5.siteid where t3.status in('审核','复核','关闭') and  t1.siteid='"+siteid+"' and  t1.sa_dispatchid = " + sa_dispatchid);
 //                        RowsMap distiptchRowsMap = distiptchRows.toRowsMap("rowno");
 
-                        Rows aftersalesmagRows = dbConnect.runSqlQuery("select t1.price,t1.sa_aftersalesmag_itemsid,t3.itemno,t1.sa_orderitemsid,t2.sa_orderid from sa_aftersalesmag_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid inner join plm_item t3  on t1.itemid=t3.itemid and t1.siteid=t3.siteid  where  t1.siteid='dlb' and  t1.sa_aftersalesmagid = " +sa_aftersalesmagid);
+                        Rows aftersalesmagRows = dbConnect.runSqlQuery("select t1.price,t1.sa_aftersalesmag_itemsid,t3.itemno,t1.sa_orderitemsid,t2.sa_orderid from sa_aftersalesmag_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid inner join plm_item t3  on t1.itemid=t3.itemid and t1.siteid=t3.siteid  where  t1.siteid='"+siteid+"' and  t1.sa_aftersalesmagid = " +sa_aftersalesmagid);
                         RowsMap aftersalesmagRowsMap = aftersalesmagRows.toRowsMap("itemno");
                         BigDecimal amountTotal = BigDecimal.ZERO;
                         for (Object object : detailarray) {
@@ -161,7 +160,7 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
                             //String fbatchno = jsonObject.getString("fbatchno");
                             String fdetailnotes = jsonObject.getString("fnote");
                             SQLFactory sqlFactorydetail = new SQLFactory(this, "销售出库单明细新增");
-                            sqlFactorydetail.addParameter("siteid", "dlb");
+                            sqlFactorydetail.addParameter("siteid", siteid);
                             sqlFactorydetail.addParameter("st_stockbill_itemsid", createTableID("st_stockbill_items"));
                             sqlFactorydetail.addParameter("st_stockbillid", st_stockbillid);
                             sqlFactorydetail.addParameter("rowno", frownum);
@@ -214,7 +213,7 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
 
                             sqlList.add(sqlFactorydetail.getSQL());
                         }
-                        sqlList.add("update st_stockbill set status='审核',checkby='" + createby + "',checkdate=CURRENT_TIMESTAMP where st_stockbillid = " + st_stockbillid + " and siteid='dlb'");  JSONObject flag =new JSONObject();
+                        sqlList.add("update st_stockbill set status='审核',checkby='" + createby + "',checkdate=CURRENT_TIMESTAMP where st_stockbillid = " + st_stockbillid + " and siteid='"+siteid+"'");  JSONObject flag =new JSONObject();
                         flag.put("syncyosid",erpSainvoice.getStringValue("syncyosid"));
                         flag.put("fupdateflag", "1");
                         flag.put("fupdatewarnlog", "");
@@ -224,7 +223,7 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
                         /**
                          * DRP存在销售出库单，且中间表状态为审核且不在删除状态时，DRP中需将当前销售出库单先反审核，修改内容后再进行审核
                          */
-                        sqlList.add("update st_stockbill set status='新建',checkby='',checkdate=null where st_stockbillid = " + stockbillRows.get(0).getLong("st_stockbillid") + " and siteid='dlb'");
+                        sqlList.add("update st_stockbill set status='新建',checkby='',checkdate=null where st_stockbillid = " + stockbillRows.get(0).getLong("st_stockbillid") + " and siteid='"+siteid+"'");
                         JSONObject flag =new JSONObject();
                         flag.put("syncyosid",erpSainvoice.getStringValue("syncyosid"));
                         flag.put("fupdateflag", "99");
@@ -235,7 +234,7 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
                         /**
                          * DRP存在收入凭证，且中间表状态为新建或在删除状态时，DRP中需将当前收入销售出库单先反审核
                          */
-                        sqlList.add("update st_stockbill set status='新建',checkby='',checkdate=null where st_stockbillid = " + stockbillRows.get(0).getLong("st_stockbillid") + " and siteid='dlb'");
+                        sqlList.add("update st_stockbill set status='新建',checkby='',checkdate=null where st_stockbillid = " + stockbillRows.get(0).getLong("st_stockbillid") + " and siteid='"+siteid+"'");
                         JSONObject flag =new JSONObject();
                         flag.put("syncyosid",erpSainvoice.getStringValue("syncyosid"));
                         flag.put("fupdateflag", "1");
@@ -267,7 +266,7 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
     }
     public void sendMsg(String content, Long st_stockbillid, Long sys_enterpriseid) throws YosException {
 
-        ArrayList<Long> userList = getEnterpriseHrs(sys_enterpriseid,"dlb").toArrayList("userid", new ArrayList<>());
+        ArrayList<Long> userList = getEnterpriseHrs(sys_enterpriseid,siteid).toArrayList("userid", new ArrayList<>());
         Remind remind = new Remind(new Controller(new JSONObject()));
         remind.setTitle("销售出库单消息");
         remind.setContent(content);

src/custom/service/StockAutoDockDispatchService.java

@@ -28,7 +28,7 @@ import java.util.*;
 public class StockAutoDockDispatchService extends ServiceController {
 
     private static Logger logger = Logger.getLogger(DispatchAutoCloseService.class);
-
+    String siteid="CCYOSG";
     @Override
     public void serviceRun() throws YosException {
         //
@@ -40,15 +40,14 @@ public class StockAutoDockDispatchService extends ServiceController {
             ERPDocking erpDocking = new ERPDocking();
             JSONArray ErpSainvoices = erpDocking.queryErpStockBill(500, 1,"销售出库");
             JSONArray flags=new JSONArray();
-            String siteid = "dlb";
             if (!ErpSainvoices.isEmpty()) {
                 for (Object ErpSainvoice : ErpSainvoices) {
                     JSONObject erpSainvoice = (JSONObject) ErpSainvoice;
                     // 经销商编号
                     String fagentnum = erpSainvoice.getString("fagentnum");
                     long sys_enterpriseid = 0;
-                    if (dbConnect.runSqlQuery("select sys_enterpriseid from sa_agents where siteid='dlb' and  agentnum='" + fagentnum + "'").isNotEmpty()) {
-                        sys_enterpriseid = dbConnect.runSqlQuery("select sys_enterpriseid from sa_agents where siteid='dlb' and  agentnum='" + fagentnum + "'").get(0).getLong("sys_enterpriseid");
+                    if (dbConnect.runSqlQuery("select sys_enterpriseid from sa_agents where siteid='"+siteid+"' and  agentnum='" + fagentnum + "'").isNotEmpty()) {
+                        sys_enterpriseid = dbConnect.runSqlQuery("select sys_enterpriseid from sa_agents where siteid='"+siteid+"' and  agentnum='" + fagentnum + "'").get(0).getLong("sys_enterpriseid");
                     } else {
                         JSONObject flag =new JSONObject();
                         flag.put("syncyosid",erpSainvoice.getStringValue("syncyosid"));
@@ -85,8 +84,8 @@ public class StockAutoDockDispatchService extends ServiceController {
                     String fsourcetype = erpSainvoice.getString("fsourcetype");
                     long sa_dispatchid=0;
                     if(StringUtils.isNotBlank(fsourcebillno)){
-                        if (dbConnect.runSqlQuery("select sa_dispatchid from sa_dispatch where siteid='dlb' and  billno='" + fsourcebillno + "'").isNotEmpty()) {
-                            sa_dispatchid = dbConnect.runSqlQuery("select sa_dispatchid from sa_dispatch where siteid='dlb' and  billno='" + fsourcebillno + "'").get(0).getLong("sa_dispatchid");
+                        if (dbConnect.runSqlQuery("select sa_dispatchid from sa_dispatch where siteid='"+siteid+"' and  billno='" + fsourcebillno + "'").isNotEmpty()) {
+                            sa_dispatchid = dbConnect.runSqlQuery("select sa_dispatchid from sa_dispatch where siteid='"+siteid+"' and  billno='" + fsourcebillno + "'").get(0).getLong("sa_dispatchid");
                         } else {
                             JSONObject flag =new JSONObject();
                             flag.put("syncyosid",erpSainvoice.getStringValue("syncyosid"));
@@ -107,7 +106,7 @@ public class StockAutoDockDispatchService extends ServiceController {
 
                     Long sa_cashbillid = 0L;
 
-                    Rows stockbillRows = dbConnect.runSqlQuery("select * from st_stockbill where siteid='dlb' and status='审核' and billno='" + fbillnum + "'");
+                    Rows stockbillRows = dbConnect.runSqlQuery("select * from st_stockbill where siteid='"+siteid+"' and status='审核' and billno='" + fbillnum + "'");
                     Long st_stockbillid = 0L;
                     if (stockbillRows.isEmpty() && "审核".equals(fstatus)) {
                         /**
@@ -115,7 +114,7 @@ public class StockAutoDockDispatchService extends ServiceController {
                          */
                         SQLFactory sqlFactory = new SQLFactory(this, "销售出库单新增");
                         st_stockbillid = createTableID("st_stockbill");
-                        sqlFactory.addParameter("siteid", "dlb");
+                        sqlFactory.addParameter("siteid", siteid);
                         sqlFactory.addParameter("st_stockbillid", st_stockbillid);
                         sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
                         sqlFactory.addParameter("billno", fbillnum);
@@ -144,15 +143,15 @@ public class StockAutoDockDispatchService extends ServiceController {
                         }
                         Rows rows;
                         if (!str.toString().equals("")) {
-                            rows = dbConnect.runSqlQuery("select * from plm_item  where siteid='dlb' and itemno in " + "(" + str.toString() + ")");
+                            rows = dbConnect.runSqlQuery("select * from plm_item  where siteid='"+siteid+"' and itemno in " + "(" + str.toString() + ")");
                         } else {
-                            rows = dbConnect.runSqlQuery("select * from plm_item  where siteid='dlb' and itemno in('')");
+                            rows = dbConnect.runSqlQuery("select * from plm_item  where siteid='"+siteid+"' and itemno in('')");
                         }
                         RowsMap itemRowsMap = rows.toRowsMap("itemno");
-                        Rows distiptchRows = dbConnect.runSqlQuery("select t2.price,t1.sa_dispatch_itemsid,t1.rowno,t1.sa_orderitemsid,t2.sa_orderid,t3.sys_enterpriseid,t4.sonum,t5.itemno,t5.itemname from sa_dispatch_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid inner join sa_dispatch t3 on t1.sa_dispatchid=t3.sa_dispatchid and t1.siteid=t3.siteid left join sa_order t4 on t2.sa_orderid=t4.sa_orderid and t2.siteid=t4.siteid left join plm_item t5 on t1.itemid=t5.itemid and t1.siteid=t5.siteid where t3.status in('审核','复核','关闭') and  t1.siteid='dlb' and  t1.sa_dispatchid = " + sa_dispatchid);
+                        Rows distiptchRows = dbConnect.runSqlQuery("select t2.price,t1.sa_dispatch_itemsid,t1.rowno,t1.sa_orderitemsid,t2.sa_orderid,t3.sys_enterpriseid,t4.sonum,t5.itemno,t5.itemname from sa_dispatch_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid inner join sa_dispatch t3 on t1.sa_dispatchid=t3.sa_dispatchid and t1.siteid=t3.siteid left join sa_order t4 on t2.sa_orderid=t4.sa_orderid and t2.siteid=t4.siteid left join plm_item t5 on t1.itemid=t5.itemid and t1.siteid=t5.siteid where t3.status in('审核','复核','关闭') and  t1.siteid='"+siteid+"' and  t1.sa_dispatchid = " + sa_dispatchid);
                         RowsMap distiptchRowsMap = distiptchRows.toRowsMap("rowno");
 
-//                        Rows aftersalesmagRows = dbConnect.runSqlQuery("select t1.price,t1.sa_aftersalesmag_itemsid,t1.sa_orderitemsid,t2.sa_orderid from sa_aftersalesmag_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid  where  t1.siteid='dlb' and  t1.sa_aftersalesmag_itemsid in " + sa_dispatch_itemsids.toString().replace("[", "(").replace("]", ")"));
+//                        Rows aftersalesmagRows = dbConnect.runSqlQuery("select t1.price,t1.sa_aftersalesmag_itemsid,t1.sa_orderitemsid,t2.sa_orderid from sa_aftersalesmag_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid  where  t1.siteid='"+siteid+"' and  t1.sa_aftersalesmag_itemsid in " + sa_dispatch_itemsids.toString().replace("[", "(").replace("]", ")"));
 //                        RowsMap aftersalesmagRowsMap = aftersalesmagRows.toRowsMap("rowno");
                         BigDecimal amountTotal = BigDecimal.ZERO;
                         for (Object object : detailarray) {
@@ -168,7 +167,7 @@ public class StockAutoDockDispatchService extends ServiceController {
                             //String fbatchno = jsonObject.getString("fbatchno");
                             String fdetailnotes = jsonObject.getString("fnote");
                             SQLFactory sqlFactorydetail = new SQLFactory(this, "销售出库单明细新增");
-                            sqlFactorydetail.addParameter("siteid", "dlb");
+                            sqlFactorydetail.addParameter("siteid", siteid);
                             sqlFactorydetail.addParameter("st_stockbill_itemsid", createTableID("st_stockbill_items"));
                             sqlFactorydetail.addParameter("st_stockbillid", st_stockbillid);
                             sqlFactorydetail.addParameter("rowno", frownum);
@@ -220,7 +219,7 @@ public class StockAutoDockDispatchService extends ServiceController {
 
                             sqlList.add(sqlFactorydetail.getSQL());
                         }
-                        sqlList.add("update st_stockbill set status='审核',checkby='" + createby + "',checkdate=CURRENT_TIMESTAMP where st_stockbillid = " + st_stockbillid + " and siteid='dlb'");  JSONObject flag =new JSONObject();
+                        sqlList.add("update st_stockbill set status='审核',checkby='" + createby + "',checkdate=CURRENT_TIMESTAMP where st_stockbillid = " + st_stockbillid + " and siteid='"+siteid+"'");  JSONObject flag =new JSONObject();
                         flag.put("syncyosid",erpSainvoice.getStringValue("syncyosid"));
                         flag.put("fupdateflag", "1");
                         flag.put("fupdatewarnlog", "");
@@ -230,7 +229,7 @@ public class StockAutoDockDispatchService extends ServiceController {
                         /**
                          * DRP存在销售出库单，且中间表状态为审核且不在删除状态时，DRP中需将当前销售出库单先反审核，修改内容后再进行审核
                          */
-                        sqlList.add("update st_stockbill set status='新建',checkby='',checkdate=null where st_stockbillid = " + stockbillRows.get(0).getLong("st_stockbillid") + " and siteid='dlb'");
+                        sqlList.add("update st_stockbill set status='新建',checkby='',checkdate=null where st_stockbillid = " + stockbillRows.get(0).getLong("st_stockbillid") + " and siteid='"+siteid+"'");
                         JSONObject flag =new JSONObject();
                         flag.put("syncyosid",erpSainvoice.getStringValue("syncyosid"));
                         flag.put("fupdateflag", "99");
@@ -241,7 +240,7 @@ public class StockAutoDockDispatchService extends ServiceController {
                         /**
                          * DRP存在收入凭证，且中间表状态为新建或在删除状态时，DRP中需将当前收入销售出库单先反审核
                          */
-                        sqlList.add("update st_stockbill set status='新建',checkby='',checkdate=null where st_stockbillid = " + stockbillRows.get(0).getLong("st_stockbillid") + " and siteid='dlb'");
+                        sqlList.add("update st_stockbill set status='新建',checkby='',checkdate=null where st_stockbillid = " + stockbillRows.get(0).getLong("st_stockbillid") + " and siteid='"+siteid+"'");
                         JSONObject flag =new JSONObject();
                         flag.put("syncyosid",erpSainvoice.getStringValue("syncyosid"));
                         flag.put("fupdateflag", "1");
@@ -274,7 +273,7 @@ public class StockAutoDockDispatchService extends ServiceController {
     }
     public void sendMsg(String content, Long st_stockbillid, Long sys_enterpriseid) throws YosException {
 
-        ArrayList<Long> userList = getEnterpriseHrs(sys_enterpriseid,"dlb").toArrayList("userid", new ArrayList<>());
+        ArrayList<Long> userList = getEnterpriseHrs(sys_enterpriseid,siteid).toArrayList("userid", new ArrayList<>());
         Remind remind = new Remind(new Controller(new JSONObject()));
         remind.setTitle("销售出库单消息");
         remind.setContent(content);

src/custom/utility/ERPDocking.java

@@ -24,6 +24,10 @@ import java.util.HashMap;
 
 public class ERPDocking {
     public static boolean loginstatus = false;
+    //楚楚
+    String url = "http://124.71.196.182:8001/rest/ws_v2/basicDrp";
+    //德莱宝
+//    String url = "http://192.168.3.89:8001/rest/ws_v2/basicDrp";
 
     public ERPDocking() {
 //        try {
@@ -55,6 +59,7 @@ public class ERPDocking {
 
     /**
      * 获取erp物料档案
+     *
      * @param begindate
      * @param pagerows
      * @param pagenum
@@ -63,8 +68,8 @@ public class ERPDocking {
      */
     public JSONArray getErpItemRows(String begindate, int pagerows, int pagenum) throws YosException {
 
-        JSONObject object= new JSONObject();
-        JSONObject objectdetail= new JSONObject();
+        JSONObject object = new JSONObject();
+        JSONObject objectdetail = new JSONObject();
         objectdetail.put("fstatus", "审核");
         objectdetail.put("fmodel", "");
         objectdetail.put("fitemname", "");
@@ -73,37 +78,38 @@ public class ERPDocking {
         objectdetail.put("pagerows", pagerows);
         objectdetail.put("pagenum", pagenum);
         objectdetail.put("changedateBeg", begindate);
-        object.put("access_token","basicDrp");
-        object.put("classname","Titem");
-        object.put("method","queryPage");
-        object.put("content",objectdetail);
+        object.put("access_token", "basicDrp");
+        object.put("classname", "Titem");
+        object.put("method", "queryPage");
+        object.put("content", objectdetail);
 
         HashMap<String, String> map = new HashMap<>();
         map.put("content-Type", "application/json");
-        String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+        String result = new WebRequest().doPost(object.toString(), url, map);
         JSONObject resultobject = JSONObject.parseObject(result);
         System.out.println(object.toString());
         System.out.println(resultobject.toJSONString());
-        if(resultobject.getString("errcode").equals("0")){
+        if (resultobject.getString("errcode").equals("0")) {
             return resultobject.getJSONObject("results").getJSONArray("list");
-        }else {
+        } else {
             return new JSONArray();
         }
     }
 
     /**
-     *查询Erp库存
+     * 查询Erp库存
+     *
      * @param pagerows
      * @param pagenum
      * @param fitemnos
      * @return
      * @throws YosException
      */
-    public JSONArray getErpIcinvbalRows( int pagerows, int pagenum,JSONArray fitemnos) throws YosException {
+    public JSONArray getErpIcinvbalRows(int pagerows, int pagenum, JSONArray fitemnos) throws YosException {
         {
 
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
             objectdetail.put("fstockno", "01");
             objectdetail.put("fmodel", "");
             objectdetail.put("fitemname", "");
@@ -111,36 +117,38 @@ public class ERPDocking {
             objectdetail.put("fitemnos", fitemnos);
             objectdetail.put("pagerows", pagerows);
             objectdetail.put("pagenum", pagenum);
-            object.put("access_token","basicDrp");
-            object.put("classname","Icinvbal");
-            object.put("method","queryPage");
-            object.put("content",objectdetail);
+            object.put("access_token", "basicDrp");
+            object.put("classname", "Icinvbal");
+            object.put("method", "queryPage");
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
-            if(resultobject.getString("errcode").equals("0")){
+            if (resultobject.getString("errcode").equals("0")) {
                 return resultobject.getJSONObject("results").getJSONArray("list");
-            }else {
+            } else {
                 return new JSONArray();
             }
 
         }
     }
+
     /**
-     *查询Erp批次库存
+     * 查询Erp批次库存
+     *
      * @param pagerows
      * @param pagenum
      * @param fitemnos
      * @return
      * @throws YosException
      */
-    public JSONArray getErpIcinvbalBatchRows( int pagerows, int pagenum,JSONArray fitemnos) throws YosException {
+    public JSONArray getErpIcinvbalBatchRows(int pagerows, int pagenum, JSONArray fitemnos) throws YosException {
         {
 
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
             objectdetail.put("fstockno", "01");
             objectdetail.put("fstockname", "");
             objectdetail.put("fmodel", "");
@@ -151,18 +159,18 @@ public class ERPDocking {
             objectdetail.put("fitemnos", fitemnos);
             objectdetail.put("pagerows", pagerows);
             objectdetail.put("pagenum", pagenum);
-            object.put("access_token","basicDrp");
-            object.put("classname","Icinvbal");
-            object.put("method","queryPageOfBatch");
-            object.put("content",objectdetail);
+            object.put("access_token", "basicDrp");
+            object.put("classname", "Icinvbal");
+            object.put("method", "queryPageOfBatch");
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
-            if(resultobject.getString("errcode").equals("0")){
+            if (resultobject.getString("errcode").equals("0")) {
                 return resultobject.getJSONObject("results").getJSONArray("list");
-            }else {
+            } else {
                 return new JSONArray();
             }
 
@@ -171,33 +179,34 @@ public class ERPDocking {
 
     /**
      * 创建Erp发货单
+     *
      * @param dispatchRow
      * @param dispatchItems
      * @return
      * @throws YosException
      */
-    public String createErpSainvoice(Row dispatchRow, Rows dispatchItems,Controller controller,long sa_dispatchid) throws YosException {
+    public String createErpSainvoice(Row dispatchRow, Rows dispatchItems, Controller controller, long sa_dispatchid) throws YosException {
         {
 
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
-            JSONArray jsonArray =new JSONArray();
-            object.put("access_token","basicDrp");
-            object.put("classname","Sainvoice");
-            object.put("method","createSainvoice");
-            objectdetail.put("finvonum",dispatchRow.getString("billno"));
-            objectdetail.put("fagentnum",dispatchRow.getString("agentnum"));
-            objectdetail.put("fagentname",dispatchRow.getString("enterprisename"));
-            objectdetail.put("fsonum",dispatchRow.getString("sonum"));
-            objectdetail.put("fdate",dispatchRow.getString("billdate"));
-            objectdetail.put("fnotes",dispatchRow.getString("remarks"));
-            objectdetail.put("fcontact",dispatchRow.getString("name"));
-            objectdetail.put("fmobilephone",dispatchRow.getString("phonenumber"));
-            objectdetail.put("faddress",dispatchRow.getString("address"));
-            objectdetail.put("createby",dispatchRow.getString("createby"));
-            if(dispatchItems.isNotEmpty()){
-                for (Row row:dispatchItems) {
-                    JSONObject jsonObject=new JSONObject();
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
+            JSONArray jsonArray = new JSONArray();
+            object.put("access_token", "basicDrp");
+            object.put("classname", "Sainvoice");
+            object.put("method", "createSainvoice");
+            objectdetail.put("finvonum", dispatchRow.getString("billno"));
+            objectdetail.put("fagentnum", dispatchRow.getString("agentnum"));
+            objectdetail.put("fagentname", dispatchRow.getString("enterprisename"));
+            objectdetail.put("fsonum", dispatchRow.getString("sonum"));
+            objectdetail.put("fdate", dispatchRow.getString("billdate"));
+            objectdetail.put("fnotes", dispatchRow.getString("remarks"));
+            objectdetail.put("fcontact", dispatchRow.getString("name"));
+            objectdetail.put("fmobilephone", dispatchRow.getString("phonenumber"));
+            objectdetail.put("faddress", dispatchRow.getString("address"));
+            objectdetail.put("createby", dispatchRow.getString("createby"));
+            if (dispatchItems.isNotEmpty()) {
+                for (Row row : dispatchItems) {
+                    JSONObject jsonObject = new JSONObject();
                     jsonObject.put("fsonum", row.getString("sonum"));
                     jsonObject.put("fsorownum", row.getString("sorowno"));
                     jsonObject.put("fprodnum", row.getString("itemno"));
@@ -209,26 +218,28 @@ public class ERPDocking {
                     jsonArray.add(jsonObject);
                 }
             }
-            objectdetail.put("details",jsonArray);
-            object.put("content",objectdetail);
+            objectdetail.put("details", jsonArray);
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
 
-            saveLog(controller,"sa_dispatch",sa_dispatchid,"创建erp发货单",object.toString(),resultobject,dispatchRow.getString("billno"));
+            saveLog(controller, "sa_dispatch", sa_dispatchid, "创建erp发货单", object.toString(), resultobject, dispatchRow.getString("billno"));
 
-            if(resultobject.getString("errcode").equals("0")){
+            if (resultobject.getString("errcode").equals("0")) {
                 return "true";
-            }else {
+            } else {
                 return resultobject.getString("errmsg");
             }
 
         }
     }
+
     /**
      * 查询Erp发货单（单个）
+     *
      * @param billno
      * @return
      * @throws YosException
@@ -236,22 +247,22 @@ public class ERPDocking {
     public JSONArray queryErpSainvoice(String billno) throws YosException {
         {
 
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
-            object.put("access_token","basicDrp");
-            object.put("classname","Sainvoice");
-            object.put("method","queryOne");
-            objectdetail.put("finvonum",billno);
-            object.put("content",objectdetail);
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
+            object.put("access_token", "basicDrp");
+            object.put("classname", "Sainvoice");
+            object.put("method", "queryOne");
+            objectdetail.put("finvonum", billno);
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
             System.out.println(resultobject);
-            if(resultobject.getString("errcode").equals("error")){
+            if (resultobject.getString("errcode").equals("error")) {
                 return new JSONArray();
-            }else {
+            } else {
                 return resultobject.getJSONObject("results").getJSONArray("details");
             }
         }
@@ -259,6 +270,7 @@ public class ERPDocking {
 
     /**
      * 查询Erp发货单（批量）
+     *
      * @param pagerows
      * @param pagenum
      * @param finvonums
@@ -269,67 +281,69 @@ public class ERPDocking {
      * @return
      * @throws YosException
      */
-    public JSONArray queryErpSainvoices(int pagerows, int pagenum,JSONArray finvonums,String fagentnum,String fsonum,String fstatus,boolean onlyNeedClosed,boolean onlyNeedPartialOuts,boolean onlyWithCheckedOuts) throws YosException {
+    public JSONArray queryErpSainvoices(int pagerows, int pagenum, JSONArray finvonums, String fagentnum, String fsonum, String fstatus, boolean onlyNeedClosed, boolean onlyNeedPartialOuts, boolean onlyWithCheckedOuts) throws YosException {
         {
 
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
-            object.put("access_token","basicDrp");
-            object.put("classname","Sainvoice");
-            object.put("method","queryPage");
-            objectdetail.put("pagenum",pagenum);
-            objectdetail.put("pagerows",pagerows);
-            objectdetail.put("finvonums",finvonums);
-            objectdetail.put("fagentnum",fagentnum);
-            objectdetail.put("fsonum",fsonum);
-            objectdetail.put("fstatus",fstatus);
-            objectdetail.put("onlyNeedClosed",onlyNeedClosed);
-            objectdetail.put("onlyNeedPartialOuts",onlyNeedPartialOuts);
-            objectdetail.put("onlyWithCheckedOuts",onlyWithCheckedOuts);
-            object.put("content",objectdetail);
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
+            object.put("access_token", "basicDrp");
+            object.put("classname", "Sainvoice");
+            object.put("method", "queryPage");
+            objectdetail.put("pagenum", pagenum);
+            objectdetail.put("pagerows", pagerows);
+            objectdetail.put("finvonums", finvonums);
+            objectdetail.put("fagentnum", fagentnum);
+            objectdetail.put("fsonum", fsonum);
+            objectdetail.put("fstatus", fstatus);
+            objectdetail.put("onlyNeedClosed", onlyNeedClosed);
+            objectdetail.put("onlyNeedPartialOuts", onlyNeedPartialOuts);
+            objectdetail.put("onlyWithCheckedOuts", onlyWithCheckedOuts);
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
             System.out.println(object.toString());
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
             System.out.println(resultobject);
-            if(resultobject.getString("errcode").equals("error")){
+            if (resultobject.getString("errcode").equals("error")) {
                 return new JSONArray();
-            }else {
+            } else {
                 return resultobject.getJSONObject("results").getJSONArray("list");
             }
         }
     }
+
     /**
      * 关闭Erp发货单
+     *
      * @param billno
      * @param isManual
      * @return
      * @throws YosException
      */
-    public String closeErpSainvoice(String billno, boolean isManual,Controller controller,long sa_dispatchid) throws YosException {
+    public String closeErpSainvoice(String billno, boolean isManual, Controller controller, long sa_dispatchid) throws YosException {
         {
 
-            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",isManual);
-            object.put("content",objectdetail);
+            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", isManual);
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
 
-            saveLog(controller,"sa_dispatch",sa_dispatchid,"关闭发货单",object.toString(),resultobject,billno);
+            saveLog(controller, "sa_dispatch", sa_dispatchid, "关闭发货单", object.toString(), resultobject, billno);
 
-            if(resultobject.getString("errcode").equals("0")){
+            if (resultobject.getString("errcode").equals("0")) {
                 return "true";
-            }else {
+            } else {
                 return resultobject.getString("errmsg");
             }
         }
@@ -337,6 +351,7 @@ public class ERPDocking {
 
     /**
      * Erp发货单行关闭
+     *
      * @param billno
      * @param controller
      * @param rowno
@@ -345,29 +360,29 @@ public class ERPDocking {
      * @return
      * @throws YosException
      */
-    public String closeErpSainvoiceRow(String billno,Controller controller,long rowno,String itemno,long sa_dispatchid) throws YosException {
+    public String closeErpSainvoiceRow(String billno, Controller controller, long rowno, String itemno, long sa_dispatchid) throws YosException {
         {
 
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
-            object.put("access_token","basicDrp");
-            object.put("classname","Sainvoice");
-            object.put("method","closeRowOfSainvoice");
-            objectdetail.put("finvonum",billno);
-            objectdetail.put("fprodnum",itemno);
-            objectdetail.put("frownum",rowno);
-            object.put("content",objectdetail);
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
+            object.put("access_token", "basicDrp");
+            object.put("classname", "Sainvoice");
+            object.put("method", "closeRowOfSainvoice");
+            objectdetail.put("finvonum", billno);
+            objectdetail.put("fprodnum", itemno);
+            objectdetail.put("frownum", rowno);
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
 
-            saveLog(controller,"sa_dispatch",sa_dispatchid,"发货单行关闭",object.toString(),resultobject,billno);
+            saveLog(controller, "sa_dispatch", sa_dispatchid, "发货单行关闭", object.toString(), resultobject, billno);
 
-            if(resultobject.getString("errcode").equals("0")){
+            if (resultobject.getString("errcode").equals("0")) {
                 return "true";
-            }else {
+            } else {
                 return resultobject.getString("errmsg");
             }
         }
@@ -375,36 +390,37 @@ public class ERPDocking {
 
     /**
      * 创建Erp退/换货单
+     *
      * @param aftersalesmagRow
      * @param aftersalesmagItems
      * @return
      * @throws YosException
      */
-    public String createErpSareturn(Row aftersalesmagRow, Rows aftersalesmagItems,Controller controller,long sa_aftersalesmagid) throws YosException {
+    public String createErpSareturn(Row aftersalesmagRow, Rows aftersalesmagItems, Controller controller, long sa_aftersalesmagid) throws YosException {
         {
 
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
-            JSONArray jsonArray =new JSONArray();
-            object.put("access_token","basicDrp");
-            object.put("classname","Sareturn");
-            object.put("method","createSareturn");
-            objectdetail.put("freturnnum",aftersalesmagRow.getString("billno"));
-            objectdetail.put("fagentnum",aftersalesmagRow.getString("agentnum"));
-            objectdetail.put("fagentname",aftersalesmagRow.getString("enterprisename"));
-            objectdetail.put("faccclsnum","01");
-            objectdetail.put("fdate",aftersalesmagRow.getString("billdate"));
-            objectdetail.put("fnotes",aftersalesmagRow.getString("reason"));
-            objectdetail.put("createby",aftersalesmagRow.getString("createby"));
-            if(aftersalesmagRow.getString("type").equals("退货单")){
-                objectdetail.put("freturntype","退货");
-            }else if(aftersalesmagRow.getString("type").equals("换货单")){
-                objectdetail.put("freturntype","换货");
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
+            JSONArray jsonArray = new JSONArray();
+            object.put("access_token", "basicDrp");
+            object.put("classname", "Sareturn");
+            object.put("method", "createSareturn");
+            objectdetail.put("freturnnum", aftersalesmagRow.getString("billno"));
+            objectdetail.put("fagentnum", aftersalesmagRow.getString("agentnum"));
+            objectdetail.put("fagentname", aftersalesmagRow.getString("enterprisename"));
+            objectdetail.put("faccclsnum", "01");
+            objectdetail.put("fdate", aftersalesmagRow.getString("billdate"));
+            objectdetail.put("fnotes", aftersalesmagRow.getString("reason"));
+            objectdetail.put("createby", aftersalesmagRow.getString("createby"));
+            if (aftersalesmagRow.getString("type").equals("退货单")) {
+                objectdetail.put("freturntype", "退货");
+            } else if (aftersalesmagRow.getString("type").equals("换货单")) {
+                objectdetail.put("freturntype", "换货");
             }
 
-            if(aftersalesmagItems.isNotEmpty()){
-                for (Row row:aftersalesmagItems) {
-                    JSONObject jsonObject=new JSONObject();
+            if (aftersalesmagItems.isNotEmpty()) {
+                for (Row row : aftersalesmagItems) {
+                    JSONObject jsonObject = new JSONObject();
                     jsonObject.put("fprodnum", row.getString("itemno"));
                     jsonObject.put("fbatchbnum", row.getString("batchno"));
                     jsonObject.put("fqty", row.getString("qty"));
@@ -413,27 +429,29 @@ public class ERPDocking {
                     jsonArray.add(jsonObject);
                 }
             }
-            objectdetail.put("details",jsonArray);
-            object.put("content",objectdetail);
+            objectdetail.put("details", jsonArray);
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
             System.out.println(object.toString());
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
 
-            saveLog(controller,"sa_aftersalesmag",sa_aftersalesmagid,"创建erp退/换货单",object.toString(),resultobject,aftersalesmagRow.getString("billno"));
+            saveLog(controller, "sa_aftersalesmag", sa_aftersalesmagid, "创建erp退/换货单", object.toString(), resultobject, aftersalesmagRow.getString("billno"));
 
-            if(resultobject.getString("errcode").equals("0")){
+            if (resultobject.getString("errcode").equals("0")) {
                 return "true";
-            }else {
+            } else {
                 return resultobject.getString("errmsg");
             }
 
         }
     }
+
     /**
      * 查询Erp退/换货单（单个）
+     *
      * @param billno
      * @return
      * @throws YosException
@@ -441,28 +459,30 @@ public class ERPDocking {
     public JSONArray queryErpSareturn(String billno) throws YosException {
         {
 
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
-            object.put("access_token","basicDrp");
-            object.put("classname","Sareturn");
-            object.put("method","queryOne");
-            objectdetail.put("freturnnum",billno);
-            object.put("content",objectdetail);
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
+            object.put("access_token", "basicDrp");
+            object.put("classname", "Sareturn");
+            object.put("method", "queryOne");
+            objectdetail.put("freturnnum", billno);
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
             System.out.println(resultobject);
-            if(resultobject.getString("errcode").equals("error")){
+            if (resultobject.getString("errcode").equals("error")) {
                 return new JSONArray();
-            }else {
+            } else {
                 return resultobject.getJSONObject("results").getJSONArray("details");
             }
         }
     }
+
     /**
      * 查询Erpt退/换货单（批量）
+     *
      * @param pagerows
      * @param pagenum
      * @param freturnnums
@@ -473,66 +493,68 @@ public class ERPDocking {
      * @return
      * @throws YosException
      */
-    public JSONArray queryErpSareturns(int pagerows, int pagenum,JSONArray freturnnums,String fagentnum,String fsonum,String freturntype,String fstatus,boolean onlyNeedClosed) throws YosException {
+    public JSONArray queryErpSareturns(int pagerows, int pagenum, JSONArray freturnnums, String fagentnum, String fsonum, String freturntype, String fstatus, boolean onlyNeedClosed) throws YosException {
         {
 
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
-            object.put("access_token","basicDrp");
-            object.put("classname","Sareturn");
-            object.put("method","queryPage");
-            objectdetail.put("pagenum",pagenum);
-            objectdetail.put("pagerows",pagerows);
-            objectdetail.put("freturnnums",freturnnums);
-            objectdetail.put("fagentnum",fagentnum);
-            objectdetail.put("fsonum",fsonum);
-            objectdetail.put("freturntype",freturntype);
-            objectdetail.put("fstatus",fstatus);
-            objectdetail.put("onlyNeedClosed",onlyNeedClosed);
-            object.put("content",objectdetail);
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
+            object.put("access_token", "basicDrp");
+            object.put("classname", "Sareturn");
+            object.put("method", "queryPage");
+            objectdetail.put("pagenum", pagenum);
+            objectdetail.put("pagerows", pagerows);
+            objectdetail.put("freturnnums", freturnnums);
+            objectdetail.put("fagentnum", fagentnum);
+            objectdetail.put("fsonum", fsonum);
+            objectdetail.put("freturntype", freturntype);
+            objectdetail.put("fstatus", fstatus);
+            objectdetail.put("onlyNeedClosed", onlyNeedClosed);
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
             System.out.println(object.toString());
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
             System.out.println(resultobject);
-            if(resultobject.getString("errcode").equals("error")){
+            if (resultobject.getString("errcode").equals("error")) {
                 return new JSONArray();
-            }else {
+            } else {
                 return resultobject.getJSONObject("results").getJSONArray("list");
             }
         }
     }
+
     /**
      * 复核Erp退/换货单
+     *
      * @param billno
      * @param isManual
      * @return
      * @throws YosException
      */
-    public String recheckErpSareturn(String billno, boolean isManual,Controller controller,long sa_aftersalesmagid) throws YosException {
+    public String recheckErpSareturn(String billno, boolean isManual, Controller controller, long sa_aftersalesmagid) throws YosException {
         {
 
-            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",isManual);
-            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", isManual);
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
 
-            saveLog(controller,"sa_aftersalesmag",sa_aftersalesmagid,"复核erp退/换货单",object.toString(),resultobject,billno);
+            saveLog(controller, "sa_aftersalesmag", sa_aftersalesmagid, "复核erp退/换货单", object.toString(), resultobject, billno);
 
-            if(resultobject.getString("errcode").equals("0")){
+            if (resultobject.getString("errcode").equals("0")) {
                 return "true";
-            }else {
+            } else {
                 return resultobject.getString("errmsg");
             }
         }
@@ -541,6 +563,7 @@ public class ERPDocking {
 
     /**
      * 上传日志更新
+     *
      * @param controller
      * @param ownertable
      * @param ownerid
@@ -551,7 +574,7 @@ public class ERPDocking {
      * @return
      */
     public static boolean saveLog(Controller controller, String ownertable, long ownerid, String type, String request,
-                                  JSONObject response,String billno) {
+                                  JSONObject response, String billno) {
         boolean issuccess = false;
         try {
             Rows rows = controller.dbConnect.runSqlQuery(
@@ -592,44 +615,45 @@ public class ERPDocking {
 
     /**
      * 查询销售出库单
+     *
      * @param pagerows
      * @param pagenum
      * @return
      * @throws YosException
      */
-    public JSONArray queryErpStockBill(int pagerows, int pagenum,String fbtname) throws YosException {
+    public JSONArray queryErpStockBill(int pagerows, int pagenum, String fbtname) throws YosException {
         {
-            JSONArray fupdateFlags=new JSONArray();
+            JSONArray fupdateFlags = new JSONArray();
             fupdateFlags.add(0);
             fupdateFlags.add(99);
             fupdateFlags.add(2);
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
-            object.put("access_token","basicDrp");
-            object.put("classname","TstockbillOuts");
-            object.put("method","queryPageForSyncYos");
-            objectdetail.put("pagenum",pagenum);
-            objectdetail.put("pagerows",pagerows);
-            objectdetail.put("fbillnums",new JSONArray());
-            objectdetail.put("fagentnum","");
-            objectdetail.put("fstatus","审核");
-            objectdetail.put("frb","");
-            objectdetail.put("fstockno","");
-            objectdetail.put("fbtname",fbtname);
-            objectdetail.put("fminperiod","");
-            objectdetail.put("fupdateFlags",fupdateFlags);
-
-            object.put("content",objectdetail);
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
+            object.put("access_token", "basicDrp");
+            object.put("classname", "TstockbillOuts");
+            object.put("method", "queryPageForSyncYos");
+            objectdetail.put("pagenum", pagenum);
+            objectdetail.put("pagerows", pagerows);
+            objectdetail.put("fbillnums", new JSONArray());
+            objectdetail.put("fagentnum", "");
+            objectdetail.put("fstatus", "审核");
+            objectdetail.put("frb", "");
+            objectdetail.put("fstockno", "");
+            objectdetail.put("fbtname", fbtname);
+            objectdetail.put("fminperiod", "");
+            objectdetail.put("fupdateFlags", fupdateFlags);
+
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
             System.out.println(object.toString());
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
             System.out.println(resultobject);
-            if(resultobject.getString("errcode").equals("error")){
+            if (resultobject.getString("errcode").equals("error")) {
                 return new JSONArray();
-            }else {
+            } else {
                 return resultobject.getJSONObject("results").getJSONArray("list");
             }
         }
@@ -637,28 +661,29 @@ public class ERPDocking {
 
     /**
      * 更新erp出库单标志
+     *
      * @return
      * @throws YosException
      */
     public String updateErpupdateFlag(JSONArray flags) throws YosException {
         {
 
-            JSONObject object= new JSONObject();
-            JSONObject objectdetail= new JSONObject();
-            object.put("access_token","basicDrp");
-            object.put("classname","TstockbillOuts");
-            object.put("method","syncFupdateFlags");
-            objectdetail.put("flags",flags);
-            object.put("content",objectdetail);
+            JSONObject object = new JSONObject();
+            JSONObject objectdetail = new JSONObject();
+            object.put("access_token", "basicDrp");
+            object.put("classname", "TstockbillOuts");
+            object.put("method", "syncFupdateFlags");
+            objectdetail.put("flags", flags);
+            object.put("content", objectdetail);
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-            String result = new WebRequest().doPost(object.toString(), "http://192.168.3.89:8001/rest/ws_v2/basicDrp", map);
+            String result = new WebRequest().doPost(object.toString(), url, map);
             JSONObject resultobject = JSONObject.parseObject(result);
 
-            if(resultobject.getString("errcode").equals("0")){
+            if (resultobject.getString("errcode").equals("0")) {
                 return "true";
-            }else {
+            } else {
                 return resultobject.getString("errmsg");
             }
         }