Merge remote-tracking branch 'liujiankang/master'

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -59,6 +59,7 @@ public class SalesOrder implements Serializable {
     private String salesDealCode;           //交易号
     private Integer salesOrderStatus;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发
     private Integer salesShippingStatus;    //发货状态 0(未发货)1(已发货,即已扫描出库)3(备货中)4（收货） 11(已通知配货，后加)
+    private Integer salesDeliver;            //出库状态  1：未出库   2：已出库
     private Integer salesPayStatus;         //付款状态 0(未付款)2(已付款)
     private Integer salesProcessStatus;     //单据状态  0(正常单)1(问题单)
     private Integer salesIsSend;            //是否通知配货    0：否1：是
@@ -617,4 +618,12 @@ public class SalesOrder implements Serializable {
     public void setCustomerIsSolve(Integer customerIsSolve) {
         this.customerIsSolve = customerIsSolve;
     }
+
+    public Integer getSalesDeliver() {
+        return salesDeliver;
+    }
+
+    public void setSalesDeliver(Integer salesDeliver) {
+        this.salesDeliver = salesDeliver;
+    }
 }

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

@@ -76,6 +76,13 @@ public interface SalesOrderService {
     List<SalesOrder> listSalesOrder (SalesOrder salesOrder);
 
     /**
+     * 获取订单数量
+     * @param salesOrder
+     * @return
+     */
+     Integer listSalesOrderNum (SalesOrder salesOrder);
+
+    /**
      * 分页获取订单集合
      * @param pageNO
      * @param pageSize
@@ -200,6 +207,13 @@ public interface SalesOrderService {
      * @param salesOrder
      * @return
      */
+    Integer listSalesOrderAndItemNum(SalesOrder salesOrder);
+
+    /**
+     * 按照批次查询订单项，并下载，订单列表主要按照订单项来排列
+     * @param salesOrder
+     * @return
+     */
     List<SalesOrder> listSalesOrderAndItem(SalesOrder salesOrder);
 
     /**
@@ -243,4 +257,20 @@ public interface SalesOrderService {
      * @return
      */
     Integer listSalesPostFirm(SalesOrder salesOrder);
+
+    /**
+     * 查询订单
+     * @param postNum
+     * @return
+     */
+    SalesOrder getSalesOrderByPostNum(String postNum);
+
+    /**
+     * 出库
+     * @param salesOrder
+     * @return
+     */
+    Integer updateDeliver(SalesOrder salesOrder);
+
+
 }

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

@@ -113,6 +113,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
+    public Integer listSalesOrderNum(SalesOrder salesOrder) {
+        return salesOrderMapper.listSalesOrderNum(salesOrder);
+    }
+
+    @Override
     public PagedResult<SalesOrder> listSalesOrderPage(int pageNO, int pageSize, SalesOrder salesOrder, boolean isTotalNum) {
         PageHelper.startPage(pageNO, pageSize, isTotalNum);
         //查询订单列表信息
@@ -320,7 +325,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     @Override
     @Transactional
     public boolean addRstOrderinfo(SalesOrder mainOrder,List<SalesOrder> listSalesOrder) {
-        Integer flag = salesOrderMapper.getOrderBySalesDealCodeNum(mainOrder.getSalesDealCode());
+         Integer flag = salesOrderMapper.getOrderBySalesDealCodeNum(mainOrder.getSalesDealCode());
         if(flag > 0){
             throw  new RuntimeException("交易号("+ mainOrder.getSalesDealCode() +")重复，请重新生成交易号！");
         }
@@ -773,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);
     }
@@ -860,5 +870,15 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return salesOrderMapper.listSalesPostFirm(salesOrder);
     }
 
+    @Override
+    public SalesOrder getSalesOrderByPostNum(String postNum) {
+        return salesOrderMapper.getSalesOrderByPostNum(postNum);
+    }
+
+    @Override
+    public Integer updateDeliver(SalesOrder salesOrder) {
+        return salesOrderMapper.updateDeliver(salesOrder);
+    }
+
 
 }

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

