Accueil Explorer Aide
Connexion
hexiugang
/
iamberry-common-parent
Suivre 3
Voter 3
Fork 1
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

定时任务，去掉efast拉取订单功能
出库统计页面修改

wangxiaoming il y a 6 ans
Parent
ad0b05e297
commit
339a0855af
4 fichiers modifiés avec 80 ajouts et 28 suppressions
Vue séparée Afficher les stats Diff
  1. 1 1
      watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml
  2. 4 4
      watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java
  3. 27 23
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_statistics.ftl
  4. 48 0
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

+ 1 - 1
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml
Voir le fichier 

@@ -1073,7 +1073,7 @@
 
                 AND t.sales_shipping_status = #{salesShippingStatus}
 
             </if>
 
             <if test="salesDeliver !=null">
 
-                AND sales_deliver = #{salesDeliver}
 
+                AND t.sales_deliver = #{salesDeliver}
 
             </if>
 
             <if test="salesStoreId !=null and salesStoreId !=''">
 
                 AND t.sales_store_id = #{salesStoreId}

+ 4 - 4
watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java
Voir le fichier 

@@ -123,10 +123,10 @@ public class MQTask implements InitializingBean {
 
 	}
 
 
 	/**
 
-	 * 批量同步百胜订单信息 -- 客诉系统
 
+	 * 批量同步百胜订单信息 -- 客诉系统 -- 作废
 
 	 * @throws Exception
 
 	 */
 
-	 @Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
 
+	 //@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
 
 	//@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次
 
 	//@Scheduled(cron = "*/10 * * * * ?")
 
 	public void syncEfastOrderList() throws Exception {
 
@@ -162,10 +162,10 @@ public class MQTask implements InitializingBean {
 
 	}
 
 
 	/**
 
-	 * 同步百胜订单状态等信息----客诉系统
 
+	 * 同步百胜订单状态等信息----客诉系统 -- 作废
 
 	 * @throws Exception
 
 	 */
 
-	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
 
+	//@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
 
 //	@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次
 
 	//@Scheduled(cron = "*/10 * * * * ?")
 
 	public void syncEfastOrderStatus() throws Exception {

+ 27 - 23
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_statistics.ftl
Voir le fichier 

@@ -38,6 +38,8 @@
 
         .col-sm-1{width: 150px;}
 
 
         .all_down{text-decoration: underline;color: #00c;}
 
+
 
+        .bold{    color: #f00;font-weight: bold;}
 
     </style>
 
 </head>
 
 <body>
 
@@ -61,7 +63,7 @@
 
 
                                 <table class="table table-border table-bg table-bordered">
 
                                     <tbody id="todayOrderNumber">
 
-
 
+                                    <tr class="text-c"><td width="16">产品名称</td><td width="16">总数</td><td width="16">已发货</td><td width="16">已出库</td></tr>
 
                                     </tbody>
 
                                 </table>
 
                             </td>
 
@@ -72,18 +74,8 @@
 
 
                                 <table class="table table-border table-bg table-bordered">
 
                                     <tbody id="yesterdayOrderNumber">
 
-                                        <tr class="text-c">
 
-                                            <td width="16">产品名称</td>
 
-                                            <td width="16">总数</td>
 
-                                            <td width="16">已发货</td>
 
-                                            <td width="16">已出库</td>
 
-                                        </tr>
 
-                                        <tr class="text-c">
 
-                                            <td width="16">WaterO WA-1桌面净饮水机(橘子红)</td>
 
-                                            <td width="16">0</td>
 
-                                            <td width="16">1</td>
 
-                                            <td width="16">1</td>
 
-                                        </tr>
 
+                                    <tr class="text-c"><td width="16">产品名称</td><td width="16">总数</td><td width="16">已发货</td><td width="16">已出库</td></tr>
 
+
 
                                     </tbody>
 
                                 </table>
 
 
@@ -118,23 +110,35 @@
 
             },
 
             dataType: 'json',
 
             success:function(res) {
 
-                var html = '<tr class="text-c"><td width="16">产品名称</td><td width="16">总数</td><td width="16">已发货</td><td width="16">已出库</td></tr>';
 
+//                var html = '<tr class="text-c"><td width="16">产品名称</td><td width="16">总数</td><td width="16">已发货</td><td width="16">已出库</td></tr>';
 
                 for(var i=0;i<res.returnMsg.list.length;i++){
 
+                    var html = '';
 
                     var order = res.returnMsg.list[i];
 
+                    var style;
 
                     html += '<tr class="text-c">';
 
                     html += '<td width="16">'+ order.productName + '('+ order.colorName +')' +'</td>';
 
                     html += '<td width="16">'+ order.allNum +'</td>';
 
-                    html += '<td width="16">'+ order.waitNum +'</td>';
 
-                    html += '<td width="16">'+ order.sendNum +'</td>';
 
+                    if(order.waitNum < order.allNum){
 
+                        style =  "bold";
 
+                    }else{
 
+                        style =  "";
 
+                    }
 
+                    html += '<td width="16" class="'+ style +'" >'+ order.waitNum +'</td>';
 
+                    if(order.sendNum < order.allNum){
 
+                        style =  "bold";
 
+                    }
 
+                    html += '<td width="16" class="'+ style +'">'+ order.sendNum +'</td>';
 
                     html += '</tr>';
 
+
 
+                    if(type == 1){
 
+                        //今日
 
+                        $("#todayOrderNumber").append(html);
 
+                    }else{
 
+                        //昨日
 
+                        $("#yesterdayOrderNumber").append(html);
 
+                    }
 
                 }
 
-                if(type == 1){
 
-                    //今日
 
-                    $("#todayOrderNumber").html(html);
 
-                }else{
 
-                    //昨日
 
-                    $("#yesterdayOrderNumber").html(html);
 
-                }
 
+
 
             }
 
         });
 
     }

