出库

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
@@ -243,4 +250,20 @@ public interface SalesOrderService {
      * @return
      */
     Integer listSalesPostFirm(SalesOrder salesOrder);
+
+    /**
+     * 查询订单
+     * @param postNum
+     * @return
+     */
+    SalesOrder getSalesOrderByPostNum(String postNum);
+
+    /**
+     * 出库
+     * @param postNum
+     * @return
+     */
+    Integer updateDeliver(String postNum);
+
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -126,7 +126,7 @@
 
   <select id="listApprovalOrderItem" parameterType="Integer" resultType="ApprovalOrderItem">
     SELECT
-    <include refid="Base_Column_List" />
+    <!--<include refid="Base_Column_List" />-->
     FROM tb_rst_approval_order_item
     WHERE approval_id = #{approvalId}
   </select>

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() +")重复，请重新生成交易号！");
         }
@@ -860,5 +865,15 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return salesOrderMapper.listSalesPostFirm(salesOrder);
     }
 
+    @Override
+    public SalesOrder getSalesOrderByPostNum(String postNum) {
+        return salesOrderMapper.getSalesOrderByPostNum(postNum);
+    }
+
+    @Override
+    public Integer updateDeliver(String postNum) {
+        return salesOrderMapper.updateDeliver(postNum);
+    }
+
 
 }

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
@@ -196,4 +203,18 @@ public interface SalesOrderMapper {
      */
     Integer listSalesPostFirm(SalesOrder salesOrder);
 
+    /**
+     * 查询订单
+     * @param postNum
+     * @return
+     */
+    SalesOrder getSalesOrderByPostNum(String postNum);
+
+    /**
+     * 出库
+     * @param salesOrder
+     * @return
+     */
+    Integer updateDeliver(String salesOrder);
+
 }

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

@@ -137,9 +137,91 @@
         </foreach >
       </if>
     </where>
+    GROUP BY tb_rst_sales_order_info.sales_id
     ORDER BY sales_create_time DESC
   </select>
 
