销售出库单审核自动关闭订单功能及bug修复

src/custom/beans/stockbill/bills/XSCK.java

@@ -118,6 +118,39 @@ public class XSCK extends BasicBill {
                         sqlList.add("update st_stockbill_items set wmsuploadflag2=1 where st_stockbill_itemsid=" + row.getLong("st_stockbill_itemsid"));
                     }
                 }
+                //判断是否关闭订单
+                int orderautoclosepoint = Parameter.getInteger(siteid, "orderautoclosepoint");
+                if(orderautoclosepoint==2){
+                    ArrayList<Long> sa_orderids = itemRows.toArrayList("sa_orderid",new ArrayList<>());
+                    QuerySQL querySQL = SQLFactory.createQuerySQL(controller, "sa_order", "sa_orderid");
+                    querySQL.addJoinTable(BaseClass.JOINTYPE.inner, "sa_orderitems", "t2", "t2.sa_orderid = t1.sa_orderid and t2.siteid = t1.siteid",
+                            "undeliqty","sa_orderitemsid");
+                    querySQL.setTableAlias("t1");
+                    querySQL.setWhere("t1.siteid", siteid);
+                    querySQL.setWhere("t1.sa_orderid", sa_orderids);
+                    querySQL.setWhere("t1.status='审核' and t2.undeliqty!=0");
+                    Rows rows = querySQL.query();
+                    RowsMap rowsMap =rows.toRowsMap("sa_orderid");
+                    RowsMap itemRowsMap=itemRows.toRowsMap("sa_orderid");
+                    for(Long sa_orderid : sa_orderids){
+                        Rows stockbillitemrows = itemRowsMap.getOrDefault(String.valueOf(sa_orderid),new Rows());
+                        Rows orderrows = rowsMap.getOrDefault(String.valueOf(sa_orderid),new Rows());
+                        RowsMap stockbillitemrowsMap =stockbillitemrows.toRowsMap("sa_orderitemsid");
+                        int count=0;
+                        for(Row row : orderrows){
+                            if(stockbillitemrowsMap.containsKey(row.getString("sa_orderitemsid"))){
+                                if(stockbillitemrowsMap.getOrDefault(row.getString("sa_orderitemsid"),new Rows()).sum("qty").compareTo(row.getBigDecimal("undeliqty"))==0){
+                                    count++;
+                                }
+                            }
+                        }
+                        if(orderrows.size()==count){
+                            sqlList.add("update sa_order set status='关闭',closeby='"+controller.username+"',closedate=CURRENT_TIME where sa_orderid=" +sa_orderid);
+                        }
+                    }
+
+                }
+
                 sqlList.addAll(updateAccountbalance_freez(isInStock(ischeck)));
             } else {
                 if (order_paymentnode.equals("3")) {
@@ -166,7 +199,13 @@ public class XSCK extends BasicBill {
                     }
 
                 }
-
+                int orderautoclosepoint = Parameter.getInteger(siteid, "orderautoclosepoint");
+                if(orderautoclosepoint==2){
+                    ArrayList<Long> sa_orderids = itemRows.toArrayList("sa_orderid",new ArrayList<>());
+                    for(Long sa_orderid : sa_orderids){
+                        sqlList.add("update sa_order set status='审核',closeby='',closedate=NULL where sa_orderid=" +sa_orderid);
+                    }
+                }
             }
 
 
@@ -192,6 +231,14 @@ public class XSCK extends BasicBill {
                         sqlList.add("update st_stockbill_items set wmsuploadflag2=0 where st_stockbill_itemsid=" + row.getLong("st_stockbill_itemsid"));
                     }
                 }
