Browse Source

订单明细列表查询添加根据typemx查询

hu 2 years ago
parent
commit
29ef0a11b5

+ 1 - 0
src/custom/restcontroller/saletool/notice/notice.java

@@ -40,6 +40,7 @@ public class notice extends Controller {
             if (whereObject.containsKey("sat_notice_classid") && !"".equals(whereObject.getString("sat_notice_classid"))) {
                 where = where + " and t1.sat_notice_classid = " + whereObject.getString("sat_notice_classid");
             }
+
         }
         SQLFactory sqlFactory = new SQLFactory(this, "通告列表查询", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter_SQL("where", where);

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

@@ -621,6 +621,10 @@ public class OrderItems extends Controller {
             if (whereObject.containsKey("isfreeze") && !"".equals(whereObject.getString("isfreeze"))) {
                 where.append(" and t1.isfreeze ='").append(whereObject.getString("isfreeze")).append("' ");
             }
+            if (whereObject.containsKey("typemx") && !"".equals(whereObject.getString("typemx"))) {
+                where.append(" and t5.typemx ='").append(whereObject.getString("typemx")).append("' ");
+            }
+
             if (whereObject.containsKey("isuncheckout") && !"".equals(whereObject.getString("isuncheckout"))) {
                 String isuncheckout = whereObject.getStringValue("isuncheckout");
                 if (isuncheckout.equals("1")) {

+ 1 - 0
src/custom/restcontroller/webmanage/sale/order/SQL/订单商品明细_所有列表.sql

@@ -3,6 +3,7 @@ SELECT t1.sa_orderitemsid,
        t1.rowno,
        t5.sonum,
        t5.type,
+       t5.typemx,
        t5.status,
        t5.billdate,
        t5.submitdate,