客诉列表修改

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -404,4 +404,10 @@ public interface SalesOrderService {
      * @return
      */
     OrderWarehouse selectAdminWarehouse(Integer adminId);
+
+    /**
+     * 获取所有仓库信息
+     * @return
+     */
+    List<OrderWarehouse> listOrderWarehouse();
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -1090,4 +1090,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public OrderWarehouse selectAdminWarehouse(Integer adminId) {
         return salesOrderMapper.selectAdminWarehouse(adminId);
     }
+
+    @Override
+    public List<OrderWarehouse> listOrderWarehouse() {
+        return salesOrderMapper.listOrderWarehouse();
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SalesOrderMapper.java

@@ -337,4 +337,10 @@ public interface SalesOrderMapper {
      * @return
      */
     OrderWarehouse selectAdminWarehouse(Integer adminId);
+
+    /**
+     * 获取所有仓库信息
+     * @return
+     */
+    List<OrderWarehouse> listOrderWarehouse();
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -1407,6 +1407,9 @@
             <if test="colorId !=null and colorId !=''">
                 AND oi.item_color_id = #{colorId}
             </if>
+            <if test="salesWarehouseId !=null and salesWarehouseId !=''">
+                AND sales_warehouse_id = #{salesWarehouseId}
+            </if>
             <if test="orderDateType == null or orderDateType == 1">
                 <if test="startDate != null and startDate != ''">
                     AND sales_create_time <![CDATA[>=]]> #{startDate}
@@ -1572,4 +1575,8 @@
         tb_rst_order_warehouse  ow on owa.warehouse_id = ow.warehouse_id
         WHERE owa.admin_id = #{adminId}
     </select>
+
+    <select id="listOrderWarehouse" resultType="OrderWarehouse" >
+      SELECT * from tb_rst_order_warehouse
+    </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -785,7 +785,7 @@ public class AwaitSendController {
                                       @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                       @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
         ModelAndView mv = new ModelAndView("order/statistics/order_statistics");
-
+        salesOrder.setIsCustmerAddOrder(2);
         //分页获取订单信息
         PagedResult<SalesOrder> pagedResult = salesOrderService.salesOrderListAndItemPage(pageNO, pageSize, salesOrder,totalNum == 0);
         if (totalNum != 0) {
@@ -794,11 +794,13 @@ public class AwaitSendController {
         List<StoreInfo> listStoreInfo = storeInfoService.listStore(new StoreInfo());
         List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
         List<ProductColor> productColorList = productService.listproductAndColor(new ProductColor());
+        List<OrderWarehouse> listOrderWarehouse = salesOrderService.listOrderWarehouse();
         StitchAttrUtil.getSa()
                 .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")
                 .addNoPro("salesOrderItemList")
                 .setModelAndView(salesOrder, mv, "/admin/await_send/order_statistics", pagedResult);
 
+        mv.addObject("listOrderWarehouse",listOrderWarehouse);
         mv.addObject("listStoreInfo",listStoreInfo);
         mv.addObject("logisticsInfoList",logisticsInfoList);
         mv.addObject("productColorList",productColorList);
@@ -836,7 +838,7 @@ public class AwaitSendController {
     @RequestMapping("/download_order_statistics")
     @RequiresPermissions("salesOrder:order_statistics:deliver")
     public ModelAndView downloadOrderExcel(HttpServletRequest request,SalesOrder so) throws Exception {
-
+        so.setIsCustmerAddOrder(2);
         List<SalesOrder> temporarySalesOrderList = postOrderNumService.listSalesOrderAndItem(so);
 
         if(temporarySalesOrderList.size() > 20000){

watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/order_statistics.ftl

@@ -88,6 +88,14 @@
                     <option value="3" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 3 >selected="selected"</#if></#if>>出库时间</option>
                     <option value="4" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 4 >selected="selected"</#if></#if>>通知配货时间</option>
                 </select>
+                <select class="select" name="salesWarehouseId" id="salesWarehouseId"  style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                    <option value="">选择仓库</option>
+                <#if listOrderWarehouse?? &&  (listOrderWarehouse?size > 0) >
+                    <#list listOrderWarehouse as warehouse>
+                        <option value="${warehouse.warehouseId!''}" <#if salesOrder.salesWarehouseId??><#if salesOrder.salesWarehouseId == warehouse.warehouseId >selected="selected"</#if></#if>>${warehouse.warehouseName!''}</option>
+                    </#list>
+                </#if>
+                </select>
 
             </div>
         <#--Efast add end-->