物流单接口

src/custom/restcontroller/webmanage/sale/logistics/LSALogistics.java

@@ -260,6 +260,7 @@ public class LSALogistics extends Controller {
         querySQL.setWhere("t1.siteid='" + siteid + "'");
         if (sys_enterpriseid > 0) {
             querySQL.setWhere("t1.sys_enterpriseid='" + sys_enterpriseid + "'");
+            querySQL.setWhere("t1.status='审核'");
         }
         querySQL.setWhere(where.toString());
         Rows rows = querySQL.query();

src/custom/restcontroller/webmanage/sale/logistics/Logistics.java

@@ -156,8 +156,8 @@ public class Logistics extends Controller {
         JSONArray sa_logisticsids = content.getJSONArray("sa_logisticsids");
         BatchDeleteErr batchDeleteErr = BatchDeleteErr.create(this, sa_logisticsids.size());
         ArrayList<String> sqlList = new ArrayList<>();
-        String str = sa_logisticsids.toString().replace("[", "(").replace("]", ")");
-        RowsMap boxmxidRowsMap = dbConnect.runSqlQuery("select sa_logisticsid,sa_logistics_boxid from sa_logistics_box where siteid='" + siteid + "' and sa_logisticsid in " + str).toRowsMap("sa_logisticsid");
+//        String str = sa_logisticsids.toString().replace("[", "(").replace("]", ")");
+//        RowsMap boxmxidRowsMap = dbConnect.runSqlQuery("select sa_logisticsid,sa_logistics_boxid from sa_logistics_box where siteid='" + siteid + "' and sa_logisticsid in " + str).toRowsMap("sa_logisticsid");
         for (Object o : sa_logisticsids) {
             Rows rows = dbConnect.runSqlQuery("select billno,status from sa_logistics where siteid = '" + siteid + "' and sa_logisticsid = " + o);
             if (rows.isEmpty()) {
@@ -172,13 +172,13 @@ public class Logistics extends Controller {
             sqlList.add(sql);
             sql = "delete from sa_logistics_items where siteid = '" + siteid + "' and sa_logisticsid = " + o;
             sqlList.add(sql);
-            sql = "delete from sa_logistics_box where siteid='" + siteid + "' and sa_logisticsid= " + o;
-            sqlList.add(sql);
-            if (boxmxidRowsMap.containsKey(o.toString())) {
-                str = Arrays.toString(boxmxidRowsMap.get(o.toString()).toArray("sa_logistics_boxid")).replace("[", "(").replace("]", ")");
-                sql = "delete from sa_logistics_boxmx where siteid='" + siteid + "' and sa_logistics_boxid in " + str;
-                sqlList.add(sql);
-            }
+//            sql = "delete from sa_logistics_box where siteid='" + siteid + "' and sa_logisticsid= " + o;
+//            sqlList.add(sql);
+//            if (boxmxidRowsMap.containsKey(o.toString())) {
+//                str = Arrays.toString(boxmxidRowsMap.get(o.toString()).toArray("sa_logistics_boxid")).replace("[", "(").replace("]", ")");
+//                sql = "delete from sa_logistics_boxmx where siteid='" + siteid + "' and sa_logistics_boxid in " + str;
+//                sqlList.add(sql);
+//            }
             sql = DataContrlLog.createLog(this, "sa_logistics", Long.parseLong(o.toString()), "删除", "物流单删除:" + Long.parseLong(o.toString())).getSQL();
             sqlList.add(sql);
         }