经销商端促销活动列表增加搜索功能及物流单优化

src/custom/restcontroller/sale/promotion/promotion.java

@@ -132,6 +132,8 @@ public class promotion extends Controller {
                 where.append("t2.itemname like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.itemno like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.model like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t2.standards like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t2.spec like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
         }

src/custom/restcontroller/webmanage/sale/logistics/LSALogisticsHelper.java

@@ -59,6 +59,8 @@ public class LSALogisticsHelper extends BaseClass {
         insertSQL.setValue("county", controller.content.getStringValue("county"));
         insertSQL.setValue("address", controller.content.getStringValue("address"));
         insertSQL.setValue("remarks", controller.content.getStringValue("remarks"));
+        insertSQL.setValue("logisticsamount", controller.content.getStringValue("logisticsamount"));
+        insertSQL.setValue("packageqty", controller.content.getStringValue("packageqty"));
         return insertSQL;
     }
 
@@ -83,6 +85,8 @@ public class LSALogisticsHelper extends BaseClass {
         updateSQL.setWhere("sa_logisticsid", sa_logisticsid);
         updateSQL.setValue("sys_enterpriseid", controller.content.getLongValue("sys_enterpriseid"));
         updateSQL.setWhere("siteid", controller.siteid);
+        updateSQL.setValue("logisticsamount", controller.content.getStringValue("logisticsamount"));
+        updateSQL.setValue("packageqty", controller.content.getStringValue("packageqty"));
         return updateSQL;
     }