出库单bug修复

src/custom/restcontroller/webmanage/lsak3/stockbill/SQL/数据操作日志新增.sql

@@ -0,0 +1,2 @@
+insert into sys_contrllog (siteid, sys_contrllogid,ownertable,action, remarks,actionuserid,actionby)
+values ($siteid$, $sys_contrllogid$,$ownertable$, $action$, $remarks$,$actionuserid$, $actionby$);

src/custom/restcontroller/webmanage/lsak3/stockbill/stockbill.java

@@ -285,10 +285,12 @@ public class stockbill extends Controller {
 
         //查询可关闭的发货单
         Rows dispatchrows =dbConnect.runSqlQuery( "select t.sa_dispatchid from (select t2.sa_dispatchid,sum(t2.qty) sumqty,sum(outwarehouseqty) sumoutwarehouseqty from st_stockbill_items t1 inner join  sa_dispatch_items t2 on t1.sa_dispatch_itemsid=t2.sa_dispatch_itemsid and t1.siteid=t2.siteid where t1.st_stockbillid = "+stockbillrows.get(0).getLong("st_stockbillid")+" and t1.siteid='lsa1986' group by t2.sa_dispatchid) t where t.sumqty=t.sumoutwarehouseqty");
+        Rows undispatchrows =dbConnect.runSqlQuery( "select t.sa_dispatchid from (select t2.sa_dispatchid,sum(t2.qty) sumqty,sum(outwarehouseqty) sumoutwarehouseqty from st_stockbill_items t1 inner join  sa_dispatch_items t2 on t1.sa_dispatch_itemsid=t2.sa_dispatch_itemsid and t1.siteid=t2.siteid where t1.st_stockbillid = "+stockbillrows.get(0).getLong("st_stockbillid")+" and t1.siteid='lsa1986' group by t2.sa_dispatchid) t where t.sumqty!=t.sumoutwarehouseqty");
         ArrayList<String>  sqldispatch =new ArrayList<>();
         for (Row row:dispatchrows) {
             sqldispatch.add("update sa_dispatch set status='关闭',closedate=current_time,closeby='admin' where sa_dispatchid='" + row.getLong("sa_dispatchid") + "' and siteid='lsa1986'");
-            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", row.getLong("sa_dispatchid"));
             sqlFactory.addParameter("action", "自动关闭");
@@ -298,6 +300,11 @@ public class stockbill extends Controller {
             sqlFactory.addParameter("siteid", "lsa1986");
             sqldispatch.add(sqlFactory.getSQL());
         }
+        for (Row row:undispatchrows) {
+            sqldispatch.add("update sa_dispatch set status='复核',closedate=null,closeby='' where sa_dispatchid='" + row.getLong("sa_dispatchid") + "' and siteid='lsa1986'");
+            sqldispatch.add("delete from sys_contrllog where ownertable='sa_dispatch' and action='自动关闭' and ownerid='" + row.getLong("sa_dispatchid") + "' and siteid='lsa1986'");
+        }
+
         dbConnect.runSqlUpdate(sqldispatch);
 
 
@@ -314,21 +321,25 @@ public class stockbill extends Controller {
             if(orderinstockRowsMap.containsKey(row.getString("sa_orderid"))){
                 if(orderinstockRowsMap.get(row.getString("sa_orderid")).get(0).getBigDecimal("sumoutwarehouseqty").compareTo(row.getBigDecimal("sumqty"))==0){
                     sqlorder.add("update sa_order set status='关闭',closedate=current_time,closeby='admin' where sa_orderid='" + row.getLong("sa_orderid") + "' and siteid='lsa1986'");
+                    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("action", "自动关闭");
+                    sqlFactory.addParameter("remarks", "订单自动关闭成功");
+                    sqlFactory.addParameter("actionuserid", "1");
+                    sqlFactory.addParameter("actionby", "admin");
+                    sqlFactory.addParameter("siteid", "lsa1986");
+                    sqlorder.add(sqlFactory.getSQL());
                 }else {
                     sqlorder.add("update sa_order set status='审核',closedate=null,closeby='' where sa_orderid='" + row.getLong("sa_orderid") + "' and siteid='lsa1986'");
+                    sqlorder.add("delete from sys_contrllog  where ownertable='sa_order' and action='自动关闭'  and  ownerid='" + row.getLong("sa_orderid") + "' and siteid='lsa1986'");
                 }
             }else {
                 sqlorder.add("update sa_order set status='审核',closedate=null,closeby='' where sa_orderid='" + row.getLong("sa_orderid") + "' and siteid='lsa1986'");
+                sqlorder.add("delete from sys_contrllog  where ownertable='sa_order' and action='自动关闭'  and  ownerid='" + row.getLong("sa_orderid") + "' and siteid='lsa1986'");
             }
-            SQLFactory sqlFactory = new SQLFactory(new DataContrlLog(), "数据操作日志新增");
-            sqlFactory.addParameter("ownertable", "sa_order");
-            sqlFactory.addParameter("ownerid", row.getLong("sa_orderid"));
-            sqlFactory.addParameter("action", "自动关闭");
-            sqlFactory.addParameter("remarks", "订单自动关闭成功");
-            sqlFactory.addParameter("actionuserid", "1");
-            sqlFactory.addParameter("actionby", "admin");
-            sqlFactory.addParameter("siteid", "lsa1986");
-            sqlorder.add(sqlFactory.getSQL());
+
         }
         dbConnect.runSqlUpdate(sqlorder);