出库

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

@@ -728,6 +728,7 @@ public class AdminOrderController {
      */
     @ResponseBody
     @RequestMapping("/val_download_order_excel")
+    @RequiresPermissions("salesOrder:download:Logistics")
     public ResponseJson valDownloadOrderExcel(HttpServletRequest request,SalesOrder so) throws Exception {
         ResponseJson rj = ResponseJson.getFAILURE();
         Integer num = salesOrderService.listSalesOrderAndItemNum(so);
@@ -745,6 +746,7 @@ public class AdminOrderController {
      * @throws IOException
      */
     @RequestMapping("/download_order_excel")
+    @RequiresPermissions("salesOrder:download:Logistics")
     public ModelAndView downloadOrderExcel(HttpServletRequest request,SalesOrder so) throws Exception {
 
         List<SalesOrder> temporarySalesOrderList = salesOrderService.listSalesOrderAndItem(so);

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

@@ -1004,7 +1004,7 @@ public class AdminSalesOrderController {
 
 
     @RequestMapping("/to_download_order_excel")
-    @RequiresPermissions("salesOrder:select:salesOrder")
+    @RequiresPermissions("salesOrder:download:Logistics")
     public ModelAndView downloadOrderExcel(HttpServletRequest request, SalesOrder salesOrder) throws Exception {
         ModelAndView mv = new ModelAndView("order/salesOrder/download_order");
         List<StoreInfo> listStoreInfo = storeInfoService.listStore(new StoreInfo());

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

@@ -207,7 +207,8 @@ public class AwaitSendController {
             eOrderRequestData.setCustomerPwd("Iamberry321.");
             eOrderRequestData.setSendSite("广东东莞公司");
         } else if (post.equalsIgnoreCase("DBL")) {
-            eOrderRequestData.setCustomerName("月结编码");
+            //德邦
+            eOrderRequestData.setCustomerName("651476854");
         }
         // 收件人信息
         String[] addrs = salesOrderInfo.getSalesAddressInfo().split("-");
@@ -348,6 +349,8 @@ public class AwaitSendController {
     @RequestMapping(value = "/to_manual_delivery")
     public ModelAndView toDistributionPostFirm(HttpServletRequest request,String salesId) {
         ModelAndView mv = new ModelAndView("order/salesOrder/manual_delivery");
+        List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
+        mv.addObject("logisticsInfoList",logisticsInfoList);
         mv.addObject("salesId",salesId);
         return mv;
     }

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

@@ -28,7 +28,7 @@
 <!--  录入订单 -->
 <div class="page-container">
     <div class="" id="form-download">
-        <form action="${path}/admin/salesOrder/list_order_page" method="post" style="margin-left: 24px;">
+        <form action="" 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>

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

@@ -72,7 +72,7 @@
         </thead>
         <tbody>
         <#if (page.dataList?size <= 0)>
-            <tr class="text-c"><td colspan="12">暂无数据</td></tr>
+            <tr class="text-c"><td colspan="13">暂无数据</td></tr>
         <#else>
             <#list page.dataList as o>
             <tr class="text-c">

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

@@ -33,21 +33,9 @@
         <div class="input-box"  >
             <span class="input-dic spanhidth" style="margin-top: 5px;margin-left: 110px;">快递方式：</span>
             <select class="my-select" name="salesPostFirm" id="salesPostFirm" style="height: 36px;width: 200px">
-                <option value="sto">申通快递</option>
-                <option value="yto">圆通快递</option>
-                <option value="sf">顺丰快递</option>
-                <option value="ems">邮政EMS</option>
-                <option value="zto">中通快递</option>
-                <option value="zjs">宅急送</option>
-                <option value="yunda">韵达快递</option>
-                <option value="cces">cces快递</option>
-                <option value="pick">上门提货</option>
-                <option value="htky">汇通快递</option>
-                <option value="ttkdex">天天快递</option>
-                <option value="stars">星晨急便</option>
-                <option value="jd">京东快递</option>
-                <option value="01">其他</option>
-                <option value="02">上门送货</option>
+                <#list logisticsInfoList as logisticsInfo>
+                    <option value="${logisticsInfo.logisticsRstCode}">${logisticsInfo.logisticsName}</option>
+                </#list>
             </select>
         </div>
 

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

@@ -185,43 +185,9 @@
                         </#if>
                     </td>
                     <td>
-                        <#if order.salesPostFirm??>
-                            <#if order.salesPostFirm == 'sto'>
-                                申通快递
-                            <#elseif order.salesPostFirm == 'yto'>
-                                圆通快递
-                            <#elseif order.salesPostFirm == 'sf'>
-                                顺丰快递
-                            <#elseif order.salesPostFirm == 'ems'>
-                                邮政EMS
-                            <#elseif order.salesPostFirm == 'zto'>
-                                中通快递
-                            <#elseif order.salesPostFirm == 'zjs'>
-                                宅急送
-                            <#elseif order.salesPostFirm == 'yunda'>
-                                韵达快递
-                            <#elseif order.salesPostFirm == 'cces'>
-                                cces快递
-                            <#elseif order.salesPostFirm == 'pick'>
-                                上门提货
-                            <#elseif order.salesPostFirm == 'htky'>
-                                汇通快递
-                            <#elseif order.salesPostFirm == 'ttkdex'>
-                                天天快递
-                            <#elseif order.salesPostFirm == 'stars'>
-                                星晨急便
-                            <#elseif order.salesPostFirm == 'jd'>
-                                京东快递
-                            <#elseif order.salesPostFirm == '01'>
-                                其他
-                            <#elseif order.salesPostFirm == '02'>
-                                上门送货
-                            <#elseif order.salesPostFirm == 'eyb'>
-                                E邮宝
-                            <#elseif order.salesPostFirm == 'dbkd'>
-                                德邦物流
-                            </#if>
-                        </#if>
+                        <#list logisticsInfoList as logisticsInfo>
+                            <#if order.salesPostFirm??><#if order.salesPostFirm == logisticsInfo.logisticsRstCode>${logisticsInfo.logisticsName}</#if> </#if>
+                        </#list>
                     <br>
                     ${order.salesPostNum!''}
                     </td>