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

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

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

@@ -137,6 +137,9 @@
                 <if test="itemProductName !=null and itemProductName !=''">
                     AND (oi.item_product_color like CONCAT('%',#{itemProductName},'%') OR oi.item_product_name LIKE CONCAT('%',#{itemProductName},'%'))
                 </if>
+                <if test="colorId !=null and colorId !=''">
+                    AND oi.item_color_id = #{colorId}
+                </if>
                 <if test="salesIds != null and salesIds != ''">
                     AND sales_id IN
                     <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
@@ -221,6 +224,9 @@
       <if test="itemProductName !=null and itemProductName !=''">
           AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
       </if>
+      <if test="colorId !=null and colorId !=''">
+            AND oi.item_color_id = #{colorId}
+      </if>
       <if test="startDate != null and startDate != ''">
         AND sales_create_time <![CDATA[>=]]> #{startDate}
       </if>
@@ -1277,7 +1283,8 @@
         LEFT JOIN tb_rst_sales_order_item oi ON t.sales_id = oi.item_order_id
         <where>
             t.sales_batch_id != 'KS00000000000001'
-            AND  t.sales_status = 1
+            AND t.sales_status = 1
+            AND t.sales_shipping_status > 0
             <if test="salesShippingStatus !=null">
                 AND t.sales_shipping_status =  #{salesShippingStatus}
             </if>

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

@@ -778,8 +778,8 @@ public class AdminOrderController {
         titles.add("商品名称");
         //titles.add("商品颜色");
         titles.add("商品数量");
-        //titles.add("销售公司名称");
-        //titles.add("店铺名称");
+        titles.add("销售公司名称");
+        titles.add("店铺名称");
         titles.add("出库日期");
         model.put("titles", titles);
         PtsBatch ptsBatch = new PtsBatch();
@@ -851,11 +851,11 @@ public class AdminOrderController {
                 String frim = replace(salesOrder.getSalesPostFirm());
                 row.add(frim);
                 row.add(salesOrder.getSalesPostNum() == null ? null:salesOrder.getSalesPostNum());
-                row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName());
+                row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName()+(salesOrder.getItemProductColor() == null ? null:"-"+salesOrder.getItemProductColor()));
                 //row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
                 row.add(salesOrder.getItemNum() == null ? null:salesOrder.getItemNum());
-                //row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
-                //row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
+                row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
+                row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
                 row.add(salesOrder.getSalesDeliverTime() == null ? null:formatter.format(salesOrder.getSalesDeliverTime()));
                 countexts.add(row);
             }

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

@@ -133,12 +133,21 @@ public class AwaitSendController {
         // 查询确认的订单
         salesOrder.setSalesStatus(1);
         PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(1, 1000, salesOrder, false);
+        // 待发货产品总数
+        int waitProductTotal = 0;
         // 查询订单项
         if (pagedResult != null && pagedResult.getDataList() != null && !pagedResult.getDataList().isEmpty()) {
             for (SalesOrder temp : pagedResult.getDataList()) {
                 SalesOrderItem item = new SalesOrderItem();
                 item.setItemOrderId(temp.getSalesId());
-                temp.setSalesOrderItemList(salesOrderService.listSalesOrderItem(item));
+                List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
+                // 计算产品数量
+                if (items != null && !items.isEmpty()) {
+                    for (SalesOrderItem itemTemp : items) {
+                        waitProductTotal += itemTemp.getItemNum();
+                    }
+                }
+                temp.setSalesOrderItemList(items);
             }
         }
 
@@ -165,7 +174,11 @@ public class AwaitSendController {
             }
         }
 
-        return new ModelAndView("order/salesOrder/print_order").addObject("page", postMap).addObject("orderSize", pagedResult.getDataList().size()).addObject("errorOrderNum", errorOrderNum);
+        return new ModelAndView("order/salesOrder/print_order")
+                .addObject("page", postMap)
+                .addObject("orderSize", pagedResult.getDataList().size())
+                .addObject("errorOrderNum", errorOrderNum)
+                .addObject("waitProductTotal", waitProductTotal);
     }
 
     /**
@@ -558,6 +571,7 @@ public class AwaitSendController {
             //今日
             allSalesOrder.setStartDate(calendarStart.getTime());
             allSalesOrder.setEndDate(calendarEnd.getTime());
+            allSalesOrder.setSalesShippingStatus(12);//不查询未发货未确认订单
 
             waitSalesOrder.setStartDate(calendarStart.getTime());
             waitSalesOrder.setEndDate(calendarEnd.getTime());
@@ -571,6 +585,7 @@ public class AwaitSendController {
 
             allSalesOrder.setStartDate(calendarStart.getTime());
             allSalesOrder.setEndDate(calendarEnd.getTime());
+            allSalesOrder.setSalesShippingStatus(12);//不查询未发货未确认订单
 
             waitSalesOrder.setStartDate(calendarStart.getTime());
             waitSalesOrder.setEndDate(calendarEnd.getTime());

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_detail.ftl

@@ -52,6 +52,14 @@
     <title>客诉基本信息</title>
 </head>
 <body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i>
+    <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>
+    <a class="btn radius r"
+       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
+       href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
+</nav>
 <article class="cl pd-20">
     <form action="" method="post" class="form form-horizontal" id="form-article-add">
         <div class="row cl">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -65,6 +65,9 @@
     <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>
+    <a class="btn radius r"
+       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
+       href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;">
     <div class="pd-20 cl">

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

@@ -157,11 +157,11 @@
                 <td style="text-align: left;">
                     <div class="formControls col-10 col-sm-10 skin-minimal customerSourceType_text_all"  style="width: 100%;">
                         <div class="radio-box">
-                            <input type="radio" id="post-type-1" name="product-post-type" value="ems" checked >
+                            <input type="radio" id="post-type-1" name="product-post-type" value="EMS" checked >
                             <label for="post-type-1" style="height: 30px; line-height: 30px;">EMS</label>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="post-type-2" name="product-post-type" value="sto" >
+                            <input type="radio" id="post-type-2" name="product-post-type" value="STO" >
                             <label for="post-type-2" style="height: 30px; line-height: 30px;">申通</label>
                         </div>
                     </div>

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

@@ -188,7 +188,7 @@
         </#if>
         </tbody>
 
-        <div id="temp-print-order" style="zoom:0.95;display:none"></div>
+        <div id="temp-print-order" style="zoom:0.9;display:none"></div>
     </table>
 </div>
 <div style="position: absolute;margin-left: 20px;">

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

@@ -18,7 +18,7 @@
 
     <div class="order-list">
         <div>
-            本次共 <span style="color: red;">${(orderSize)!"0"}</span> 个订单&nbsp;&nbsp;未分配物流的订单数量: <span style="color: red;">${errorOrderNum}</span>
+            本次共 <span style="color: red;">${(orderSize)!"0"}</span> 个订单&nbsp;&nbsp; 产品共 <span style="color: red;">${(waitProductTotal)!"0"}</span>&nbsp;&nbsp;未分配物流的订单数量: <span style="color: red;">${errorOrderNum}</span>
             <p style="margin-top: 5px;color: blue;">请设置好默认打印机：Windows开始菜单 >> 设备和打印机 >> 寻找到要打印的机器，将其设置为默认打印机</p>
         </div>
         <div class="mt-20" style="height: 500px;overflow: auto;overflow-x: hidden;margin-bottom: 12px;border: 1px solid #ddd;">
@@ -80,7 +80,7 @@
             <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;margin-left: -0.7%" id="sub-post">开始打印</button>
         </div>
 
-        <div id="temp-print-order" style="zoom:0.95;display:none"></div>
+        <div id="temp-print-order" style="zoom:0.9;display:none"></div>
 
         <div id="print-pageview-div" style="display: none"></div>
     </div>

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

@@ -120,19 +120,33 @@
                         <#if (order.salesCustomerId)??>
                             <div>
                                 <#if order.customerIsSolve == 1>
-                                    已解决
+                                <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                    <font color=#06c>已解决</font>
+                                </a>
                                 <#elseif order.customerIsSolve == 2>
-                                    未解决
+                                <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                    <font color=#06c>未解决</font>
+                                </a>
                                 <#elseif order.customerIsSolve == 3>
-                                    换
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                        <font color=#06c>换</font>
+                                    </a>
                                 <#elseif order.customerIsSolve == 4>
-                                    修
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                        <font color=#06c>修</font>
+                                    </a>
                                 <#elseif order.customerIsSolve == 5>
-                                    补
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                        <font color=#06c>补</font>
+                                    </a>
                                 <#elseif order.customerIsSolve == 6>
-                                    退
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                        <font color=#06c>退</font>
+                                    </a>
                                 <#elseif order.customerIsSolve == 7>
-                                    无理由退货
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                        <font color=#06c>无理由退货</font>
+                                    </a>
                                 </#if>
                             </div>
                         <#else>
@@ -191,9 +205,10 @@
                         </#if>
                     </td>
                     <td>
-                        <#list logisticsInfoList as logisticsInfo>
+                        <#--<#list logisticsInfoList as logisticsInfo>
                             <#if order.salesPostFirm??><#if order.salesPostFirm == logisticsInfo.logisticsRstCode>${logisticsInfo.logisticsName}</#if> </#if>
-                        </#list>
+                        </#list>-->
+                        ${order.salesPostFirm!''}
                     <br>
                     ${order.salesPostNum!''}
                     </td>
@@ -711,6 +726,14 @@
                 });
             });
         }
+
+        /**
+         *跳转到详情页面
+         * @param employee
+         */
+        function admin_details_customer(customerId) {
+            window.location.href= "${path}/admin/customer/_customer_info?customerId="+customerId;
+        }
     </script>
 </body>
 </html>