标准订单支持退回功能（根据提交时间禁止跨月退回），除标准订单外促销订单和特殊订单禁止退回。及最新对接功能更新

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -32,6 +32,8 @@ import restcontroller.webmanage.executorService.Executor;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 
 import static beans.order.Order.*;
@@ -1982,6 +1984,19 @@ public class Order extends Controller {
         if (!rows.get(0).getString("status").equals("提交")) {
             return getErrReturnObject().setErrMsg("订单非提交状态无法退回").toString();
         }
+        Row row = rows.get(0);
+        Date submitdate = new Date();
+        Date date = new Date();
+        if (!StringUtils.isBlank(row.getString("submitdate"))) {
+            submitdate = row.getDate("submitdate");
+        }
+        if (!row.getString("type").equals("标准订单")) {
+            return getErrReturnObject().setErrMsg("非标准订单无法退回").toString();
+        }
+        if (!isMonth(submitdate, date) && row.getString("type").equals("标准订单")) {
+            return getErrReturnObject().setErrMsg("标准订单无法跨月退回").toString();
+        }
+
         if (rows.get(0).getLong("sa_promotionid") != 0) {
             if (dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion WHERE CURRENT_TIME> enddate AND siteid='" + siteid + "' AND sa_promotionid='" + rows.get(0).getLong("sa_promotionid") + "'").isNotEmpty()) {
                 //return getErrReturnObject().setErrMsg("活动已结束，是否确认退回，退回后无法再次提交").toString();
@@ -1989,7 +2004,6 @@ public class Order extends Controller {
         }
         //通过版本更新订单表头数据
         beans.order.Order.updateOrderWithVersion(this);
-        Row row = rows.get(0);
         Long sa_accountclassid = row.getLong("sa_accountclassid");
         //验证结算企业
         Long pay_enterpriseid = row.getLong("pay_enterpriseid");
@@ -3431,7 +3445,23 @@ public class Order extends Controller {
         sqlList.add("update sa_order set sa_accountclassinfos='" + jsonArray + "' where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
         return sqlList;
     }
+    /**
+     * 判断是否在同一个月
+     *
+     * @return false:不在同一个月内，true在同一个月内
+     */
+    public boolean isMonth(Date date1, Date date2) {
+        Calendar calendar1 = Calendar.getInstance();
+        calendar1.setTime(date1);
+        Calendar calendar2 = Calendar.getInstance();
+        calendar2.setTime(date2);
+        int year1 = calendar1.get(Calendar.YEAR);
+        int year2 = calendar2.get(Calendar.YEAR);
+        int month1 = calendar1.get(Calendar.MONTH);
+        int month2 = calendar2.get(Calendar.MONTH);
+        return calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR) && calendar1.get(Calendar.MONTH) == calendar2.get(Calendar.MONTH);
 
+    }
 
 //    @API(title = "发货单手动关闭", apiversion = R.ID20230406155302.v1.class)
 //    @Deprecated

src/custom/service/AftersalesmagAutoRecheckService.java

@@ -102,7 +102,8 @@ public class AftersalesmagAutoRecheckService extends ServiceController {
                     }
                     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 sqlFactory = new SQLFactory(this, "数据操作日志新增");
+                        sqlFactory.addParameter("sys_contrllogid", createTableID("sys_contrllog"));
                         sqlFactory.addParameter("ownertable", "sa_aftersalesmag");
                         sqlFactory.addParameter("ownerid", sa_aftersalesmagid);
                         sqlFactory.addParameter("action", "自动复核");

src/custom/service/AutoDockItemService.java

@@ -1,13 +1,16 @@
 package service;
 
+import beans.parameter.Parameter;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import common.BaseClass;
 import common.ServiceController;
 import common.YosException;
 import common.data.Row;
 import common.data.Rows;
 import common.data.RowsMap;
 import common.data.SQLFactory;
+import common.data.db.DBConnect;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import restcontroller.webmanage.sale.item.Item;
@@ -23,8 +26,18 @@ public class AutoDockItemService extends ServiceController {
     public void serviceRun() throws YosException {
         ArrayList<String> sqlList = new ArrayList<>();
         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");
+        String AutoDockItemServiceTime =simpleDateFormat.format(date);
+        if(!rows.isEmpty()){
+            AutoDockItemServiceTime =rows.get(0).getString("paramvalue");
+            dbConnect.runSqlUpdate("delete from sys_parameter where paramname='AutoDockItemServiceTime'");
+        }else{
+            Parameter.create(new BaseClass(),"AutoDockItemServiceTime",simpleDateFormat.format(date),"");
+        }
         Rows itemRows = dbConnect.runSqlQuery("SELECT itemid,itemno from  plm_item WHERE siteid = '" + siteid + "' AND status = '新建' ");
-        Rows itemRowsAll = dbConnect.runSqlQuery("SELECT itemid,itemno from  plm_item WHERE siteid = '" + siteid + "'");
+        Rows itemRowsAll = dbConnect.runSqlQuery("SELECT itemid,itemno,status from  plm_item WHERE siteid = '" + siteid + "'");
         //单位
         Rows unitRows = dbConnect.runSqlQuery("SELECT unitid,unitname from  plm_unit WHERE siteid = '" + siteid + "'");
         RowsMap unitRowsMap = unitRows.toRowsMap("unitname");
@@ -32,16 +45,8 @@ public class AutoDockItemService extends ServiceController {
         RowsMap itemRowsMap = itemRows.toRowsMap("itemno");
         RowsMap itemRowsMapAll = itemRowsAll.toRowsMap("itemno");
         ERPDocking erpDocking =new ERPDocking();
-        Rows servicesRows = dbConnect.runSqlQuery("select lastruntime,lastruntime1 from sys_services where classname='AutoDockItemService'");
-        Date date =new Date();
-        if(!servicesRows.isEmpty()){
-            if(StringUtils.isNotBlank(servicesRows.get(0).getString("lastruntime1"))){
-                date=servicesRows.get(0).getDate("lastruntime1");
-            }
-        }
-        dbConnect.runSqlUpdate("update sys_services set lastruntime1=now() where classname='AutoDockItemService'");
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        JSONArray jsonArray = erpDocking.getErpItemRows(simpleDateFormat.format(date), 100000, 1);
+
+        JSONArray jsonArray = erpDocking.getErpItemRows(AutoDockItemServiceTime, 100000, 1);
         if(!jsonArray.isEmpty()){
             for (Object object:jsonArray) {
                 JSONObject jsonObject =(JSONObject)object;
@@ -115,7 +120,7 @@ public class AutoDockItemService extends ServiceController {
                     sqlFactory.addParameter("delistingstatus","");
 
                     sqlFactory.addParameter("ismodule", 0);
-                    sqlFactory.addParameter("packageqty", 0);
+                    sqlFactory.addParameter("packageqty", (StringUtils.isBlank(jsonObject.getStringValue("fpackqty"))?"0":jsonObject.getStringValue("fpackqty")));
                     sqlFactory.addParameter("iswoodproducts", 0);
 
                     sqlFactory.addParameter("sa_customschemeid", 0);
@@ -151,11 +156,15 @@ public class AutoDockItemService extends ServiceController {
 
                     sqlList.add(sqlFactory.getSQL());
 
+                }else{
+                    sqlList.add("update plm_item set itemname='"+jsonObject.getString("fitemname")+"',volume='"+ jsonObject.getStringValue("fvolume")+"',packageqty='"+ (StringUtils.isBlank(jsonObject.getStringValue("fpackqty"))?"0":jsonObject.getStringValue("fpackqty"))+"' where itemid="+itemRowsMapAll.get(jsonObject.getString("fitemno")).get(0).getLong("itemid"));
+                    System.out.println("update plm_item set itemname='"+jsonObject.getString("fitemname")+"',volume='"+ jsonObject.getStringValue("fvolume")+"',packageqty='"+ (StringUtils.isBlank(jsonObject.getStringValue("fpackqty"))?"0":jsonObject.getStringValue("fpackqty"))+"' where itemid="+itemRowsMapAll.get(jsonObject.getString("fitemno")).get(0).getLong("itemid"));
                 }
 
             }
         }
         dbConnect.runSqlUpdate(sqlList);
+        Parameter.create(new BaseClass(),"AutoDockItemServiceTime",simpleDateFormat.format(new Date()),"");
     }
 
 }

src/custom/service/DispatchAutoCloseService.java

@@ -13,6 +13,7 @@ import common.data.RowsMap;
 import common.data.SQLFactory;
 import common.parameter.properties;
 import org.apache.log4j.Logger;
+import restcontroller.webmanage.executorService.Executor;
 import utility.ERPDocking;
 import utility.tools.WebRequest;
 
@@ -40,7 +41,7 @@ public class DispatchAutoCloseService extends ServiceController {
             RowsMap rowsMap1 = rowsdetail.toRowsMap("billno");
             ArrayList<String> sqlList = new ArrayList<>();
             ERPDocking erpDocking = new ERPDocking();
-            JSONArray ErpSainvoices = erpDocking.queryErpSainvoices(10000, 1, new JSONArray(), "", "", "", false,true);
+            JSONArray ErpSainvoices = erpDocking.queryErpSainvoices(10000, 1, new JSONArray(), "", "", "", false, false, true);
             JSONArray dispatchids = new JSONArray();
             JSONArray unclosedispatchids = new JSONArray();
             if (!ErpSainvoices.isEmpty()) {
@@ -111,7 +112,8 @@ 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='CCYOSG'");
-                        SQLFactory sqlFactory = new SQLFactory(new DataContrlLog(), "数据操作日志新增");
+                        SQLFactory sqlFactory = new SQLFactory(this, "数据操作日志新增");
+                        sqlFactory.addParameter("sys_contrllogid", createTableID("sys_contrllog"));
                         sqlFactory.addParameter("ownertable", "sa_dispatch");
                         sqlFactory.addParameter("ownerid", sa_dispatchid);
                         sqlFactory.addParameter("action", "自动关闭");
@@ -122,7 +124,7 @@ public class DispatchAutoCloseService extends ServiceController {
                         sqlList.add(sqlFactory.getSQL());
                     } else {
                         unclosedispatchids.add(sa_dispatchid);
-                        logger.info("发货单自动关闭错误:" + resultobject.getString("errmsg")+"发货单id:"+sa_dispatchid);
+                        logger.info("发货单自动关闭错误:" + resultobject.getString("errmsg") + "发货单id:" + sa_dispatchid);
                     }
                     if (!jsonArray.isEmpty()) {
                         for (Object object1 : jsonArray) {
@@ -137,8 +139,6 @@ public class DispatchAutoCloseService extends ServiceController {
             dbConnect.runSqlUpdate(sqlList);
 
 
-
-
             //判断当前单据是否已实际发完货，如果发完，则生把订单变为关闭状态
             Rows orderRows = new Rows();
             if (dispatchids.size() > 0) {
@@ -160,9 +160,10 @@ public class DispatchAutoCloseService extends ServiceController {
                         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='CCYOSG'");
                             dbConnect.runSqlUpdate("update sa_order set status='关闭',closedate=current_time,closeby='admin' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='CCYOSG'");
-                            SQLFactory sqlFactory = new SQLFactory(new DataContrlLog(), "数据操作日志新增");
+                            SQLFactory sqlFactory = new SQLFactory(this, "数据操作日志新增");
+                            sqlFactory.addParameter("sys_contrllogid", createTableID("sys_contrllog"));
                             sqlFactory.addParameter("ownertable", "sa_order");
-                            sqlFactory.addParameter("ownerid",  row.getLong("sa_orderid"));
+                            sqlFactory.addParameter("ownerid", row.getLong("sa_orderid"));
                             sqlFactory.addParameter("action", "自动关闭");
                             sqlFactory.addParameter("remarks", "订单数量发完自动关闭");
                             sqlFactory.addParameter("actionuserid", "1");
@@ -177,14 +178,14 @@ public class DispatchAutoCloseService extends ServiceController {
             //自动关闭erp发货单接口不成功，则手动关闭e订货的发货单（但状态为关闭）
             ArrayList<String> uncloseSqlList = new ArrayList<>();
             if (unclosedispatchids.size() > 0) {
-                for (Object object:unclosedispatchids) {
+                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='CCYOSG'");
-                    if(!dispatchRows.isEmpty()){
-                        billno=dispatchRows.get(0).getString("billno");
-                    }else{
-                        logger.info("发货单"+sa_dispatchid+"不存在:");
+                    String billno = "";
+                    Rows dispatchRows = dbConnect.runSqlQuery("select * from sa_dispatch where sa_dispatchid=" + sa_dispatchid + " and siteid='CCYOSG'");
+                    if (!dispatchRows.isEmpty()) {
+                        billno = dispatchRows.get(0).getString("billno");
+                    } else {
+                        logger.info("发货单" + sa_dispatchid + "不存在:");
                         continue;
                     }
                     //手工关闭发货单
@@ -202,11 +203,12 @@ public class DispatchAutoCloseService extends ServiceController {
                     String result = new WebRequest().doPost(jsonobject.toString(), "http://124.71.196.182:8001/rest/ws_v2/basicDrp", map);
                     JSONObject resultobject = JSONObject.parseObject(result);
                     if (resultobject.getString("errcode").equals("0")) {
-                        Rows rowsOrderDetail = dbConnect.runSqlQuery("select t1.undeliqty,t1.deliedqty,t1.qty,t1.sa_orderitemsid from sa_orderitems t1 where t1.sa_orderitemsid in (select sa_orderitemsid from sa_dispatch_items where sa_dispatchid="+ sa_dispatchid+")" );
+                        Rows rowsOrderDetail = dbConnect.runSqlQuery("select t1.undeliqty,t1.deliedqty,t1.qty,t1.sa_orderitemsid from sa_orderitems t1 where t1.sa_orderitemsid in (select sa_orderitemsid from sa_dispatch_items where sa_dispatchid=" + sa_dispatchid + ")");
                         RowsMap rowsOrderDetailMap = rowsOrderDetail.toRowsMap("sa_orderitemsid");
-                        Rows rowsDispatchDetail = dbConnect.runSqlQuery("select t1.qty,t1.outwarehouseqty,t1.sa_orderitemsid,t1.rowno,t2.itemname from sa_dispatch_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_dispatchid=" + sa_dispatchid);
-                        if (!rowsDispatchDetail.isEmpty()) {
-                            for (Row row : rowsDispatchDetail) {
+                        Rows rowsDispatchDetailGroup = dbConnect.runSqlQuery("select sum(t1.qty) qty,sum(t1.outwarehouseqty) outwarehouseqty,t1.sa_orderitemsid,t1.siteid from sa_dispatch_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where ifnull(t1.isclose,0)=0 and t1.sa_dispatchid=" + sa_dispatchid + " group by t1.sa_orderitemsid,t1.siteid");
+                        if (!rowsDispatchDetailGroup.isEmpty()) {
+                            for (Row row : rowsDispatchDetailGroup) {
+                                logger.info("测试bug：" + "update sa_orderitems set undeliqty=" + rowsOrderDetailMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("undeliqty").add(row.getBigDecimal("qty").subtract(row.getBigDecimal("outwarehouseqty"))) + ",deliedqty=" + rowsOrderDetailMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("deliedqty").subtract(row.getBigDecimal("qty").subtract(row.getBigDecimal("outwarehouseqty"))) + " where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
                                 uncloseSqlList.add("update sa_orderitems set undeliqty=" + rowsOrderDetailMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("undeliqty").add(row.getBigDecimal("qty").subtract(row.getBigDecimal("outwarehouseqty"))) + ",deliedqty=" + rowsOrderDetailMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("deliedqty").subtract(row.getBigDecimal("qty").subtract(row.getBigDecimal("outwarehouseqty"))) + " where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
                             }
                         }
@@ -215,7 +217,8 @@ public class DispatchAutoCloseService extends ServiceController {
 //                        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='CCYOSG'");
-                        SQLFactory sqlFactory = new SQLFactory(new DataContrlLog(), "数据操作日志新增");
+                        SQLFactory sqlFactory = new SQLFactory(this, "数据操作日志新增");
+                        sqlFactory.addParameter("sys_contrllogid", createTableID("sys_contrllog"));
                         sqlFactory.addParameter("ownertable", "sa_dispatch");
                         sqlFactory.addParameter("ownerid", sa_dispatchid);
                         sqlFactory.addParameter("action", "自动关闭");
@@ -224,8 +227,8 @@ public class DispatchAutoCloseService extends ServiceController {
                         sqlFactory.addParameter("actionby", "admin");
                         sqlFactory.addParameter("siteid", "CCYOSG");
                         uncloseSqlList.add(sqlFactory.getSQL());
-                    }else{
-                        logger.info("发货单手工关闭错误:" + resultobject.getString("errmsg")+"发货单id:"+sa_dispatchid);
+                    } else {
+                        logger.info("发货单手工关闭错误:" + resultobject.getString("errmsg") + "发货单id:" + sa_dispatchid);
                         Rows erpupdatelogRows = dbConnect.runSqlQuery(
                                 "select * from sys_erpupdatelog where ownertable='sa_dispatch' and type='手工关闭发货单' and ownerid=" + sa_dispatchid);
                         SQLFactory sqlFactory;
@@ -254,6 +257,13 @@ public class DispatchAutoCloseService extends ServiceController {
                 }
                 dbConnect.runSqlUpdate(uncloseSqlList);
             }
+            for (Object o : dispatchids) {
+                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, "CCYOSG", dataextra);
+            }
+
         }
     }
 

src/custom/utility/ERPDocking.java

@@ -82,8 +82,8 @@ public class ERPDocking {
         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);
-        //System.out.println(object.toString());
-        //System.out.println(resultobject.toJSONString());
+        System.out.println(object.toString());
+        System.out.println(resultobject.toJSONString());
         if(resultobject.getString("errcode").equals("0")){
             return resultobject.getJSONObject("results").getJSONArray("list");
         }else {
@@ -248,7 +248,7 @@ public class ERPDocking {
             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);
-             //System.out.println(resultobject);
+            System.out.println(resultobject);
             if(resultobject.getString("errcode").equals("error")){
                 return new JSONArray();
             }else {
@@ -269,7 +269,7 @@ 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) 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();
@@ -285,14 +285,15 @@ public class ERPDocking {
             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());
+            System.out.println(object.toString());
             String result = new WebRequest().doPost(object.toString(), "http://124.71.196.182:8001/rest/ws_v2/basicDrp", map);
             JSONObject resultobject = JSONObject.parseObject(result);
-            //System.out.println(resultobject);
+            System.out.println(resultobject);
             if(resultobject.getString("errcode").equals("error")){
                 return new JSONArray();
             }else {
@@ -417,7 +418,7 @@ public class ERPDocking {
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-             //System.out.println(object.toString());
+            System.out.println(object.toString());
             String result = new WebRequest().doPost(object.toString(), "http://124.71.196.182:8001/rest/ws_v2/basicDrp", map);
             JSONObject resultobject = JSONObject.parseObject(result);
 
@@ -452,7 +453,7 @@ public class ERPDocking {
             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);
-            //System.out.println(resultobject);
+            System.out.println(resultobject);
             if(resultobject.getString("errcode").equals("error")){
                 return new JSONArray();
             }else {
@@ -492,10 +493,10 @@ public class ERPDocking {
 
             HashMap<String, String> map = new HashMap<>();
             map.put("content-Type", "application/json");
-            //System.out.println(object.toString());
+            System.out.println(object.toString());
             String result = new WebRequest().doPost(object.toString(), "http://124.71.196.182:8001/rest/ws_v2/basicDrp", map);
             JSONObject resultobject = JSONObject.parseObject(result);
-            //System.out.println(resultobject);
+            System.out.println(resultobject);
             if(resultobject.getString("errcode").equals("error")){
                 return new JSONArray();
             }else {