+ 48 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl
Voir le fichier 

@@ -172,6 +172,16 @@
 
                     <#if o.salesShippingStatus == 11>
 
                         <a class="ml-5" 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><br>
 
                     </#if>
 
+
 
+                   <#if o.salesDeliver == 1 && o.salesShippingStatus == 1>
 
+                        <a class="ml-5" style="text-decoration:none;display:inline" href="javascript:void(0);" title="标记出库" onclick="sales_deliver(2,'${(o.salesId)!}');">标记出库</a><br>
 
+                    </#if>
 
+
 
+                   <#if o.salesDeliver == 2>
 
+                        <a class="ml-5" style="text-decoration:none;display:inline" href="javascript:void(0);" title="标记未出库" onclick="sales_deliver(1,'${(o.salesId)!}');">标记未出库</a><br>
 
+                   </#if>
 
+
 
+
 
                 </td>
 
             </tr>
 
             </#list>
 
@@ -279,6 +289,44 @@
 
             }
 
         });
 
     }
 
+
 
+
 
+    /**
 
+     * 标记出库状态
 
+     * @param type 1：标记为未出库   2：标记为出库
 
+     */
 
+    function sales_deliver(type,orderId){
 
+        var msg;
 
+        if(1 == type){
 
+            msg = "是否要标记该订单改回未出库状态！"
 
+        }else{
 
+            msg = "是否要标记该订单为已出库状态！"
 
+        }
 
+
 
+        layer.confirm(msg, function(index){
 
+            $.ajax('${path}/admin/await_send/markDeliver?dates=' + new Date().getTime(), {
 
+                data:  {
 
+                    salesId:orderId,
 
+                    type : type
 
+                },
 
+                dataType: 'json',
 
+                type: 'post',
 
+                success: function(dt) {
 
+                    if(dt.resultCode == 200){
 
+                        layer.msg(dt.resultMsg, {icon: 1, time: 3000});
 
+                    }else{
 
+                        layer.msg(dt.resultMsg, {icon: 5, time: 3000});
 
+                    }
 
+                    layer.close(index);
 
+                },
 
+                error: function(xhr, type, errorThrown) {
 
+                    layer.msg("修改状态失败，请重试！", {icon: 5, time: 3000});
 
+                    layer.close(index);
 
+                }
 
+            });
 
+        });
 
+
 
+    }
 
 </script>
 
 </body>
 
 </html>