Home Explore Help
Sign In
hexiugang
/
iamberry-common-parent
Watch 3
Star 3
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

wangxiaoming 6 years ago
parent
f17c352425 11e042ebbf
commit
6110c4c53a
3 changed files with 35 additions and 9 deletions
Unified View Show Diff Stats
  1. 27 1
      watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java
  2. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_custome_list.ftl
  3. 7 7
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

+ 27 - 1
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java
View File 

@@ -75,6 +75,30 @@ public class AwaitSendController {
 
         }
 
         }
 
         List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
 
         List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
 
 
 
+
 
+        PagedResult<SalesOrder> pagedResults = salesOrderService.listSalesOrderPage(1, 10000, salesOrder,totalNum == 0);
 
+        int errorOrderNum = 0;
 
+        // 聚合打单方式
 
+        Map<String, List<SalesOrder>> postMap = new HashMap<>();
 
+        if (pagedResults != null && pagedResults.getDataList() != null && !pagedResults.getDataList().isEmpty()) {
 
+            for (SalesOrder temp : pagedResults.getDataList()) {
 
+                LogisticsInfo info = new LogisticsInfo();
 
+                info.setLogisticsRstCode(temp.getSalesPostFirm());
 
+                List<LogisticsInfo> logisticsInfos = salesOrderService.getLogisticsInfo(info);
 
+                if (logisticsInfos == null || logisticsInfos.size() <= 0) {
 
+                    errorOrderNum ++;
 
+                    continue;
 
+                }
 
+                String key = logisticsInfos.get(0).getLogisticsName();
 
+                List<SalesOrder> list = postMap.get(key);
 
+                if (list == null) {
 
+                    list = new ArrayList<>();
 
+                    postMap.put(key, list);
 
+                }
 
+                list.add(temp);
 
+            }
 
+        }
 
+
 
         salesOrder.setSalesOrderItemList(null);
 
         salesOrder.setSalesOrderItemList(null);
 
         ModelAndView mv = new ModelAndView("order/salesOrder/list_wait_send_order");
 
         ModelAndView mv = new ModelAndView("order/salesOrder/list_wait_send_order");
 
         StitchAttrUtil.getSa()
 
         StitchAttrUtil.getSa()
 
@@ -82,6 +106,8 @@ public class AwaitSendController {
 
                 .setModelAndView(salesOrder, mv, "/admin/await_send/listAwaitSendOrder", pagedResult);
 
                 .setModelAndView(salesOrder, mv, "/admin/await_send/listAwaitSendOrder", pagedResult);
 
         mv.addObject("req",salesOrder);
 
         mv.addObject("req",salesOrder);
 
         mv.addObject("logisticsInfoList",logisticsInfoList);
 
         mv.addObject("logisticsInfoList",logisticsInfoList);
 
+        mv.addObject("postMap", postMap);
 
+        mv.addObject("errorOrderNum", errorOrderNum);
 
         return mv;
 
         return mv;
 
     }
 
     }
 
 
 
