bug修复

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

@@ -247,7 +247,7 @@ public class aftersalesmag extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid and t1.siteid=t2.siteid","itemid","itemno","itemname","model","spec");
         querySQL.addJoinTable(JOINTYPE.inner, "sa_warrantycard", "t6", "t6.sku=t1.sku and t6.siteid=t1.siteid","cardno","begdate","enddate");
         querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t7", "t6.sa_customersid=t7.sa_customersid and t6.siteid=t7.siteid","name","phonenumber","province","city","county","address");
-
+        pageSorting = " t1.sku desc";
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t6.sa_customersid",sa_customersid);
         querySQL.setWhere(where.toString());

src/custom/restcontroller/webmanage/sale/itemsaleclass/SQL/商品营销类别新增.sql

@@ -1,5 +1,5 @@
 insert into sa_itemsaleclass (siteid, sa_itemsaleclassid, itemid, itemno, itemclassid,classtype)
-select $siteid$, $sa_itemsaleclassid$, $itemid$, $itemno$, $itemclassid$,$classtype$)
+select $siteid$, $sa_itemsaleclassid$, $itemid$, $itemno$, $itemclassid$,$classtype$
 FROM dual
 WHERE not exists(SELECT 1
                  FROM sa_itemsaleclass

src/custom/restcontroller/webmanage/sale/workorder/SQL/服务工单详情查询.sql

@@ -29,7 +29,9 @@ SELECT
     t11.itemno,
     t11.itemname,
     t11.model,
-    t11.spec
+    t11.spec,
+    t12.begdate cardbegdate,
+    t12.enddate cardenddate
 FROM
 	sa_workorder t1
 	left join sa_serviceorder t2 on t1.sa_serviceorderid=t2.sa_serviceorderid and t1.siteid=t2.siteid
@@ -40,5 +42,6 @@ FROM
     left join sa_order t8 on t8.sa_orderid=t2.sa_orderid and t8.siteid=t2.siteid
     left join sa_project t9 on t9.sa_projectid=t8.sa_projectid and t8.siteid=t9.siteid
     left join (SELECT * FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY sa_serviceorderid ORDER BY sa_serviceorderitemsid ASC) AS rowno FROM sa_serviceorderitems) t WHERE rowno = 1) t10 on t10.sa_serviceorderid=t1.sa_serviceorderid and t10.siteid=t1.siteid
+	left join sa_warrantycard t12 on t10.cardno=t12.cardno
     left join plm_item t11 on t11.itemid=t10.itemid and t11.siteid=t10.siteid
 	where t1.siteid=$siteid$  and t1.sa_workorderid=$sa_workorderid$