库存查询完善及订单反提交缓存清除

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

@@ -131,7 +131,6 @@ public class invbal extends Controller {
 		sqlFactory.addParameter("siteid", siteid);
 		sqlFactory.addParameter_SQL("where", where);
 		Rows rows = dbConnect.runSqlQuery(sqlFactory);
-		 System.out.println(rows.size());
 		Rows rowsitemclass = dbConnect.runSqlQuery(" select  t7.itemclassname,t6.itemid,t8.brandname from sa_itemsaleclass t6 LEFT JOIN plm_itemclass t7 ON t7.itemclassid = t6.itemclassid AND t7.siteid = t6.siteid LEFT JOIN sa_brand t8 ON t8.sa_brandid = t7.sa_brandid AND t8.siteid = t7.siteid where t6.siteid='" + siteid + "'");
 		RowsMap itemclassRowsMap = rowsitemclass.toRowsMap("itemid");
 
@@ -145,7 +144,11 @@ public class invbal extends Controller {
 
 
 		ERPDocking erpDocking =new ERPDocking();
-		JSONArray jsonArray = erpDocking.getErpIcinvbalRows(200000, 1,rows.toJsonArray("itemno"));
+		JSONArray jsonArray =new JSONArray();
+		if(rows.toJsonArray("itemno").size()!=0){
+			jsonArray=erpDocking.getErpIcinvbalRows(200000, 1,rows.toJsonArray("itemno"));
+		}
+
 		if(!jsonArray.isEmpty()){
 			for (Object object:jsonArray) {
 				JSONObject jsonObject =(JSONObject)object;

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

@@ -25,6 +25,7 @@ import common.data.SQLFactory;
 import common.data.db.DBConnect;
 import org.apache.commons.lang.StringUtils;
 import restcontroller.R;
+import restcontroller.sale.cashbill.cashbill;
 import restcontroller.webmanage.executorService.Executor;
 
 import java.io.IOException;
@@ -892,7 +893,7 @@ public class Order extends Controller {
 
 
     @API(title = "提交", apiversion = R.ID20221108153402.v1.class, intervaltime = 5000)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class})
     public String submit() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
 
@@ -1087,7 +1088,7 @@ public class Order extends Controller {
 
 
     @API(title = "审核", apiversion = R.ID20221108153502.v1.class, intervaltime = 5000)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class})
     public String check() throws YosException {
         boolean isdebug = content.getBooleanValue("isdebug");
         Long sa_orderid = content.getLong("sa_orderid");
@@ -1186,7 +1187,7 @@ public class Order extends Controller {
     }
 
     @API(title = "反审核", apiversion = R.ID20230102141502.v1.class, intervaltime = 5000)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class})
     public String uncheck() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Rows rows = getOrderRows(this, sa_orderid);
@@ -1342,7 +1343,7 @@ public class Order extends Controller {
     }
 
     @API(title = "退回", apiversion = R.ID20221108161902.v1.class, intervaltime = 5000)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class})
     public String back() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Rows rows = getOrderRows(this, sa_orderid);
@@ -1391,7 +1392,7 @@ public class Order extends Controller {
     }
 
     @API(title = "撤回", apiversion = R.ID20230301190202.v1.class, intervaltime = 5000)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class})
     public String revoke() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Rows rows = getOrderRows(this, sa_orderid);