根据时间查询优化及erp对接发货单查询erp可发货发货单添加查询字段

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -430,10 +430,10 @@ public class cashbill extends Controller {
                 where = where + " and t3.accountname ='" + whereObject.getString("accountname") + "' ";
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where = where + " and t1.createdate >='" + whereObject.getString("begindate") + "'";
+                where = where + " and DATE_FORMAT(t1.createdate, '%Y-%m-%d') >='" + whereObject.getString("begindate") + "'";
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where = where + " and t1.createdate <='" + whereObject.getString("enddate") + "'";
+                where = where + " and DATE_FORMAT(t1.createdate, '%Y-%m-%d') <='" + whereObject.getString("enddate") + "'";
             }
             if (whereObject.containsKey("billno") && !"".equals(whereObject.getString("billno"))) {
                 where = where + " and t1.billno ='" + whereObject.getString("billno") + "'";
@@ -498,10 +498,10 @@ public class cashbill extends Controller {
                 where = where + " and t3.accountname ='" + whereObject.getString("accountname") + "' ";
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where = where + " and t1.createdate >='" + whereObject.getString("begindate") + "'";
+                where = where + " and DATE_FORMAT(t1.createdate, '%Y-%m-%d') >='" + whereObject.getString("begindate") + "'";
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where = where + " and t1.createdate <='" + whereObject.getString("enddate") + "'";
+                where = where + " and DATE_FORMAT(t1.createdate, '%Y-%m-%d') <='" + whereObject.getString("enddate") + "'";
             }
             if (whereObject.containsKey("billno") && !"".equals(whereObject.getString("billno"))) {
                 where = where + " and t1.billno ='" + whereObject.getString("billno") + "'";

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

@@ -44,10 +44,10 @@ public class dispatch extends Controller {
                 where.append(" and t1.status ='").append(whereObject.getString("status")).append("' ");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and t1.billdate >='").append(whereObject.getString("begindate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t1.billdate <='").append(whereObject.getString("enddate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
         }
         SQLFactory sqlFactory = new SQLFactory(this, "发货单列表查询", pageSize, pageNumber, pageSorting);

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

@@ -60,10 +60,10 @@ public class Order extends Controller {
                 where.append(")");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and t1.billdate >='").append(whereObject.getString("begindate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t1.billdate <='").append(whereObject.getString("enddate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
         }
         boolean isExport = content.getBooleanValue("isExport");

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

@@ -210,13 +210,10 @@ public class dispatch extends Controller {
                 where.append(" and t1.status ='").append(whereObject.getString("status")).append("' ");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and t1.billdate >='").append(whereObject.getString("begindate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t1.billdate <='").append(whereObject.getString("enddate")).append("' ");
-            }
-            if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t1.billdate <='").append(whereObject.getString("enddate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
             if (whereObject.containsKey("remarks") && !"".equals(whereObject.getString("remarks"))) {
                 where.append("and t1.remarks like'%").append(whereObject.getString("remarks")).append("%' ");

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

@@ -54,10 +54,10 @@ public class dispatchItems extends Controller {
                 where.append(" and t1.sonum ='").append(whereObject.getString("sonum")).append("' ");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and t1.checkdate >='").append(whereObject.getString("begindate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t1.checkdate <='").append(whereObject.getString("enddate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
         }
 //		String hrid = content.getString("hrid");
@@ -92,10 +92,10 @@ public class dispatchItems extends Controller {
                 where.append("  and t1.sa_orderid ='").append(whereObject.getString("sa_orderid")).append("' ");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and t3.checkdate >='").append(whereObject.getString("begindate")).append("' ");
+                where.append(" and DATE_FORMAT(t3.checkdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t3.checkdate <='").append(whereObject.getString("enddate")).append("' ");
+                where.append(" and DATE_FORMAT(t3.checkdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
         }
         SQLFactory sqlFactory = new SQLFactory(this, "发货商品列表查询", pageSize, pageNumber, pageSorting);
@@ -301,10 +301,10 @@ public class dispatchItems extends Controller {
                 where.append(")");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and t4.billdate >='").append(whereObject.getString("begindate")).append("' ");
+                where.append(" and DATE_FORMAT(t4.billdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t4.billdate <='").append(whereObject.getString("enddate")).append("' ");
+                where.append(" and tDATE_FORMAT(t4.billdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where.append(" and t4.status ='").append(whereObject.getString("status")).append("' ");

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

@@ -541,22 +541,22 @@ public class Order extends Controller {
                 where.append(")");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and t1.billdate >='").append(whereObject.getString("begindate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t1.billdate <='").append(whereObject.getString("enddate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
             if (whereObject.containsKey("begindate1") && !"".equals(whereObject.getString("begindate1"))) {
-                where.append(" and t1.submitdate >='").append(whereObject.getString("begindate1")).append("' ");
+                where.append(" and DATE_FORMAT(t1.submitdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate1")).append("' ");
             }
             if (whereObject.containsKey("enddate1") && !"".equals(whereObject.getString("enddate1"))) {
-                where.append(" and t1.submitdate <='").append(whereObject.getString("enddate1")).append("' ");
+                where.append(" and DATE_FORMAT(t1.submitdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate1")).append("' ");
             }
             if (whereObject.containsKey("begindate2") && !"".equals(whereObject.getString("begindate2"))) {
-                where.append(" and t1.checkdate >='").append(whereObject.getString("begindate2")).append("' ");
+                where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate2")).append("' ");
             }
             if (whereObject.containsKey("enddate2") && !"".equals(whereObject.getString("enddate2"))) {
-                where.append(" and t1.checkdate <='").append(whereObject.getString("enddate2")).append("' ");
+                where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate2")).append("' ");
             }
             if (whereObject.containsKey("remarks") && !"".equals(whereObject.getString("remarks"))) {
                 where.append("and t1.remarks like'%").append(whereObject.getString("remarks")).append("%' ");
@@ -731,22 +731,22 @@ public class Order extends Controller {
                 where.append(")");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and t1.billdate >='").append(whereObject.getString("begindate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t1.billdate <='").append(whereObject.getString("enddate")).append("' ");
+                where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
             if (whereObject.containsKey("begindate1") && !"".equals(whereObject.getString("begindate1"))) {
-                where.append(" and t1.submitdate >='").append(whereObject.getString("begindate1")).append("' ");
+                where.append(" and DATE_FORMAT(t1.submitdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate1")).append("' ");
             }
             if (whereObject.containsKey("enddate1") && !"".equals(whereObject.getString("enddate1"))) {
-                where.append(" and t1.submitdate <='").append(whereObject.getString("enddate1")).append("' ");
+                where.append(" and DATE_FORMAT(t1.submitdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate1")).append("' ");
             }
             if (whereObject.containsKey("begindate2") && !"".equals(whereObject.getString("begindate2"))) {
-                where.append(" and t1.checkdate >='").append(whereObject.getString("begindate2")).append("' ");
+                where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate2")).append("' ");
             }
             if (whereObject.containsKey("enddate2") && !"".equals(whereObject.getString("enddate2"))) {
-                where.append(" and t1.checkdate <='").append(whereObject.getString("enddate2")).append("' ");
+                where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate2")).append("' ");
             }
             if (whereObject.containsKey("remarks") && !"".equals(whereObject.getString("remarks"))) {
                 where.append("and t1.remarks like'%").append(whereObject.getString("remarks")).append("%' ");

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

@@ -602,10 +602,10 @@ public class OrderItems extends Controller {
                 where.append(")");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and t5.billdate >='").append(whereObject.getString("begindate")).append("' ");
+                where.append(" and DATE_FORMAT(t5.billdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t5.billdate <='").append(whereObject.getString("enddate")).append("' ");
+                where.append(" and DATE_FORMAT(t5.billdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where.append(" and t5.status ='").append(whereObject.getString("status")).append("' ");

src/custom/service/DispatchAutoCloseService.java

@@ -40,7 +40,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(), "", "", "", true);
+            JSONArray ErpSainvoices = erpDocking.queryErpSainvoices(10000, 1, new JSONArray(), "", "", "", false,true);
             JSONArray dispatchids = new JSONArray();
             JSONArray unclosedispatchids = new JSONArray();
             if (!ErpSainvoices.isEmpty()) {

src/custom/utility/ERPDocking.java

@@ -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) throws YosException {
+    public JSONArray queryErpSainvoices(int pagerows, int pagenum,JSONArray finvonums,String fagentnum,String fsonum,String fstatus,boolean onlyNeedClosed,boolean onlyNeedPartialOuts) throws YosException {
         {
 
             JSONObject object= new JSONObject();
@@ -284,6 +284,7 @@ public class ERPDocking {
             objectdetail.put("fsonum",fsonum);
             objectdetail.put("fstatus",fstatus);
             objectdetail.put("onlyNeedClosed",onlyNeedClosed);
+            objectdetail.put("onlyNeedPartialOuts",onlyNeedPartialOuts);
             object.put("content",objectdetail);
 
             HashMap<String, String> map = new HashMap<>();