去缓存

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

@@ -245,6 +245,7 @@ public class accessoryorder extends Controller {
     }
 
     @API(title = "配件列表查询", apiversion = R.ID2025080510311403.v1.class)
+    @CACHEING
     public String queryAccessoryList() throws YosException {
 
         StringBuffer where = new StringBuffer(" 1=1 ");
@@ -319,6 +320,11 @@ public class accessoryorder extends Controller {
                 where.append("or t1.cardno like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("cardno") && !"".equals(whereObject.getString("cardno"))) {
+                where.append(" and(");
+                where.append("t1.cardno ='").append(whereObject.getString("condition")).append("' ");
+                where.append(")");
+            }
         }
         QuerySQL querySQL=SQLFactory.createQuerySQL(this,"sa_warrantycard","*");
         querySQL.addJoinTable(JOINTYPE.inner,"sa_agents","t2","t1.sa_agentsid = t2.sa_agentsid AND t1.siteid = t2.siteid");

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

@@ -28,6 +28,7 @@ import restcontroller.R;
 import restcontroller.sale.cashbill.cashbill;
 import restcontroller.sale.promotion.promotion;
 import restcontroller.webmanage.executorService.Executor;
+import restcontroller.webmanage.sale.accessoryorder.accessoryorder;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -51,7 +52,7 @@ public class Order extends Controller {
     }
 
     @API(title = "新增或更新", apiversion = R.ID20221108111402.v1.class, intervaltime = 200)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String insertOrUpdate() throws YosException {
 
         ArrayList<String> sqlList = new ArrayList<>();
@@ -263,7 +264,7 @@ public class Order extends Controller {
     }
 
     @API(title = "购物车转化订单", apiversion = R.ID20221128183202.v1.class, intervaltime = 2000)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String ship() throws YosException {
         ArrayList<String> sqlList1 = new ArrayList<>();
         Long istool = content.getLongValue("istool");
@@ -1501,7 +1502,7 @@ public class Order extends Controller {
     }
 
     @API(title = "删除", apiversion = R.ID20221108152102.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String delete() throws YosException {
         JSONArray sa_orderids = content.getJSONArray("sa_orderids");
 
@@ -1668,7 +1669,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, cashbill.class, promotion.class, restcontroller.webmanage.sale.promotion.promotion.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class, promotion.class, restcontroller.webmanage.sale.promotion.promotion.class, accessoryorder.class})
     public String submit() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
 
@@ -2167,7 +2168,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, cashbill.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class, accessoryorder.class})
     public String check() throws YosException {
         boolean isdebug = content.getBooleanValue("isdebug");
         Long sa_orderid = content.getLong("sa_orderid");
@@ -2304,7 +2305,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, cashbill.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class, accessoryorder.class})
     public String uncheck() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Rows rows = getOrderRows(this, sa_orderid);
@@ -2365,7 +2366,7 @@ public class Order extends Controller {
     }
 
     @API(title = "预提交反预提交", apiversion = R.ID20230331152503.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String presubmit() throws YosException {
         boolean isrecheck = content.getBooleanValue("isrecheck");
         Long sa_orderid = content.getLong("sa_orderid");
@@ -2434,7 +2435,7 @@ public class Order extends Controller {
     }
 
     @API(title = "确认反确认", apiversion = R.ID20230331102503.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String recheck() throws YosException {
         boolean isrecheck = content.getBooleanValue("isrecheck");
         Long sa_orderid = content.getLong("sa_orderid");
@@ -2499,7 +2500,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, cashbill.class, promotion.class, restcontroller.webmanage.sale.promotion.promotion.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class, promotion.class, restcontroller.webmanage.sale.promotion.promotion.class, accessoryorder.class})
     public String back() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Rows rows = getOrderRows(this, sa_orderid);
@@ -2634,7 +2635,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, cashbill.class, promotion.class, restcontroller.webmanage.sale.promotion.promotion.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, cashbill.class, promotion.class, restcontroller.webmanage.sale.promotion.promotion.class, accessoryorder.class})
     public String revoke() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Rows rows = getOrderRows(this, sa_orderid);
