Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -21,9 +21,9 @@
         <form action="${path}/admin/await_send/listAwaitSendOrder" method="POST" id="search-form">
             <select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 31px;width: 150px">-->
                 <option value="">发货状态</option>
-                <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 0>selected="selected"</#if></#if> value="0">待发货</option>
+                <#--<option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 0>selected="selected"</#if></#if> value="0">待发货</option>-->
                 <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 11>selected="selected"</#if></#if> value="11">已通知配货</option>
-                <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 1>selected="selected"</#if></#if> value="1">已发货</option>
+                <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: 31px;width: 120px;margin: 0px;margin-bottom: 10px;">
@@ -125,7 +125,7 @@
                     <#if o.salesShippingStatus == 11>
                         <span style="color: red;">通知配货</span>
                     <#elseif o.salesShippingStatus == 1>
-                        <p>已发货</p>
+                        <p>已打单</p>
                         <p>(${(o.salesSendTime?string("MM-dd HH:mm:ss"))!"暂无发货时间"})</p>
                         <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>

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

@@ -49,8 +49,15 @@
                     <option value ="">发货状态</option>
                     <option value ="0" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 0 >selected="selected"</#if></#if>>未发货</option>
                     <option value ="11" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 11 >selected="selected"</#if></#if>>已通知配货</option>
-                    <option value ="1" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 1 >selected="selected"</#if></#if>>已发货</option>
+                    <option value ="1" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 1 >selected="selected"</#if></#if>>已打单</option>
                 </select>
+
+                <select class="select" name="salesDeliver" id="salesDeliver" style="height: 31px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                    <option value ="">出库状态</option>
+                    <option <#if (salesOrder.salesDeliver)??><#if salesOrder.salesDeliver == 1>selected="selected"</#if></#if> value ="1" >未出库</option>
+                    <option <#if (salesOrder.salesDeliver)??><#if salesOrder.salesDeliver == 2>selected="selected"</#if></#if> value ="2" >已出库</option>
+                </select>
+
                 <select class="select" name="salesStatus" id="salesStatus" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
                     <option value ="">订单状态</option>
                     <option value ="0" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 0 >selected="selected"</#if></#if>>未确认</option>
@@ -94,7 +101,8 @@
                 <th width="72">批次号</th>
                 <th width="70">姓名/电话</th>
                 <th width="100">收货地址</th>
-                <th width="50">是否发货</th>
+                <th width="50">是否打单</th>
+                <th width="50">是否出库</th>
                 <th width="60">订单状态</th>
                 <th width="60">物流信息</th>
                 <th width="50">用户备注</th>
@@ -153,7 +161,7 @@
                         <#if order.salesShippingStatus == 0>
                             未发货
                         <#elseif order.salesShippingStatus == 1>
-                            已发货
+                            已打单
                         <#elseif order.salesShippingStatus == 3>
                             备货中
                         <#elseif order.salesShippingStatus == 4>
@@ -163,6 +171,15 @@
                         </#if>
                     </td>
                     <td>
+                        <#if order.salesDeliver??>
+                            <#if order.salesDeliver == 1>
+                                未出库
+                            <#elseif order.salesDeliver == 2>
+                                已出库
+                            </#if>
+                        </#if>
+                    </td>
+                    <td>
                         <#if order.salesStatus == 0>
                             未确认
                         <#elseif order.salesStatus == 1>