+    <!-- 订单数量 -->
+    <select id="listSalesOrderNum" resultType="Integer" parameterType="SalesOrder" >
+    SELECT COUNT(0)
+    FROM (
+        select
+          tb_rst_sales_order_info.sales_id
+        from tb_rst_sales_order_info
+        LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
+        LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
+        LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
+        LEFT JOIN tb_rst_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
+        <where>
+                <if test="salesIsDownload !=null and salesIsDownload !=''">AND sales_is_download = #{salesIsDownload}
+                </if>
+                <if test="
+            salesShippingStatus !=null">
+                    AND sales_shipping_status = #{salesShippingStatus}
+                </if>
+                <if test="salesStatus !=null">
+                    AND sales_status = #{salesStatus}
+                </if>
+                <if test="salesOrderStatus !=null">
+                    AND sales_order_status = #{salesOrderStatus}
+                </if>
+                <if test="salesStoreId !=null and salesStoreId !=''">
+                    AND sales_store_id = #{salesStoreId}
+                </if>
+                <if test="salesPostFirm !=null and salesPostFirm !=''">
+                    AND sales_post_firm = #{salesPostFirm}
+                </if>
+                <if test="salesCompanyId !=null and salesCompanyId !=''">
+                    AND sales_company_id = #{salesCompanyId}
+                </if>
+                <if test="salesId !=null">
+                    AND sales_id = #{salesId}
+                </if>
+                <if test="salesOrderId !=null and salesOrderId !=''">
+                    AND sales_orderId = #{salesOrderId}
+                </if>
+                <if test="salesDealCode !=null and salesDealCode !=''">
+                    AND sales_deal_code = #{salesDealCode}
+                </if>
+                <if test="salesAddressTel !=null and salesAddressTel !=''">
+                    AND sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
+                </if>
+                <if test="salesAddressName !=null and salesAddressName !=''">
+                    AND sales_address_name like CONCAT('%',#{salesAddressName},'%')
+                </if>
+                <if test="salesBatchId !=null and salesBatchId !=''">
+                    AND sales_batch_id = #{salesBatchId}
+                </if>
+                <if test="salesAddressInfo !=null and salesAddressInfo !=''">
+                    AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
+                </if>
+                <if test="itemProductName !=null and itemProductName !=''">
+                    AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
+                </if>
+                <if test="startDate != null and startDate != ''">
+                    AND sales_create_time <![CDATA[>=]]> #{startDate}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    AND sales_create_time <![CDATA[<=]]> #{endDate}
+                </if>
+                <if test="salesAdminId != null ">
+                    AND sales_admin_id = #{salesAdminId}
+                </if>
+                <if test="salesAddType != null ">
+                    AND sales_add_type = #{salesAddType}
+                </if>
+                <if test="salesIds != null and salesIds != ''">
+                    AND sales_id IN
+                    <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
+                        #{node}
+                    </foreach >
+                </if>
+            </where>
+            GROUP BY tb_rst_sales_order_info.sales_id
+        )xx
+    </select>
+
   <!-- 订单项集合 -->
   <select id="listSalesOrderItem" resultType="SalesOrderItem" parameterType="SalesOrderItem" >
         SELECT
@@ -837,4 +919,23 @@
             </if>
         </where>
     </update>
+
+
+    <select id="getSalesOrderByPostNum" resultType="SalesOrder" parameterType="String" >
+        select
+          t.*
+        from tb_rst_sales_order_info t
+        where sales_post_num = #{postNum}
+    </select>
+
+    <!-- 出库 -->
+    <update id="updateDeliver" parameterType="String" >
+        update tb_rst_sales_order_info
+        SET
+          sales_deliver = 2
+        WHERE
+          sales_post_num = #{salesPostNum}
+        AND sales_shipping_status = 1
+    </update>
+
 </mapper>

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/AwaitSendController.java

@@ -418,4 +418,53 @@ 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("出货失败，物流单号异常，该物流单号可能存在多个订单中！。");
+            return rj;
+        }
+        if(salesOrder == null){
+            rj.setResultMsg("出货失败，未查询到订单。");
+            return rj;
+        }
+        if(salesOrder.getSalesShippingStatus() != 1){
+            rj.setResultMsg("出货失败，该订单未发货。");
+            return rj;
+        }
+
+        Integer flag = salesOrderService.updateDeliver(postNum);
+        if(flag < 1){
+            rj.setResultMsg("出货失败，请检查该物流单号和订单状态。");
+            return rj;
+        }
+        return ResponseJson.getSUCCESS();
+    }
+
+
 }

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/deliver_list.ftl

@@ -0,0 +1,136 @@
+<!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>
+        .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="" method="post" class="form form-horizontal" id="form-order-add"  onkeydown="if(event.keyCode==13)return false;">
+
+            <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-2 col-sm-2">
+                    <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>
+            </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>
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.min.js"> </script>
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
+<script type="text/plain" id="upload_ue"></script>
+</tfoot>
+<script type="text/javascript">
+
+    var isAutomaticDeliver = 1; //  1:自动  2：手动点
+
+    $(function(){
+        /* 所有trim_input 样式，input框都需要去除前后空格*/
+        $(".trim_input").change(function(){
+
+        })
+    })
+
+    /**
+     *  出库
+     * @param postNum
+     */
+    function deliver(){
+        var postNum =$("#postNum").val();
+
+        var index = layer.load(1, {
+            shade: [0.5,'#fff'] //0.1透明度的白色背景
+        });
+
+        $.ajax({
+            url: root_path +"/admin/await_send/deliver",
+            type: "POST",
+            data: { postNum : postNum},
+            success: function(data){
+                if (data.returnCode != 200) {
+                    $("#msg").show();
+                    $("#msg").html(data.resultMsg);
+                }else{
+                    $("#msg").hide();
+                }
+                layer.close(index);
+            },
+            error: function(){
+                layer.close(index);
+            }
+        });
+        layer.close(index);
+    }
+</script>
+</body>
+</html>

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;
         }
     });
 });