出库

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

@@ -207,6 +207,13 @@ public interface SalesOrderService {
      * @param salesOrder
      * @return
      */
+    Integer listSalesOrderAndItemNum(SalesOrder salesOrder);
+
+    /**
+     * 按照批次查询订单项，并下载，订单列表主要按照订单项来排列
+     * @param salesOrder
+     * @return
+     */
     List<SalesOrder> listSalesOrderAndItem(SalesOrder salesOrder);
 
     /**
@@ -260,10 +267,10 @@ public interface SalesOrderService {
 
     /**
      * 出库
-     * @param postNum
+     * @param salesOrder
      * @return
      */
-    Integer updateDeliver(String postNum);
+    Integer updateDeliver(SalesOrder salesOrder);
 
 
 }

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

@@ -778,6 +778,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
+    public Integer listSalesOrderAndItemNum(SalesOrder salesOrder) {
+        return salesOrderMapper.listSalesOrderAndItemNum(salesOrder);
+    }
+
+    @Override
     public List<SalesOrder> listSalesOrderAndItem(SalesOrder salesOrder) {
         return salesOrderMapper.listSalesOrderAndItem(salesOrder);
     }
@@ -871,8 +876,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
-    public Integer updateDeliver(String postNum) {
-        return salesOrderMapper.updateDeliver(postNum);
+    public Integer updateDeliver(SalesOrder salesOrder) {
+        return salesOrderMapper.updateDeliver(salesOrder);
     }
 
 

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

@@ -153,6 +153,13 @@ public interface SalesOrderMapper {
      * @param salesOrder
      * @return
      */
+    Integer listSalesOrderAndItemNum(SalesOrder salesOrder);
+
+    /**
+     * 按照批次查询订单项，并下载，订单列表主要按照订单项来排列
+     * @param salesOrder
+     * @return
+     */
     List<SalesOrder> listSalesOrderAndItem(SalesOrder salesOrder);
 
     /**
@@ -215,6 +222,6 @@ public interface SalesOrderMapper {
      * @param salesOrder
      * @return
      */
-    Integer updateDeliver(String salesOrder);
+    Integer updateDeliver(SalesOrder salesOrder);
 
 }

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

@@ -38,7 +38,7 @@
         sales_address_name,sales_amount,sales_pay_money,sales_pay_type,sales_wait_money,sales_last_money,sales_shipping_fee,sales_pay_time,
         sales_create_time,sales_admin_remark,sales_user_remark,sales_pay_number,sales_store_id,sales_company_id,sales_type,sales_deal_code,sales_order_status,
         sales_status,sales_shipping_status,sales_pay_status,sales_process_status,sales_is_send,sales_is_locked,sales_is_separate,sales_is_download,sales_main_order_id,
-        sales_batch_id,sales_add_type,sales_admin_id
+        sales_batch_id,sales_add_type,sales_admin_id,sales_deliver
   </sql>
 
   <!-- 根据id查询订单信息 -->
@@ -85,6 +85,9 @@
       <if test="salesOrderStatus !=null">
         AND sales_order_status = #{salesOrderStatus}
       </if>
+      <if test="salesDeliver !=null">
+        AND sales_deliver = #{salesDeliver}
+      </if>
       <if test="salesStoreId !=null and salesStoreId !=''">
         AND sales_store_id = #{salesStoreId}
       </if>
@@ -160,6 +163,9 @@
             salesShippingStatus !=null">
                     AND sales_shipping_status = #{salesShippingStatus}
                 </if>
+                <if test="salesDeliver !=null">
+                    AND sales_deliver = #{salesDeliver}
+                </if>
                 <if test="salesStatus !=null">
                     AND sales_status = #{salesStatus}
                 </if>
@@ -269,6 +275,9 @@
       <if test="salesShippingStatus !=null ">
         AND sales_shipping_status = #{salesShippingStatus}
       </if>
+        <if test="salesDeliver !=null">
+            AND sales_deliver = #{salesDeliver}
+        </if>
       <if test="salesStoreId !=null">
         AND sales_store_id = #{salesStoreId}
       </if>
@@ -324,6 +333,9 @@
         <if test="salesShippingStatus !=null">
           AND sales_shipping_status = #{salesShippingStatus}
         </if>
+          <if test="salesDeliver !=null">
+              AND sales_deliver = #{salesDeliver}
+          </if>
         <if test="salesStoreId !=null and salesStoreId !=''">
           AND sales_store_id = #{salesStoreId}
         </if>
@@ -832,16 +844,105 @@
       WHERE t.sales_batch_id = #{salesBatchId}
   </select>
 
+
+    <!-- 按照批次查询订单项，并下载，订单列表主要按照订单项来排列 -->
+    <select id="listSalesOrderAndItemNum" parameterType="SalesOrder" resultType="Integer">
+        SELECT
+          COUNT(soi.item_id)
+        FROM
+        tb_rst_sales_order_info t
+        LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
+        LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
+        <where>
+            <if test="salesIsDownload !=null ">
+                AND t.sales_is_download = #{salesIsDownload}
+            </if>
+            <if test="salesStatus !=null ">
+                AND t.sales_status = #{salesStatus}
+            </if>
+            <if test="salesShippingStatus !=null">
+                AND t.sales_shipping_status = #{salesShippingStatus}
+            </if>
+            <if test="salesDeliver !=null">
+                AND sales_deliver = #{salesDeliver}
+            </if>
+            <if test="salesStoreId !=null and salesStoreId !=''">
+                AND t.sales_store_id = #{salesStoreId}
+            </if>
+            <if test="salesId !=null">
+                AND t.sales_id = #{salesId}
+            </if>
+            <if test="salesOrderId !=null and salesOrderId !=''">
+                AND t.sales_orderId = #{salesOrderId}
+            </if>
+            <if test="salesDealCode !=null and salesDealCode !=''">
+                AND t.sales_deal_code = #{salesDealCode}
+            </if>
+            <if test="salesAddressTel !=null and salesAddressTel !=''">
+                AND t.sales_address_tel = #{salesAddressTel}
+            </if>
+            <if test="salesAddressName !=null and salesAddressName !=''">
+                AND t.sales_address_name = #{salesAddressName}
+            </if>
+            <if test="salesBatchId !=null and salesBatchId !=''">
+                AND t.sales_batch_id = #{salesBatchId}
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND t.sales_create_time <![CDATA[>=]]> #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND t.sales_create_time <![CDATA[<=]]> #{endDate}
+            </if>
+        </where>
+    </select>
+
   <!-- 按照批次查询订单项，并下载，订单列表主要按照订单项来排列 -->
   <select id="listSalesOrderAndItem" parameterType="SalesOrder" resultType="SalesOrder">
-    SELECT
-        t.*,
-        soi.*
-    FROM
-        tb_rst_sales_order_info t
-    LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
-    LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
-    WHERE t.sales_batch_id = #{salesBatchId}
+        SELECT
+            t.*,
+            soi.*
+        FROM
+            tb_rst_sales_order_info t
+        LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
+        LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
+      <where>
+          <if test="salesIsDownload !=null ">
+              AND t.sales_is_download = #{salesIsDownload}
+          </if>
+          <if test="salesStatus !=null ">
+              AND t.sales_status = #{salesStatus}
+          </if>
+          <if test="salesShippingStatus !=null">
+              AND t.sales_shipping_status = #{salesShippingStatus}
+          </if>
+          <if test="salesStoreId !=null and salesStoreId !=''">
+              AND t.sales_store_id = #{salesStoreId}
+          </if>
+          <if test="salesId !=null">
+              AND t.sales_id = #{salesId}
+          </if>
+          <if test="salesOrderId !=null and salesOrderId !=''">
+              AND t.sales_orderId = #{salesOrderId}
+          </if>
+          <if test="salesDealCode !=null and salesDealCode !=''">
+              AND t.sales_deal_code = #{salesDealCode}
+          </if>
+          <if test="salesAddressTel !=null and salesAddressTel !=''">
+              AND t.sales_address_tel = #{salesAddressTel}
+          </if>
+          <if test="salesAddressName !=null and salesAddressName !=''">
+              AND t.sales_address_name = #{salesAddressName}
+          </if>
+          <if test="salesBatchId !=null and salesBatchId !=''">
+              AND t.sales_batch_id = #{salesBatchId}
+          </if>
+          <if test="startDate != null and startDate != ''">
+              AND t.sales_create_time <![CDATA[>=]]> #{startDate}
+          </if>
+          <if test="endDate != null and endDate != ''">
+              AND t.sales_create_time <![CDATA[<=]]> #{endDate}
+          </if>
+      </where>
   </select>
 
   <!-- 按照批次查询订单项，并下载，订单列表主要按照订单项来排列 -->
@@ -923,18 +1024,26 @@
 
     <select id="getSalesOrderByPostNum" resultType="SalesOrder" parameterType="String" >
         select
-          t.*
+             sales_id,
+             sales_orderId,
+             sales_openId,
+             sales_send_type,
+             sales_shipping_status,
+             sales_status,
+             sales_post_num,
+             ifnull(sales_deliver,0) AS  sales_deliver
         from tb_rst_sales_order_info t
         where sales_post_num = #{postNum}
     </select>
 
     <!-- 出库 -->
-    <update id="updateDeliver" parameterType="String" >
+    <update id="updateDeliver" parameterType="SalesOrder" >
         update tb_rst_sales_order_info
         SET
           sales_deliver = 2
         WHERE
           sales_post_num = #{salesPostNum}
+        AND sales_id = #{salesId}
         AND sales_shipping_status = 1
     </update>
 

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

@@ -720,6 +720,23 @@ public class AdminOrderController {
         return mv;
     }
 
+    /**
+     * 下载订单，返回给各个平台
+     * @param request
+     * @return
+     * @throws IOException
+     */
+    @ResponseBody
+    @RequestMapping("/val_download_order_excel")
+    public ResponseJson valDownloadOrderExcel(HttpServletRequest request,SalesOrder so) throws Exception {
+        ResponseJson rj = ResponseJson.getFAILURE();
+        Integer num = salesOrderService.listSalesOrderAndItemNum(so);
+        if(num > 1000){
+            rj.setResultMsg("下载订单超过1000条，请精确查询条件");
+            return rj;
+        }
+        return ResponseJson.getSUCCESS();
+    }
 
     /**
      * 下载订单，返回给各个平台
@@ -728,13 +745,8 @@ public class AdminOrderController {
      * @throws IOException
      */
     @RequestMapping("/download_order_excel")
-    public ModelAndView downloadOrderExcel(HttpServletRequest request,String orderBatchId) throws Exception {
-        if(orderBatchId == null || "".equals(orderBatchId)){
-            return new ModelAndView().addObject("下载出错");
-        }
+    public ModelAndView downloadOrderExcel(HttpServletRequest request,SalesOrder so) throws Exception {
 
-        SalesOrder so = new SalesOrder();
-        so.setSalesBatchId(orderBatchId);
         List<SalesOrder> temporarySalesOrderList = salesOrderService.listSalesOrderAndItem(so);
 
         if(temporarySalesOrderList.size() > 1000){

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

@@ -1003,5 +1003,16 @@ public class AdminSalesOrderController {
     }
 
 
+    @RequestMapping("/to_download_order_excel")
+    @RequiresPermissions("salesOrder:select:salesOrder")
+    public ModelAndView downloadOrderExcel(HttpServletRequest request, SalesOrder salesOrder) throws Exception {
+        ModelAndView mv = new ModelAndView("order/salesOrder/download_order");
+        List<StoreInfo> listStoreInfo = storeInfoService.listStore(new StoreInfo());
+        List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
+        mv.addObject("listStoreInfo",listStoreInfo);
+        mv.addObject("logisticsInfoList",logisticsInfoList);
+        return mv;
+    }
+
 
 }

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

@@ -457,13 +457,20 @@ public class AwaitSendController {
             rj.setResultMsg("出货失败，该订单未发货。");
             return rj;
         }
+        if(2 == salesOrder.getSalesDeliver()){
+            rj.setResultMsg("该订单已出库。");
+            return rj;
+        }
 
-        Integer flag = salesOrderService.updateDeliver(postNum);
+        Integer flag = salesOrderService.updateDeliver(salesOrder);
         if(flag < 1){
             rj.setResultMsg("出货失败，请检查该物流单号和订单状态。");
             return rj;
         }
-        return ResponseJson.getSUCCESS();
+
+        rj = ResponseJson.getSUCCESS();
+        rj.setResultMsg("出库成功");
+        return rj;
     }
 
 

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

@@ -12,6 +12,7 @@ import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.utils.AdminUtils;
+import com.iamberry.rst.utils.GenerateKeyUtil;
 import com.iamberry.rst.utils.OrderNoUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -40,6 +41,8 @@ public class MallOrderController {
     private ProductService productService;
     @Autowired
     private StoreInfoService storeInfoService;
+    @Autowired
+    private GenerateKeyUtil generateKeyUtil;
 
     @RequestMapping(value = "/order",method = RequestMethod.POST)
     @ResponseBody
@@ -183,6 +186,7 @@ public class MallOrderController {
             salesOrder.setSalesIsLocked(0);
             salesOrder.setSalesIsSeparate(0);
             salesOrder.setSalesIsDownload(1);
+            salesOrder.setSalesBatchId(generateKeyUtil.getSalesBatchIdWetch());
             //salesOrder = salesOrderService.addOrderAndIteminfo(salesOrder,list);
             salesOrder.setSalesOrderItemList(list);
 

watero-rst-web/src/main/java/com/iamberry/rst/utils/GenerateKeyUtil.java

@@ -45,6 +45,8 @@ public class GenerateKeyUtil {
     /*订单交易号前两位，D标识一定为手动增加  */
     private final static String SD_ORDER = "D";
 
+    /*微信添加批次编号*/
+    private final static String SW_BATCH = "W";
     /*手动添加批次编号*/
     private final static String SD_BATCH = "D";
     /*批量添加批次编号*/
@@ -105,19 +107,21 @@ public class GenerateKeyUtil {
         }
     }
 
-
+    /**
+     * 获取批次号 setSalesBatchId -- 微商城
+     * @return
+     */
+    public String getSalesBatchIdWetch(){
+        Integer number = getBatch();
+        return ("S"+ SW_BATCH + SDF_BATCH.format(new Date()) + String.format("%08d", number));
+    }
 
     /**
      * 获取批次号 setSalesBatchId -- 单个添加
      * @return
      */
     public String getSalesBatchIdSD(){
-        SysConfig sysConfig = sysConfigService.getSysConfigAll(bacthNo);
-        Integer number = Integer.valueOf(sysConfig.getConfigParameter())+1;
-        SysConfig sc = new SysConfig();
-        sc.setConfigId(sysConfig.getConfigId());
-        sc.setConfigParameter(String.valueOf(number));
-        sysConfigService.updateSysConfig(sc);
+        Integer number = getBatch();
         return ("S"+ SD_BATCH + SDF_BATCH.format(new Date()) + String.format("%08d", number));
     }
 
@@ -126,13 +130,22 @@ public class GenerateKeyUtil {
      * @return
      */
     public String getSalesBatchIdSC(){
+        Integer number = getBatch();
+        return ("S"+ SC_BATCH + SDF_BATCH.format(new Date()) + String.format("%08d", number));
+    }
+
+    /**
+     * 获取最新的批次
+     * @return
+     */
+    public synchronized Integer  getBatch(){
         SysConfig sysConfig = sysConfigService.getSysConfigAll(bacthNo);
         Integer number = Integer.valueOf(sysConfig.getConfigParameter())+1;
         SysConfig sc = new SysConfig();
         sc.setConfigId(sysConfig.getConfigId());
         sc.setConfigParameter(String.valueOf(number));
         sysConfigService.updateSysConfig(sc);
-        return ("S"+ SC_BATCH + SDF_BATCH.format(new Date()) + String.format("%08d", number));
+        return number;
     }
 
     /**

watero-rst-web/src/main/java/com/iamberry/rst/utils/OrderUtils.java

@@ -3,6 +3,7 @@ package com.iamberry.rst.utils;
 import com.alibaba.fastjson.JSONObject;
 import com.iamberry.rst.core.order.EOrderRequestData;
 import com.iamberry.wechat.tools.HttpClient431Util;
+import com.iamberry.wechat.tools.NameUtils;
 import com.sun.org.apache.xml.internal.security.utils.Base64;
 
 
@@ -31,7 +32,7 @@ public class OrderUtils {
     private static final String AppKey="3597c368-9dc0-40b5-9cf2-86d9cb90e38a";
     // 正式环境地址：http://api.kdniao.cc/api/Eorderservice
     // 测试环境地址：http://testapi.kdniao.cc:8081/api/EOrderService
-    private static final String ReqURL="http://api.kdniao.cc/api/Eorderservice";
+    private static final String ReqURL= NameUtils.getConfig("ReqURL");
 //    private static final String ReqURL="http://testapi.kdniao.cc:8081/api/EOrderService";
 
     public static void main(String[] args) throws Exception {

watero-rst-web/src/main/resources/platform.properties

@@ -102,3 +102,7 @@ SUCCESSINFO=SUCCESS
 #cm-website-send-msg
 website=https://rst.iamberry.com/QA
 scanningQrCode=https://w.iamberry.com/tooth/wechat/qr/
+
+#send from url
+#ReqURL=http://api.kdniao.cc/api/Eorderservice
+ReqURL=http://testapi.kdniao.cc:8081/api/EOrderService

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_list.ftl

@@ -65,10 +65,10 @@
                     <input type="text" class="input-text" value="" placeholder="物流编号" id="postNum" name="postNum">
                 </div>
 
-                <div class="formControls col-2 col-sm-2">
+                <div class="formControls col-1 col-sm-1" style="width: 100px;">
                     <input type="button" style="" class="btn btn-primary add-order-button" onclick="deliver()" value="出库" >
                 </div>
-                <div class="formControls col-2 col-sm-2" id="msg" style="display: none">
+                <div class="formControls col-2 col-sm-2 "  id="msg" style="display: none; line-height: 31px;color:#f00">
                 </div>
             </div>
             <#--<div class="row cl">-->
@@ -95,10 +95,16 @@
     var isAutomaticDeliver = 1; //  1:自动  2：手动点
 
     $(function(){
-        /* 所有trim_input 样式，input框都需要去除前后空格*/
-        $(".trim_input").change(function(){
+        $('#postNum').bind('input propertychange', function() {
+            var value =  $('#postNum').val();
+            $(this).val(value);
 
-        })
+            $("#msg").hide();
+
+            if(isAutomaticDeliver == 1){
+                deliver();
+            }
+        });
     })
 
     /**
@@ -117,12 +123,8 @@
             type: "POST",
             data: { postNum : postNum},
             success: function(data){
-                if (data.returnCode != 200) {
-                    $("#msg").show();
-                    $("#msg").html(data.resultMsg);
-                }else{
-                    $("#msg").hide();
-                }
+                $("#msg").show();
+                $("#msg").html(data.resultMsg);
                 layer.close(index);
             },
             error: function(){

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/download_order.ftl

@@ -0,0 +1,147 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/list_base.ftl">
+    <title>订单下载</title>
+    <style>
+        *{padding: 0;margin: 0;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
+        /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
+        .my-select{border: 1px solid rgba(0,0,0,.1);height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .table-bg thead th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        /*input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}*/
+
+        .my-order{left: 0px;cursor:pointer; position: absolute;border-bottom: 1px solid rgb(255, 255, 255);float: left;width: 110px;height: 36px;}
+    </style>
+</head>
+<body>
+<!--  录入订单 -->
+<div class="page-container">
+    <div class="text-c" id="form-download">
+        <form action="${path}/admin/salesOrder/list_order_page" method="post">
+                <select class="my-select" name="salesIsDownload" id="salesIsDownload" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                    <option value ="">导出状态</option>
+                    <option value ="2" >已导出</option>
+                    <option value ="1" >未导出</option>
+                </select>
+
+                <select class="my-select" name="salesShippingStatus" id="salesShippingStatus" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                    <option value ="">发货状态</option>
+                    <option value ="0" >未发货</option>
+                    <option value ="11" >已通知配货</option>
+                    <option value ="1" >已发货</option>
+                </select>
+
+                <select class="my-select" name="salesDeliver" id="salesDeliver" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                    <option value ="">出库状态</option>
+                    <option value ="1" >未出库</option>
+                    <option value ="2" >已出库</option>
+                </select>
+
+                <select class="my-select" name="salesStatus" id="salesStatus" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                    <option value ="">确认状态</option>
+                    <option value ="0" >未确认</option>
+                    <option value ="1" >确认</option>
+                    <option value ="2" >挂起</option>
+                </select>
+
+                <select name="salesStoreId" id="salesStoreId" class="my-select" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;"">
+                    <option value="">店铺</option>
+                    <#if listStoreInfo?? &&  (listStoreInfo?size > 0) >
+                        <#list listStoreInfo as info>
+                            <option value="${info.storeId!''}" <#if salesOrder.salesStoreId??><#if salesOrder.salesStoreId == info.storeId >selected="selected"</#if></#if>>${info.storeName!''}</option>
+                        </#list>
+                    </#if>
+                </select>
+
+            <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.startDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>-
+            <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.endDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
+
+            <#--<input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;" value="${salesOrder.salesOrderId!}" placeholder="百胜订单号" name="salesOrderId" id="salesOrderId">-->
+            <#--<input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;" value="${salesOrder.salesDealCode!}" placeholder="交易号" name="salesDealCode" id="salesDealCode">-->
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;" value="${salesOrder.salesBatchId!}" placeholder="订单批次号" name="salesBatchId" id="salesBatchId">
+            <#--<input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">-->
+            <#--<input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="收货人电话" name="salesAddressTel" id="salesAddressTel">-->
+
+            <#--<input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.itemProductName!}" placeholder="产品" name="itemProductName" id="itemProductName">-->
+            <#--<input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressInfo!}" placeholder="收货人地址" name="salesAddressInfo" id="salesAddressInfo">-->
+
+            <button onClick="download();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载订单">下载订单</button>
+        </form>
+    </div>
+
+
+</div>
+
+<tfoot>
+<#--<#include "/base/page_util.ftl">-->
+</tfoot>
+<script type="text/javascript">
+        function download(){
+            var salesIsDownload = $("#salesIsDownload").val(); //是否导出
+            var salesStatus = $("#salesStatus").val();; //订单状态
+            var salesShippingStatus = $("#salesShippingStatus").val(); //是否已发货
+            var salesDeliver = $("#salesDeliver").val(); //是否已发货
+            var salesStoreId = $("#salesStoreId").val(); //店铺
+            var startDate = $("#startDate").val();
+            var endDate = $("#endDate").val();
+//            var salesOrderId = $("#salesOrderId").val();
+//            var salesDealCode = $("#salesDealCode").val();
+//            var salesAddressName = $("#salesAddressName").val();
+//            var salesAddressTel = $("#salesAddressTel").val();
+            var salesBatchId = $("#salesBatchId").val();
+
+            $.ajax({
+                type:'POST',
+                url: '${path}/admin/order/val_download_order_excel',
+                data:{
+                    "salesIsDownload" : salesIsDownload,
+                    "salesStatus" : salesStatus,
+                    "salesShippingStatus" : salesShippingStatus,
+                    "salesDeliver" : salesDeliver,
+                    "salesStoreId" : salesStoreId,
+                    "startDate" : startDate,
+                    "endDate" : endDate,
+//                    "salesOrderId" : salesOrderId,
+//                    "salesDealCode" : salesDealCode,
+//                    "salesAddressName" : salesAddressName,
+//                    "salesAddressTel" : salesAddressTel,
+                    "salesBatchId" : salesBatchId
+                },
+                dataType: 'json',
+                async: false,
+                success:function(res) {
+                    if(res.returnCode != 200){
+                        layer.msg(res.resultMsg,{icon: 2,time:3000});
+                        return false;
+                    }else{
+                        window.location="${path}/admin/order/download_order_excel?"
+                                +"salesIsDownload="+salesIsDownload
+                                +"&salesStatus="+salesStatus
+                                +"&salesShippingStatus="+salesShippingStatus
+                                +"&salesDeliver="+salesDeliver
+                                +"&salesStoreId="+salesStoreId
+                                +"&startDate="+startDate
+                                +"&endDate="+endDate
+//                                +"&salesOrderId="+salesOrderId
+//                                +"&salesDealCode="+salesDealCode
+//                                +"&salesAddressName="+salesAddressName
+//                                +"&salesAddressTel="+salesAddressTel
+                                +"&salesBatchId="+salesBatchId;
+                    }
+                }
+            });
+        }
+    </script>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

@@ -27,6 +27,12 @@
                 <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 1>selected="selected"</#if></#if> value="1">已发货</option>
             </select>
 
+            <select class="select" name="salesDeliver" id="salesDeliver" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                <option value ="">出库状态</option>
+                <option <#if (req.salesDeliver)??><#if req.salesDeliver == 1>selected="selected"</#if></#if> value ="1" >未出库</option>
+                <option <#if (req.salesDeliver)??><#if req.salesDeliver == 2>selected="selected"</#if></#if> value ="2" >已出库</option>
+            </select>
+
             <select class="select" name="salesPostFirm" id="salesPostFirm" style="height: 31px;width: 150px">
                 <option value="">配送方式</option>
                 <#list logisticsInfoList as logisticsInfo>
@@ -53,8 +59,9 @@
             <th width="50">收件人姓名</th>
             <th width="50">收件人手机</th>
             <th width="80">收货地址</th>
-            <th width="80">订单产品</th>
+            <th width="70">订单产品</th>
             <th width="40">发货状态</th>
+            <th width="40">出库状态</th>
             <th width="40">配送方式</th>
             <#--<th width="40">客户备注</th>-->
             <th width="40">后台备注</th>
@@ -122,6 +129,17 @@
                         <p class="label radius"><a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${(o.salesPostNum)!}&billName=${(o.salesPostFirm)!}',300,400);">${(o.salesPostFirm)!}-${(o.salesPostNum)!}</a></p>
                     </#if>
                 </td>
+
+                <td>
+                    <#if o.salesDeliver??>
+                        <#if o.salesDeliver == 1>
+                            未出库
+                        <#elseif o.salesDeliver == 2>
+                            已出库
+                        </#if>
+                    </#if>
+                </td>
+
                 <td>
                     <#list logisticsInfoList as logisticsInfo>
                         <#if (o.salesPostFirm)??>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -89,7 +89,8 @@
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 下载订单</button>
             <#--<button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传第三方平台订单</button>-->
             <button onClick="upFiles2();"  class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传发货信息</button>
-            <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载第三方平台的发货信息"><i class="Hui-iconfont">&#xe640;</i> 下载发货后订单</button>
+            <#--<button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载第三方平台的发货信息"><i class="Hui-iconfont">&#xe640;</i> 下载发货后订单</button>-->
+            <button onClick="downloadOrderPage();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载订单">下载订单</button>
         </form>
     </div>
 
@@ -307,6 +308,14 @@
         window.location.href= "${path}/admin/salesOrder/to_update_sales_order?salesId="+orderSaleId;
     }
 
+    /**
+     * 跳转到下载页面
+     */
+    function downloadOrderPage(){
+        layer_show("商品列表","${path}/admin/salesOrder/to_download_order_excel","600","250");
+        <#--window.location.href= "${path}/admin/salesOrder/download_order_page";-->
+    }
+
     /*onMouseOver="showDownloadOrderInfo();" onMouseOut="hideDownloadOrderInfo();"*/
     function showDownloadOrderInfo() {