+                //判断是否关闭订单
+                int orderautoclosepoint = Parameter.getInteger(siteid, "orderautoclosepoint");
+                if(orderautoclosepoint==2){
+                    ArrayList<Long> sa_orderids = itemRows.toArrayList("sa_orderid",new ArrayList<>());
+                    for(Long sa_orderid : sa_orderids){
+                        sqlList.add("update sa_order set status='审核',closeby='',closedate=NULL where sa_orderid=" +sa_orderid);
+                    }
+                }
                 sqlList.addAll(updateAccountbalance_freez(isInStock(ischeck)));
             } else {
                 if (order_paymentnode.equals("3")) {
@@ -235,6 +282,39 @@ public class XSCK extends BasicBill {
                         sqlList.add("update sa_orderitems set verifiedqty=ifnull(verifiedqty,0)-"+row.getBigDecimal("sumqty")+" where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
                     }
                 }
+                //判断是否关闭订单
+                int orderautoclosepoint = Parameter.getInteger(siteid, "orderautoclosepoint");
+                if(orderautoclosepoint==2){
+                    ArrayList<Long> sa_orderids = itemRows.toArrayList("sa_orderid",new ArrayList<>());
+                    QuerySQL querySQL = SQLFactory.createQuerySQL(controller, "sa_order", "sa_orderid");
+                    querySQL.addJoinTable(BaseClass.JOINTYPE.inner, "sa_orderitems", "t2", "t2.sa_orderid = t1.sa_orderid and t2.siteid = t1.siteid",
+                            "undeliqty","sa_orderitemsid");
+                    querySQL.setTableAlias("t1");
+                    querySQL.setWhere("t1.siteid", siteid);
+                    querySQL.setWhere("t1.sa_orderid", sa_orderids);
+                    querySQL.setWhere("t1.status='审核' and t2.undeliqty!=0");
+                    Rows rows = querySQL.query();
+                    RowsMap rowsMap =rows.toRowsMap("sa_orderid");
+                    RowsMap itemRowsMap=itemRows.toRowsMap("sa_orderid");
+                    for(Long sa_orderid : sa_orderids){
+                        Rows stockbillitemrows = itemRowsMap.getOrDefault(String.valueOf(sa_orderid),new Rows());
+                        Rows orderrows = rowsMap.getOrDefault(String.valueOf(sa_orderid),new Rows());
+                        RowsMap stockbillitemrowsMap =stockbillitemrows.toRowsMap("sa_orderitemsid");
+                        int count=0;
+                        for(Row row : orderrows){
+                            if(stockbillitemrowsMap.containsKey(row.getString("sa_orderitemsid"))){
+                                if(stockbillitemrowsMap.getOrDefault(row.getString("sa_orderitemsid"),new Rows()).sum("qty").compareTo(row.getBigDecimal("undeliqty"))==0){
+                                    count++;
+                                }
+                            }
+                        }
+                        if(orderrows.size()==count){
+                            sqlList.add("update sa_order set status='关闭',closeby='"+controller.username+"',closedate=CURRENT_TIME where sa_orderid=" +sa_orderid);
+                        }
+                    }
+
+                }
+
             }
 
         }

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

@@ -80,6 +80,7 @@ public class Order extends Controller {
         QuerySQL expressformQuery = SQLFactory.createQuerySQL(this, "expressform", "*").setTableAlias("t1");
         expressformQuery.addJoinTable(JOINTYPE.inner, "sa_expressform_stockbill", "t2", "t2.expressformid = t1.expressformid");
         expressformQuery.addJoinTable(JOINTYPE.inner, "st_stockbill_items", "t3", "t3.st_stockbillid = t2.st_stockbillid","sa_orderid");
+        expressformQuery.addJoinTable(JOINTYPE.inner, "st_stockbill", "t4", "t3.st_stockbillid = t4.st_stockbillid","tracknumber");
         expressformQuery.setWhere("t3.sa_orderid", sa_orderids);
         expressformQuery.setOrderBy("t1.createdate desc");
         expressformQuery.setDistinct(true);

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

@@ -144,6 +144,7 @@ public class accessoryorder extends Controller {
         QuerySQL expressformQuery = SQLFactory.createQuerySQL(this, "expressform", "*").setTableAlias("t1");
         expressformQuery.addJoinTable(JOINTYPE.inner, "sa_expressform_stockbill", "t2", "t2.expressformid = t1.expressformid");
         expressformQuery.addJoinTable(JOINTYPE.inner, "st_stockbill_items", "t3", "t3.st_stockbillid = t2.st_stockbillid","sa_orderid");
+        expressformQuery.addJoinTable(JOINTYPE.inner, "st_stockbill", "t4", "t3.st_stockbillid = t4.st_stockbillid","tracknumber");
         expressformQuery.setWhere("t3.sa_orderid", rows.toArrayList("sa_orderid"));
         expressformQuery.setOrderBy("t1.createdate desc");
         expressformQuery.setDistinct(true);

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

@@ -644,6 +644,7 @@ public class Order extends Controller {
         QuerySQL expressformQuery = SQLFactory.createQuerySQL(this, "expressform", "*").setTableAlias("t1");
         expressformQuery.addJoinTable(JOINTYPE.inner, "sa_expressform_stockbill", "t2", "t2.expressformid = t1.expressformid");
         expressformQuery.addJoinTable(JOINTYPE.inner, "st_stockbill_items", "t3", "t3.st_stockbillid = t2.st_stockbillid","sa_orderid");
+        expressformQuery.addJoinTable(JOINTYPE.inner, "st_stockbill", "t4", "t3.st_stockbillid = t4.st_stockbillid","tracknumber");
         expressformQuery.setWhere("t3.sa_orderid", sa_orderids);
         expressformQuery.setOrderBy("t1.createdate desc");
         expressformQuery.setDistinct(true);
@@ -1608,7 +1609,7 @@ public class Order extends Controller {
         }
 
         Row orderRow = rows.get(0);
-        Rows departmenthrrows =dbConnect.runSqlQuery("select *from sys_departmenthrid where hrid="+hrid);
+        Rows departmenthrrows =dbConnect.runSqlQuery("select t1.*,t2.depname from sys_departmenthrid t1 left join sys_department t2 on t1.departmentid=t2.departmentid where t1.hrid="+hrid);
 
         long st_stockbillid = createTableID("st_stockbill");
         InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "st_stockbill");
@@ -1694,7 +1695,28 @@ public class Order extends Controller {
             sqlList.add(insertSQL.getSQL());
         }
         dbConnect.runSqlUpdate(sqlList);
-        dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
+
+        String depname= departmenthrrows.isNotEmpty()?departmenthrrows.get(0).getString("depname"):"";
+        Rows accountbalancerows = dbConnect.runSqlQuery("select * from  sa_accountbalance t1 inner join sa_accountclass t2 on  t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid where t2.accountname='现金账户' and t1.sys_enterpriseid=" + orderRow.getLong("sys_enterpriseid"));
+        if(depname.equals("售后部")){
+            if(accountbalancerows.isNotEmpty()){
+                if(accountbalancerows.get(0).getBigDecimal("discountamount").compareTo(BigDecimal.ZERO)>0){
+                    if(accountbalancerows.get(0).getBigDecimal("discountamount").compareTo(payamount)>0){
+                        dbConnect.runSqlUpdate("update st_stockbill set payamount=0,paydiscountamount="+payamount+" where st_stockbillid="+st_stockbillid);
+                    }else{
+                        dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount.subtract(accountbalancerows.get(0).getBigDecimal("discountamount"))+",paydiscountamount="+accountbalancerows.get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+                    }
+                }else{
+                    dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
+                }
+
+            }else{
+                dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
+            }
+        }else{
+            dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
+        }
+
         content.put("st_stockbillid",st_stockbillid);
         return getSucReturnObject().setData(st_stockbillid).toString();
     }
@@ -1746,7 +1768,7 @@ public class Order extends Controller {
             }
         }
         Row orderRow = rows.get(0);
