Преглед изворни кода

行关闭增加是否关闭的判断

hu пре 4 месеци
родитељ
комит
522cf63db1

+ 6 - 0
src/custom/restcontroller/webmanage/sale/accessoryorder/accessoryorder.java

@@ -644,6 +644,9 @@ public class accessoryorder extends Controller {
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t2.status not in('新建','提交') and t2.type='配件订单' ");
         querySQL.setWhere("t1.cardno",cardno);
+        if(StringUtils.isBlank(cardno)){
+            querySQL.setWhere("1=2");
+        }
         querySQL.setWhere("t1.itemid",itemid);
         Rows rows = querySQL.query();
 
@@ -683,6 +686,9 @@ public class accessoryorder extends Controller {
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t2.status not in('新建','提交') and t2.type='配件订单' ");
         querySQL.setWhere("t1.cardno",cardno);
+        if(StringUtils.isBlank(cardno)){
+            querySQL.setWhere("1=2");
+        }
         querySQL.setWhere("t1.itemid",itemid);
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();

+ 1 - 1
src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -1501,7 +1501,7 @@ public class OrderItems extends Controller {
                 dbConnect.runSqlUpdate("update sa_order set status='关闭',closeby='"+username+"',closedate=CURRENT_TIME where sa_orderid=" +sa_orderid);
             }
         }else{
-            dbConnect.runSqlUpdate("update sa_order set status='审核',closeby='',closedate='NULL' where sa_orderid=" +sa_orderid);
+            dbConnect.runSqlUpdate("update sa_order set status='审核',closeby='',closedate=null where sa_orderid=" +sa_orderid);
         }