@@ -2720,7 +2721,7 @@ public class Order extends Controller {
     }
 
     @API(title = "交期待确认", apiversion = R.ID20230102143502.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String confirmDelivery() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
 
@@ -2781,7 +2782,7 @@ public class Order extends Controller {
     }
 
     @API(title = "确认交期，操作交期待确认的订单", apiversion = R.ID20221230094802.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String confirmDeliveryDate() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Rows rows = getOrderRows(this, sa_orderid);
@@ -2818,7 +2819,7 @@ public class Order extends Controller {
     }
 
     @API(title = "交期撤回", apiversion = R.ID20230227160002.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String revokeDelivery() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Rows rows = getOrderRows(this, sa_orderid);
@@ -3017,7 +3018,7 @@ public class Order extends Controller {
 
 
     @API(title = "关闭", apiversion = R.ID20221108164502.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String close() throws YosException {
         long sa_orderid = content.getLong("sa_orderid");
         String str = closeordervalidate(sa_orderid);
@@ -3274,7 +3275,7 @@ public class Order extends Controller {
     }
 
     @API(title = "一键复制订单", apiversion = R.ID20230102144502.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String copyOrder() throws YosException {
 
         Long sa_orderid = content.getLong("sa_orderid");
@@ -3566,7 +3567,7 @@ public class Order extends Controller {
     }
 
     @API(title = "一键填写交货日期", apiversion = R.ID20230104143102.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String updateDelivery() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         //通过版本更新订单表头数据
@@ -3579,7 +3580,7 @@ public class Order extends Controller {
     }
 
     @API(title = "一键填写需求日期", apiversion = R.ID20230104143802.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String updateNeeddate() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
 
@@ -3642,7 +3643,7 @@ public class Order extends Controller {
     }
 
     @API(title = "修改业务员", apiversion = R.ID20230213154802.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, accessoryorder.class})
     public String changeSaler() throws YosException {
 
         Long saler_hrid = content.getLong("saler_hrid");

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

@@ -20,6 +20,7 @@ import common.annotation.CACHEING_CLEAN;
 import common.data.*;
 import org.apache.commons.lang.StringUtils;
 import restcontroller.R;
+import restcontroller.webmanage.sale.accessoryorder.accessoryorder;
 import restcontroller.webmanage.sale.aftersalesmag.twriteoffbill_orderchange;
 import restcontroller.webmanage.sale.rebate.Rebate;
 import restcontroller.webmanage.sale.toolbill.ToolBill;
@@ -50,7 +51,7 @@ public class OrderItems extends Controller {
     }
 
     @API(title = "新增或更新", apiversion = R.ID20221109093602.v1.class, intervaltime = 200)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class, accessoryorder.class})
     public String insertOrUpdate() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Long sys_enterpriseid = content.getLong("sys_enterpriseid");
@@ -432,7 +433,7 @@ public class OrderItems extends Controller {
     }
 
     @API(title = "删除", apiversion = R.ID20221109093702.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class, accessoryorder.class})
     public String delete() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Rows orderRows = getOrderRows(this, sa_orderid);
@@ -454,7 +455,7 @@ public class OrderItems extends Controller {
         Rows packagetypemxrows = dbConnect.runSqlQuery(packagetypemxsql);
         sa_orderitemsids.addAll(packagetypemxrows.toJsonArray("sa_orderitemsid"));
 
-        String sqldetail ="select t1.sa_workorderid,t1.itemid from sa_orderitems where siteid='"+siteid+"' and sa_orderitemsid in"+sa_orderitemsids.toJSONString();
+        String sqldetail ="select sa_workorderid,itemid from sa_orderitems where siteid='"+siteid+"' and sa_orderitemsid in"+sa_orderitemsids.toJSONString();
         sqldetail = sqldetail.replace("[", "(").replace("]", ")");
         Rows rowsdetail = dbConnect.runSqlQuery(sqldetail);
         for(Row row : rowsdetail ){
@@ -508,7 +509,7 @@ public class OrderItems extends Controller {
     }
 
     @API(title = "商品行冻结", apiversion = R.ID20230508093003.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class, accessoryorder.class})
     public String freeze() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         //通过版本更新订单表头数据
@@ -545,7 +546,7 @@ public class OrderItems extends Controller {
     }
 
     @API(title = "商品行折扣变更", apiversion = R.ID20230508101703.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class, accessoryorder.class})
     public String updateOrderItemsDiscountrate() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         BigDecimal discountrate = content.getBigDecimal("discountrate");
@@ -590,7 +591,7 @@ public class OrderItems extends Controller {
     }
 
     @API(title = "商品行价格刷新（变为原价）", apiversion = R.ID20230518151803.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class})
+    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class, accessoryorder.class})
     public String updateOrderItemsPrice() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         JSONArray itemids = content.getJSONArray("itemids");