-        Rows departmenthrrows =dbConnect.runSqlQuery("select *from sys_departmenthrid where hrid="+hrid);
+        Rows departmenthrrows =dbConnect.runSqlQuery("select t1.*,t2.depname from sys_departmenthrid t1 left join sys_department t2 on t1.departmentid=t2.departmentid where t1.hrid="+hrid);
         Rows accountbalancerows = dbConnect.runSqlQuery("select * from  sa_accountbalance t1 inner join sa_accountclass t2 on  t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid where t2.accountname='现金账户' and t1.sys_enterpriseid=" + orderRow.getLong("sys_enterpriseid"));
 
         long st_stockbillid = createTableID("st_stockbill");
@@ -1832,21 +1854,28 @@ public class Order extends Controller {
             sqlList.add(insertSQL.getSQL());
         }
         dbConnect.runSqlUpdate(sqlList);
-        if(accountbalancerows.isNotEmpty()){
-            if(accountbalancerows.get(0).getBigDecimal("discountamount").compareTo(BigDecimal.ZERO)>0){
-                if(accountbalancerows.get(0).getBigDecimal("discountamount").compareTo(payamount)>0){
-                    dbConnect.runSqlUpdate("update st_stockbill set payamount=0,paydiscountamount="+accountbalancerows.get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+
+        String depname= departmenthrrows.isNotEmpty()?departmenthrrows.get(0).getString("depname"):"";
+        if(depname.equals("售后部")){
+            if(accountbalancerows.isNotEmpty()){
+                if(accountbalancerows.get(0).getBigDecimal("discountamount").compareTo(BigDecimal.ZERO)>0){
+                    if(accountbalancerows.get(0).getBigDecimal("discountamount").compareTo(payamount)>0){
+                        dbConnect.runSqlUpdate("update st_stockbill set payamount=0,paydiscountamount="+payamount+" where st_stockbillid="+st_stockbillid);
+                    }else{
+                        dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount.subtract(accountbalancerows.get(0).getBigDecimal("discountamount"))+",paydiscountamount="+accountbalancerows.get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+                    }
                 }else{
-                    dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount.subtract(accountbalancerows.get(0).getBigDecimal("discountamount"))+",paydiscountamount="+accountbalancerows.get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+                    dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
                 }
+
             }else{
                 dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
             }
-
         }else{
             dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
         }
 
+
         content.put("st_stockbillid",st_stockbillid);
         return getSucReturnObject().setData(st_stockbillid).toString();
     }
@@ -2017,7 +2046,7 @@ public class Order extends Controller {
         Rows accountbalancerows =accountbalanceQuerySQL.query();
         RowsMap accountbalancerowsMap = accountbalancerows.toRowsMap("sys_enterpriseid");
 
-        Rows departmenthrrows =dbConnect.runSqlQuery("select *from sys_departmenthrid where hrid="+hrid);
+        Rows departmenthrrows =dbConnect.runSqlQuery("select t1.*,t2.depname from sys_departmenthrid t1 left join sys_department t2 on t1.departmentid=t2.departmentid where t1.hrid="+hrid);
         for(String sys_enterpriseid :enterpriseSet){
             for(String delivery:deliverySet){
                 if(enterpriserowsMap.get(sys_enterpriseid).toRowsMap("delivery").containsKey(delivery)){
@@ -2101,13 +2130,17 @@ public class Order extends Controller {
                         i++;
                         sqlList.add(insertSQL.getSQL());
                     }
-
-                    if(accountbalancerowsMap.containsKey(sys_enterpriseid)){
-                        if(accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount").compareTo(BigDecimal.ZERO)>0){
-                            if(accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount").compareTo(payamount)>0){
-                                sqlList.add("update st_stockbill set payamount=0,paydiscountamount="+accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+                    String depname= departmenthrrows.isNotEmpty()?departmenthrrows.get(0).getString("depname"):"";
+                    if(depname.equals("售后部")){
+                        if(accountbalancerowsMap.containsKey(sys_enterpriseid)){
+                            if(accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount").compareTo(BigDecimal.ZERO)>0){
+                                if(accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount").compareTo(payamount)>0){
+                                    sqlList.add("update st_stockbill set payamount=0,paydiscountamount="+payamount+" where st_stockbillid="+st_stockbillid);
+                                }else{
+                                    sqlList.add("update st_stockbill set payamount="+payamount.subtract(accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount"))+",paydiscountamount="+accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+                                }
                             }else{
-                                sqlList.add("update st_stockbill set payamount="+payamount.subtract(accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount"))+",paydiscountamount="+accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+                                sqlList.add("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
                             }
                         }else{
                             sqlList.add("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
@@ -2115,6 +2148,8 @@ public class Order extends Controller {
                     }else{
                         sqlList.add("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
                     }
+
+
 //                    sqlList.add("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
                     stockbillcount++;
                 }

src/custom/restcontroller/webmanage/sale/stockbill/stockbillitems.java

@@ -376,6 +376,7 @@ public class stockbillitems extends Controller {
 
         Rows rowsdetail = dbConnect.runSqlQuery("select amount,qty from st_stockbill_items where st_stockbillid=" + st_stockbillid);
         Rows stockbillrows= dbConnect.runSqlQuery("select paydiscountamount from st_stockbill where st_stockbillid=" + st_stockbillid);
+
         if(stockbillrows.isNotEmpty()){
             if(stockbillrows.get(0).getBigDecimal("paydiscountamount").compareTo(rowsdetail.sum("amount"))>0){
                 dbConnect.runSqlUpdate("update st_stockbill set paydiscountamount="+rowsdetail.sum("amount")+",payamount=0 where st_stockbillid="+st_stockbillid);

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

@@ -144,7 +144,7 @@ public class warrantycard extends Controller {
         // 加上一年
         LocalDate newDate = date.plusYears(warrantyday);
 
-        dbConnect.runSqlUpdate(DataContrlLog.createLog(this, "sa_warrantycard", sa_warrantycardid, "保修日期修改", "原日期为 ["+rows.get(0).getDate("begdate")+" - "+rows.get(0).getDate("enddate")+"]，修改后日期为 ["+begindate+" - "+(StringUtils.isBlank(enddate) ? newDate.toString() : enddate)+"]。").getSQL());
+        dbConnect.runSqlUpdate(DataContrlLog.createLog(this, "sa_warrantycard", sa_warrantycardid, "保修日期修改", "原日期为 ["+rows.get(0).getString("begdate")+" - "+rows.get(0).getString("enddate")+"]，修改后日期为 ["+begindate+" - "+(StringUtils.isBlank(enddate) ? newDate.toString() : enddate)+"]。").getSQL());
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_warrantycard");
         updateSQL.setUniqueid(sa_warrantycardid);
         updateSQL.setSiteid(siteid);