@@ -91,7 +117,7 @@ public class AwaitSendController {
 
     public ModelAndView printOrderUI(@RequestParam(value = "orderId", required = false) String[] orders) {
 
     public ModelAndView printOrderUI(@RequestParam(value = "orderId", required = false) String[] orders) {
 
         SalesOrder salesOrder = new SalesOrder();
 
         SalesOrder salesOrder = new SalesOrder();
 
         if (orders == null) {
 
         if (orders == null) {
 
-            salesOrder.setSalesShippingStatus(1);
 
+            salesOrder.setSalesShippingStatus(11);
 
         } else {
 
         } else {
 
             salesOrder.setSalesIds(orders);
 
             salesOrder.setSalesIds(orders);
 
         }
 
         }

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_custome_list.ftl
View File 

@@ -28,7 +28,7 @@
 
     <div class="text-c">
 
     <div class="text-c">
 
         <form action="" id="customer_condition" method="post">
 
         <form action="" id="customer_condition" method="post">
 
             <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="客诉编号" id="customerId" name="customerId">
 
             <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="客诉编号" id="customerId" name="customerId">
 
-            <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="姓名" id="customerName" name="customerName">
 
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="姓名/昵称" id="customerName" name="customerName">
 
             <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="手机号码" id="customerTel" name="customerTel">
 
             <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="手机号码" id="customerTel" name="customerTel">
 
             <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
 
             <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
 
                 <option value="">处理结果</option>
 
                 <option value="">处理结果</option>

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

@@ -16,7 +16,7 @@
 
 <body style="margin-bottom: 30px">
 
 <body style="margin-bottom: 30px">
 
 
 
 <div class="page-container">
 
 <div class="page-container">
 
-    <pre style="font-size: 14px;margin-top: -1%;">待发货：EMS（300）  申通（500）</pre>
 
+    <pre style="font-size: 14px;margin-top: -1%;">待发货：<#list postMap?keys as key>${key}（${postMap[key]?size}）</#list></pre>
 
 
 
     <div class="text-c">
 
     <div class="text-c">
 
         <form action="${path}/admin/await_send/listAwaitSendOrder" method="POST" id="search-form">
 
         <form action="${path}/admin/await_send/listAwaitSendOrder" method="POST" id="search-form">
 
@@ -59,7 +59,7 @@
 
             <#--<th width="40">客户备注</th>-->
 
             <#--<th width="40">客户备注</th>-->
 
             <th width="40">后台备注</th>
 
             <th width="40">后台备注</th>
 
             <th width="40">下单时间</th>
 
             <th width="40">下单时间</th>
 
-            <th width="50">操作</th>
 
+            <th width="60">操作</th>
 
         </tr>
 
         </tr>
 
         </thead>
 
         </thead>
 
         <tbody>
 
         <tbody>
 
@@ -137,14 +137,14 @@
 
                 <td>${(o.salesCreateTime?string("yyyy-MM-dd"))!}</td>
 
                 <td>${(o.salesCreateTime?string("yyyy-MM-dd"))!}</td>
 
                 <td class="td-manage">
 
                 <td class="td-manage">
 
                     <#if o.salesShippingStatus == 11>
 
                     <#if o.salesShippingStatus == 11>
 
-                        <a title="打单发货" href="javascript:window.location.href='${path}/admin/await_send/printOrderUI?orderId=${o.salesId}'" class="ml-5" style="text-decoration:none">打单发货</a>
 
+                        <a title="打单发货" href="javascript:window.location.href='${path}/admin/await_send/printOrderUI?orderId=${o.salesId}'" class="ml-5" style="text-decoration:none;display:inline">打单发货</a><br>
 
                     <#else>
 
                     <#else>
 
-                        <a title="重新打单" href="javascript:re_print_order('${(o.salesOrderId)!}')" class="ml-5" style="text-decoration:none">重新打单</a>
 
+                        <a title="重新打单" href="javascript:re_print_order('${(o.salesOrderId)!}')" class="ml-5" style="text-decoration:none;display:inline">重新打单</a><br>
 
                     </#if>
 
                     </#if>
 
                 <#if o.salesShippingStatus == 11>
 
                 <#if o.salesShippingStatus == 11>
 
-                    <a style="text-decoration:none;" href="javascript:void(0);" title="手动发货"onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${o.salesId}','570','450');">
 
+                    <a style="text-decoration:none;display:inline" href="javascript:void(0);" title="手动发货"onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${o.salesId}','570','450');">
 
                         手动发货
 
                         手动发货
 
-                    </a>
 
+                    </a><br>
 
                 </#if>
 
                 </#if>
 
                 </td>
 
                 </td>
 
             </tr>
 
             </tr>
 
@@ -155,7 +155,7 @@
 
 </div>
 
 </div>
 
 <div style="position: absolute;margin-left: 20px;">
 
 <div style="position: absolute;margin-left: 20px;">
 
     <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="print-order-send"> 打单发货 </button>
 
     <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="print-order-send"> 打单发货 </button>
 
-    <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);margin-left: 20px" id="print-all-order"> 查询已通知配合的订单 </button>
 
+    <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);margin-left: 20px" id="print-all-order"> 打印全部待发货订单 </button>
 
 </div>
 
 </div>
 
 <#include "/base/page_util.ftl">
 
 <#include "/base/page_util.ftl">
 
 <script type="text/javascript">
 
 <script type="text/javascript">