@@ -45,6 +45,13 @@ public interface SalesOrderMapper {
     List<SalesOrder> listSalesOrder (SalesOrder salesOrder);
 
     /**
+     * 获取订单数量
+     * @param salesOrder
+     * @return
+     */
+    Integer listSalesOrderNum (SalesOrder salesOrder);
+
+    /**
      * 获取订单项集合
      * @param salesOrderItem
      * @return
@@ -146,6 +153,13 @@ public interface SalesOrderMapper {
      * @param salesOrder
      * @return
      */
+    Integer listSalesOrderAndItemNum(SalesOrder salesOrder);
+
+    /**
+     * 按照批次查询订单项，并下载，订单列表主要按照订单项来排列
+     * @param salesOrder
+     * @return
+     */
     List<SalesOrder> listSalesOrderAndItem(SalesOrder salesOrder);
 
     /**
@@ -196,4 +210,18 @@ public interface SalesOrderMapper {
      */
     Integer listSalesPostFirm(SalesOrder salesOrder);
 
+    /**
+     * 查询订单
+     * @param postNum
+     * @return
+     */
+    SalesOrder getSalesOrderByPostNum(String postNum);
+
+    /**
+     * 出库
+     * @param salesOrder
+     * @return
+     */
+    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查询订单信息 -->
@@ -754,15 +754,11 @@
   <select id="listSalesOrderAndItem" parameterType="SalesOrder" resultType="SalesOrder">
     SELECT
         t.*,
-        soi.*,
-        trsi.store_name  storeName,
-        trsc.company_name companyName
+        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
-    LEFT JOIN tb_rst_store_info trsi ON t.sales_store_id = trsi.store_id
-    LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
     WHERE t.sales_batch_id = #{salesBatchId}
   </select>
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -1,13 +1,10 @@
 package com.iamberry.rst.controllers.approval;
 
-import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.approval.ApplyPick;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.faces.approval.ApplyPickItemService;
 import com.iamberry.rst.faces.approval.ApplyPickService;
-import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -26,7 +23,6 @@ public class ApplyPickController {
     @Autowired
     private ApplyPickItemService applyPickItemService;
 
-
     /**
      *
      * @param applyPick
@@ -59,7 +55,7 @@ public class ApplyPickController {
     @RequestMapping(value = "/addApplyPick")
     public ResponseJson addApplyPick(
             ApplyPick applyPick) throws Exception {
-        ResponseJson rj =new ResponseJson(200, "修改成功", 200);
+        ResponseJson rj =new ResponseJson(200, "添加成功", 200);
         Integer flag = applyPickService.save(applyPick);
         if (flag < 1) {
             return  ResponseJson.getFAILURE();
@@ -67,6 +63,18 @@ public class ApplyPickController {
         return rj;
     }
 
+    @ResponseBody
+    @RequestMapping(value = "/updateApplyPick")
+    public ResponseJson updateApplyPick(
+            ApplyPick applyPick) throws Exception {
+        ResponseJson rj =new ResponseJson(200, "修改成功", 200);
+        Integer flag = applyPickService.update(applyPick);
+        if (flag < 1) {
+            return  ResponseJson.getFAILURE();
+        }
+        return rj;
+    }
+
 
 
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -1779,7 +1779,36 @@ public class AdminCustomerController {
         customerCommon.setRelationCreateTime(new Date());
         Integer notSendCustomer = customerCommonService.listCustomerCommonByStatus(customerCommon);
 
+       SalesOrder salesOrder = new SalesOrder();
+       salesOrder.setSalesStatus(0);   //未确认
+       Integer toBeConfirmedOrder = salesOrderService.listSalesOrderNum(salesOrder);
+
+       salesOrder = new SalesOrder();
+       salesOrder.setSalesShippingStatus(0);   //未发货
+       Integer toBeAnnounced = salesOrderService.listSalesOrderNum(salesOrder);
+
+        salesOrder.setSalesShippingStatus(11);   //已通知配货
+       Integer toBeDelivered = salesOrderService.listSalesOrderNum(salesOrder);
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY,00);
+        calendar.set(Calendar.MINUTE,00);
+        calendar.set(Calendar.SECOND,01);
+        salesOrder = new SalesOrder();
+        salesOrder.setStartDate(calendar.getTime());   //startDate
+        Calendar ca = Calendar.getInstance();
+        ca.set(Calendar.HOUR_OF_DAY,23);
+        ca.set(Calendar.MINUTE,59);
+        ca.set(Calendar.SECOND,59);
+        salesOrder.setEndDate(ca.getTime());
+       Integer allToDayOrder = salesOrderService.listSalesOrderNum(salesOrder);
+
         Map<String, Integer> numberMap = new HashMap<>();
+        numberMap.put("toBeConfirmedOrder", toBeConfirmedOrder);
+        numberMap.put("toBeAnnounced", toBeAnnounced);
+        numberMap.put("toBeDelivered", toBeDelivered);
+        numberMap.put("allToDayOrder", allToDayOrder);
+
         numberMap.put("notSolvedCustomer", notSolvedCustomer);
         numberMap.put("amountReceivedCustomer", amountReceivedCustomer);
         numberMap.put("noEntryCustomer", noEntryCustomer);

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

@@ -198,14 +198,17 @@ public class AwaitSendController {
             eOrderRequestData.setCustomerPwd("90000009971400");
         } else if (post.equalsIgnoreCase("SF")) {
             // 顺丰
-            eOrderRequestData.setMonthCode("7690035114");
+           // eOrderRequestData.setMonthCode("7690035114");
         } else if (post.equalsIgnoreCase("YZBK")) {
             // 省外EMS (无需操作)
         } else if (post.equalsIgnoreCase("STO")) {
             // 申通快递
-            eOrderRequestData.setCustomerName("爱贝源");
-            eOrderRequestData.setCustomerPwd("Iamberry321.");
-            eOrderRequestData.setSendSite("广东东莞公司");
+//            eOrderRequestData.setCustomerName("爱贝源");
+//            eOrderRequestData.setCustomerPwd("Iamberry321.");
+//            eOrderRequestData.setSendSite("广东东莞公司");
+            eOrderRequestData.setCustomerName("teststo");
+            eOrderRequestData.setCustomerPwd("teststopwd.");
+            eOrderRequestData.setSendSite("teststosendsite");
         } else if (post.equalsIgnoreCase("DBL")) {
             eOrderRequestData.setCustomerName("月结编码");
         }
@@ -418,4 +421,58 @@ public class AwaitSendController {
         }
     }
 
+
+    /**
+     * 跳转出库页面
+     *
+     * @return
+     */
+    @RequiresPermissions("salesOrder:deliver:deliverList")
+    @RequestMapping(value = "/deliverList")
+    public ModelAndView deliverList(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("order/salesOrder/deliver_list");
+
+        return mv;
+    }
+
+    /**
+     * 出库
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("salesOrder:deliver:deliverList")
+    @RequestMapping("/deliver")
+    public ResponseJson deliver(HttpServletRequest request, String postNum) {
+        ResponseJson rj = ResponseJson.getFAILURE();
+        SalesOrder salesOrder = null;
+        try{
+            salesOrder = salesOrderService.getSalesOrderByPostNum(postNum);
+        }catch (Exception e){
+            rj.setResultMsg("出货失败，物流单号（"+postNum+"）异常，该物流单号可能存在多个订单中！");
+            return rj;
+        }
+        if(salesOrder == null){
+            rj.setResultMsg("出货失败，该物流单号（"+postNum+"）未查询到订单。");
+            return rj;
+        }
+        if(salesOrder.getSalesShippingStatus() != 1){
+            rj.setResultMsg("出货失败，该物流单号（"+postNum+"）对应的订单未发货。");
+            return rj;
+        }
+        if(2 == salesOrder.getSalesDeliver()){
+            rj.setResultMsg("出货失败，该物流单号（"+postNum+"）对应的订单已出库。");
+            return rj;
+        }
+        Integer flag = salesOrderService.updateDeliver(salesOrder);
+        if(flag < 1){
+            rj.setResultMsg("出货失败，请检查该物流单号（"+postNum+"）和订单状态。");
+            return rj;
+        }
+        rj = ResponseJson.getSUCCESS();
+        rj.setResultMsg("物流单号（"+ postNum +"）出库成功。");
+        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/home/pc_index.ftl

@@ -93,11 +93,17 @@
 
     <div id="selectTodo" class="menu_dropdown bk_2" style="display:none">
         <div>
+            <div>订单</div>
+            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?salesStatus=0',1,'')"  ><span>（</span><span id="toBeConfirmedOrder" style="color: #f00">0</span><span>）待确认订单数量</span></a><br>
+            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?salesShippingStatus=0',1,'')"  ><span>（</span><span id="toBeAnnounced" style="color: #f00">0</span><span>）待通知配货数量</span></a><br>
+            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?salesShippingStatus=11',1,'')"  ><span>（</span><span id="toBeDelivered" style="color: #f00">0</span><span>）待发货数量</span></a><br>
+            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?1=1',1,'today')"  ><span>（</span><span id="allToDayOrder" style="color: #f00">0</span><span>）今日订单总数</span></a><br>
 
-            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?customerIsSolve=2&isFirst=1')"  ><span>（</span><span id="notSolvedCustomer" style="color: #f00">0</span><span>）未解决客诉数量</span></a><br>
-            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=4&isFirst=1')"  ><span>（</span><span id="amountReceivedCustomer" style="color: #f00">0</span><span>）需要向工厂确认是否已签收的产品数量</span></a><br>
-            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=3&isFirst=1')"  ><span>（</span><span id="noEntryCustomer" style="color: #f00">0</span><span>）需要填写Efast订单号的客诉数量</span></a><br>
-            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=1&isFirst=1')"  ><span>（</span><span id="notSendCustomer" style="color: #f00">0</span><span>）录入三天后未寄回的客诉数量</span></a>
+            <div>客诉</div>
+            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?customerIsSolve=2&isFirst=1',2,'')"  ><span>（</span><span id="notSolvedCustomer" style="color: #f00">0</span><span>）未解决客诉数量</span></a><br>
+            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=4&isFirst=1',2,'')"  ><span>（</span><span id="amountReceivedCustomer" style="color: #f00">0</span><span>）需要向工厂确认是否已签收的产品数量</span></a><br>
+            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=3&isFirst=1',2,'')"  ><span>（</span><span id="noEntryCustomer" style="color: #f00">0</span><span>）需要填写Efast订单号的客诉数量</span></a><br>
+            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=1&isFirst=1',2,'')"  ><span>（</span><span id="notSendCustomer" style="color: #f00">0</span><span>）录入三天后未寄回的客诉数量</span></a>
         </div>
     </div>
 </section>
@@ -120,6 +126,11 @@
         async:false,
         "success" : function(data) {
             if(data.status){
+                $("#toBeConfirmedOrder").html(data.data.toBeConfirmedOrder);
+                $("#toBeAnnounced").html(data.data.toBeAnnounced);
+                $("#toBeDelivered").html(data.data.toBeDelivered);
+                $("#allToDayOrder").html(data.data.allToDayOrder);
+
                 $("#notSolvedCustomer").html(data.data.notSolvedCustomer);
                 $("#amountReceivedCustomer").html(data.data.amountReceivedCustomer);
                 $("#noEntryCustomer").html(data.data.noEntryCustomer);
@@ -138,7 +149,7 @@
         layer.open({
             title: '待办事项',
             type: 1,
-            area: ['300px', '180px'], //宽高
+            area: ['300px', '300px'], //宽高
             content: $("#selectTodo").html(),
             offset: 'rb',
             shade: 0
@@ -146,7 +157,14 @@
     }
 
 
-    function toOrserList(url){
+    function toOrserList(url,type,type2){
+        var titleText = "";
+        if(type == 1){
+            titleText = "订单列表"
+        }else if(type == 2){
+            titleText = "客诉列表";
+        }
+
         //去除其它选项选中样式
         $("#min_title_list li").removeClass("active");
         //判断是否已存在订单列表选项卡
@@ -154,7 +172,7 @@
         var bolean = true;
         $(function() {
             $("#min_title_list li").each(function() {
-                if(($(this).find("span").text()) == "客诉列表"){
+                if(($(this).find("span").text()) == titleText){
                     $(this).addClass("active");
                     bolean = false;
                 }
@@ -163,7 +181,7 @@
         });
         if(bolean){
             //新增一个选项卡标题
-            $("#min_title_list").append('<li id="orderTitleId" class="active"><span data-href="/admin/order/selectShopOrder">客诉列表</span><i></i><em></em></li>')
+            $("#min_title_list").append('<li id="orderTitleId" class="active"><span data-href="/admin/order/selectShopOrder">'+ titleText +'</span><i></i><em></em></li>')
             //获取前面ul个数计算新增的选项卡位置
             var left = $("#min_title_list>li").length*133;//获取前面ul位置长度
             $("#min_title_list").css("width",left+"px");

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

@@ -270,10 +270,6 @@
 <script type="text/javascript" charset="utf-8" src="${path}/common/js/salesOrder/salesOrder.js"></script>
 
 <script type="text/javascript">
-    var url_path = "${path}";
-</script>
-
-<script type="text/javascript">
 
     $('.skin-minimal input').iCheck({
         checkboxClass: 'icheckbox-blue',

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

@@ -0,0 +1,127 @@
+<!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/add_base.ftl">
+    <title>出库列表</title>
+    <style>
+        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
+        .ac_results li {border:1px solid #fff}
+        .ac_results li a span {float:right}
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
+        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
+        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
+        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
+        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
+        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
+        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
+        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
+        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
+        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
+        .time-line-list>li:first-child .arrow{display: none;}
+        .table-bg th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .msg-phone{height: 35px;line-height: 35px;}
+        .col-sm-1{width: 150px;}
+
+        .all_down{text-decoration: underline;color: #00c;}
+    </style>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 仓库管理
+    <span class="c-gray en">&gt;</span> 出库列表
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+
+<article class="page-container" style="padding: 10px;">
+    <div class="pd-20 cl">
+        <form action="${path}/admin/await_send/deliver" method="post" class="form form-horizontal" id="form-order-add"  >
+
+            <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">出库</div>
+                </label>
+                <div class="formControls col-9">
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-1 col-sm-1">物流编号：</label>
+                <div class="formControls col-3 col-sm-3">
+                    <input type="text" class="input-text" value="" placeholder="物流编号" id="postNum" name="postNum">
+                </div>
+
+                <div class="formControls col-1 col-sm-1" style="width: 100px;">
+                    <input type="submit" style="" class="btn btn-primary add-order-button"  value="出库" >
+                </div>
+                <div class="formControls col-6 col-sm-6"  id="msg" style="display: none; line-height: 31px;color:#f00">
+                </div>
+            </div>
+            <#--<div class="row cl">-->
+                <#--<label class="form-label col-3">-->
+                    <#--<div class="tit-2">今日出库</div>-->
+                <#--</label>-->
+                <#--<div class="formControls col-9">-->
+                <#--</div>-->
+            <#--</div>-->
+        </form>
+    </div>
+</article>
+
+<tfoot>
+</tfoot>
+<script type="text/javascript">
+
+    $(function(){
+        var loadIndex = 0;
+        $("#form-order-add").Validform({
+            tiptype: function (msg, o, cssctl) {
+                if (o.type == 3) {//失败
+                    layer.msg(msg, {icon: 5, time: 3000});
+                    $(window).scrollTop(o.obj.offset().top - 40);
+                }
+            },
+            datatype: {//自定义验证类型
+            },
+            ignoreHidden: true,
+            tipSweep: true, //若为true，则只在表单提交时验证
+            ajaxPost: true, //异步提交
+            beforeCheck: function (curform) {  //验证通过之前执行的函数
+                var flag = false;
+            },
+            beforeSubmit: function (curform) {  //验证通过之后执行的函数
+                loadIndex = layer.load(1, {
+                    shade: [0.5,'#fff'] //0.1透明度的白色背景
+                });
+            },
+            callback: function (data) {//异步回调函数
+                if (data) {
+                    $("#msg").show();
+                    $("#msg").html(data.resultMsg);
+                    if(data.returnCode == 200){
+                        $("#postNum").val();
+                    }
+                }
+                layer.close(loadIndex);
+                return false;
+            }
+        });
+    });
+
+</script>
+</body>
+</html>

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="" id="form-download">
+        <form action="${path}/admin/salesOrder/list_order_page" method="post" style="margin-left: 24px;">
+                <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:120px;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:120px;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;padding: 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>
@@ -41,6 +47,7 @@
             <input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.salesAddressTel)!}" placeholder="收件人手机" id="salesAddressTel" name="salesAddressTel">
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" onclick="orderSend()" id="" name="">打单发货</button>
+            <button onClick="downloadOrderPage();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载订单">下载订单</button>
         </form>
     </div>
      <table class="table table-border table-bordered table-hover" style="margin-top: 20px">
@@ -53,8 +60,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 +130,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)??>
@@ -226,7 +245,12 @@
         layer_show(title,url,w,h);
     }
 
-
+    /**
+     * 跳转到下载页面
+     */
+    function downloadOrderPage(){
+        layer_show("商品列表","${path}/admin/salesOrder/to_download_order_excel","600","250");
+    }
 </script>
 
 <script>

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

@@ -86,10 +86,11 @@
             <input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressInfo!}" placeholder="收货人地址" name="salesAddressInfo" id="salesAddressInfo">
 
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
-            <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 type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 下载Efast格式订单</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,13 @@
         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");
+    }
+
     /*onMouseOver="showDownloadOrderInfo();" onMouseOut="hideDownloadOrderInfo();"*/
     function showDownloadOrderInfo() {
         

watero-rst-web/src/main/webapp/common/js/common/address.js

@@ -33,7 +33,7 @@
                         $provinceNode.append("<option value='"+ this.provinceId +"'>"+ this.province +"</option>");
                     })
                     if(isEmpty(address.options.provinceId)){
-                       //
+                        address.options.provinceId = result.returnMsg.provinceList[0].provinceId;
                     }else if(isEmpty(address.options.provinceName)){
                         address.options.provinceId = address.getAttrIdByName($provinceNode,address.options.provinceName);
                     }else{
@@ -57,7 +57,7 @@
                     })
 
                     if(isEmpty(address.options.cityId)){
-                        //
+                        address.options.cityId = result.returnMsg.cityList[0].cityId;
                     }else if(isEmpty(address.options.cityName)){
                         address.options.cityId = address.getAttrIdByName($cityNode,address.options.cityName);
                     }else{
@@ -81,7 +81,7 @@
                     })
 
                     if(isEmpty(address.options.countryId)){
-                       //
+                        address.options.countryId = result.returnMsg.districtList[0].districtId;
                     }else if(isEmpty(address.options.countryName)){
                         address.options.countryId = address.getAttrIdByName($countryNode,address.options.countryName);
                     }else{

watero-rst-web/src/main/webapp/common/js/salesOrder/salesOrder.js

@@ -91,6 +91,7 @@ $(function(){
                     layer.close(loadIndex);
                 }
             }
+            return false;
         }
     });
 });