wangxiaoming %!s(int64=6) %!d(string=hai) anos
pai
achega
f9fdb1fba6

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

@@ -198,14 +198,17 @@ public class AwaitSendController {
             eOrderRequestData.setCustomerPwd("90000009971400");
         } else if (post.equalsIgnoreCase("SF")) {
             // 顺丰
-            eOrderRequestData.setMonthCode("7690035114");
+           // eOrderRequestData.setMonthCode("7690035114");
         } else if (post.equalsIgnoreCase("YZBK")) {
             // 省外EMS (无需操作)
         } else if (post.equalsIgnoreCase("STO")) {
             // 申通快递
-            eOrderRequestData.setCustomerName("爱贝源");
-            eOrderRequestData.setCustomerPwd("Iamberry321.");
-            eOrderRequestData.setSendSite("广东东莞公司");
+//            eOrderRequestData.setCustomerName("爱贝源");
+//            eOrderRequestData.setCustomerPwd("Iamberry321.");
+//            eOrderRequestData.setSendSite("广东东莞公司");
+            eOrderRequestData.setCustomerName("teststo");
+            eOrderRequestData.setCustomerPwd("teststopwd.");
+            eOrderRequestData.setSendSite("teststosendsite");
         } else if (post.equalsIgnoreCase("DBL")) {
             eOrderRequestData.setCustomerName("月结编码");
         }
@@ -446,30 +449,28 @@ public class AwaitSendController {
         try{
             salesOrder = salesOrderService.getSalesOrderByPostNum(postNum);
         }catch (Exception e){
-            rj.setResultMsg("出货失败,物流单号异常,该物流单号可能存在多个订单中!");
+            rj.setResultMsg("出货失败,物流单号("+postNum+")异常,该物流单号可能存在多个订单中!");
             return rj;
         }
         if(salesOrder == null){
-            rj.setResultMsg("出货失败,未查询到订单。");
+            rj.setResultMsg("出货失败,该物流单号("+postNum+")未查询到订单。");
             return rj;
         }
         if(salesOrder.getSalesShippingStatus() != 1){
-            rj.setResultMsg("出货失败,该订单未发货。");
+            rj.setResultMsg("出货失败,该物流单号("+postNum+")对应的订单未发货。");
             return rj;
         }
         if(2 == salesOrder.getSalesDeliver()){
-            rj.setResultMsg("该订单已出库。");
+            rj.setResultMsg("出货失败,物流单号("+postNum+")对应的订单已出库。");
             return rj;
         }
-
         Integer flag = salesOrderService.updateDeliver(salesOrder);
         if(flag < 1){
-            rj.setResultMsg("出货失败,请检查该物流单号和订单状态。");
+            rj.setResultMsg("出货失败,请检查该物流单号("+postNum+")和订单状态。");
             return rj;
         }
-
         rj = ResponseJson.getSUCCESS();
-        rj.setResultMsg("出库成功");
+        rj.setResultMsg("物流单号("+ postNum +")出库成功");
         return rj;
     }
 

+ 0 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -270,10 +270,6 @@
 <script type="text/javascript" charset="utf-8" src="${path}/common/js/salesOrder/salesOrder.js"></script>
 
 <script type="text/javascript">
-    var url_path = "${path}";
-</script>
-
-<script type="text/javascript">
 
     $('.skin-minimal input').iCheck({
         checkboxClass: 'icheckbox-blue',

+ 36 - 47
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_list.ftl

@@ -8,7 +8,7 @@
     <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">
+<#include "/base/add_base.ftl">
     <title>出库列表</title>
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
@@ -49,7 +49,7 @@
 
 <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;">
+        <form action="${path}/admin/await_send/deliver" method="post" class="form form-horizontal" id="form-order-add"  >
 
             <div class="row cl">
                 <label class="form-label col-3">
@@ -66,9 +66,9 @@
                 </div>
 
                 <div class="formControls col-1 col-sm-1" style="width: 100px;">
-                    <input type="button" style="" class="btn btn-primary add-order-button" onclick="deliver()" value="出库" >
+                    <input type="submit" style="" class="btn btn-primary add-order-button"  value="出库" >
                 </div>
-                <div class="formControls col-2 col-sm-2 "  id="msg" style="display: none; line-height: 31px;color:#f00">
+                <div class="formControls col-6 col-sm-6"  id="msg" style="display: none; line-height: 31px;color:#f00">
                 </div>
             </div>
             <#--<div class="row cl">-->
@@ -78,61 +78,50 @@
                 <#--<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(){
-        $('#postNum').bind('input propertychange', function() {
-            var value =  $('#postNum').val();
-            $(this).val(value);
-
-            $("#msg").hide();
-
-            if(isAutomaticDeliver == 1){
-                deliver();
-            }
-        });
-    })
-
-    /**
-     *  出库
-     * @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){
-                $("#msg").show();
-                $("#msg").html(data.resultMsg);
-                layer.close(index);
+        var loadIndex = 0;
+        $("#form-order-add").Validform({
+            tiptype: function (msg, o, cssctl) {
+                if (o.type == 3) {//失败
+                    layer.msg(msg, {icon: 5, time: 3000});
+                    $(window).scrollTop(o.obj.offset().top - 40);
+                }
+            },
+            datatype: {//自定义验证类型
             },
-            error: function(){
-                layer.close(index);
+            ignoreHidden: true,
+            tipSweep: true, //若为true,则只在表单提交时验证
+            ajaxPost: true, //异步提交
+            beforeCheck: function (curform) {  //验证通过之前执行的函数
+                var flag = false;
+            },
+            beforeSubmit: function (curform) {  //验证通过之后执行的函数
+                loadIndex = layer.load(1, {
+                    shade: [0.5,'#fff'] //0.1透明度的白色背景
+                });
+            },
+            callback: function (data) {//异步回调函数
+                if (data) {
+                    $("#msg").show();
+                    $("#msg").html(data.resultMsg);
+                    if(data.returnCode == 200){
+                        $("#postNum").val();
+                    }
+                }
+                layer.close(loadIndex);
+                return false;
             }
         });
-        layer.close(index);
-    }
+    });
+
 </script>
 </body>
 </html>

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

@@ -27,8 +27,8 @@
 <body>
 <!--  录入订单 -->
 <div class="page-container">
-    <div class="text-c" id="form-download">
-        <form action="${path}/admin/salesOrder/list_order_page" method="post">
+    <div class="" id="form-download">
+        <form action="${path}/admin/salesOrder/list_order_page" 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>
@@ -64,12 +64,12 @@
                     </#if>
                 </select>
 
-            <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.startDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>-
-            <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.endDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
+            <input type="text" style="width:120px;height:36px;margin-right: 0px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.startDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
+            <input type="text" style="width:120px;height:36px;margin-right: 0px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.endDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
 
             <#--<input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;" value="${salesOrder.salesOrderId!}" placeholder="百胜订单号" name="salesOrderId" id="salesOrderId">-->
             <#--<input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;" value="${salesOrder.salesDealCode!}" placeholder="交易号" name="salesDealCode" id="salesDealCode">-->
-            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;" value="${salesOrder.salesBatchId!}" placeholder="订单批次号" name="salesBatchId" id="salesBatchId">
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;padding: 0px;" value="${salesOrder.salesBatchId!}" placeholder="订单批次号" name="salesBatchId" id="salesBatchId">
             <#--<input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">-->
             <#--<input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="收货人电话" name="salesAddressTel" id="salesAddressTel">-->
 

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

@@ -47,6 +47,7 @@
             <input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.salesAddressTel)!}" placeholder="收件人手机" id="salesAddressTel" name="salesAddressTel">
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" onclick="orderSend()" id="" name="">打单发货</button>
+            <button onClick="downloadOrderPage();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载订单">下载订单</button>
         </form>
     </div>
      <table class="table table-border table-bordered table-hover" style="margin-top: 20px">
@@ -244,7 +245,12 @@
         layer_show(title,url,w,h);
     }
 
-
+    /**
+     * 跳转到下载页面
+     */
+    function downloadOrderPage(){
+        layer_show("商品列表","${path}/admin/salesOrder/to_download_order_excel","600","250");
+    }
 </script>
 
 <script>

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

@@ -86,7 +86,7 @@
             <input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressInfo!}" placeholder="收货人地址" name="salesAddressInfo" id="salesAddressInfo">
 
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
-            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 下载订单</button>
+            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 下载Efast格式订单</button>
             <#--<button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传第三方平台订单</button>-->
             <button onClick="upFiles2();"  class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传发货信息</button>
             <#--<button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载第三方平台的发货信息"><i class="Hui-iconfont">&#xe640;</i> 下载发货后订单</button>-->
@@ -313,7 +313,6 @@
      */
     function downloadOrderPage(){
         layer_show("商品列表","${path}/admin/salesOrder/to_download_order_excel","600","250");
-        <#--window.location.href= "${path}/admin/salesOrder/download_order_page";-->
     }
 
     /*onMouseOver="showDownloadOrderInfo();" onMouseOut="hideDownloadOrderInfo();"*/