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

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SalesOrderMapper.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml
#	watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -230,7 +230,6 @@ public interface SalesOrderService {
      * @return
      */
     Integer confirmSalesOrder(Integer salesId);
-
     /**
      * 分配物流方式
      * @param salesOrder
@@ -238,4 +237,10 @@ public interface SalesOrderService {
      */
     Integer distributionExpress(SalesOrder salesOrder);
 
+    /**
+     * 批量分配快递方式
+     * @param salesOrder
+     * @return
+     */
+    Integer listSalesPostFirm(SalesOrder salesOrder);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -851,12 +851,14 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         }
         return flag;
     }
-
     @Override
     public Integer distributionExpress(SalesOrder salesOrder) {
         return salesOrderMapper.distributionExpress(salesOrder);
     }
-
+    @Override
+    public Integer listSalesPostFirm(SalesOrder salesOrder) {
+        return salesOrderMapper.listSalesPostFirm(salesOrder);
+    }
 
 
 }

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

@@ -183,12 +183,17 @@ public interface SalesOrderMapper {
      * @return
      */
     Integer noticeDistribution(SalesOrder salesOrder);
-
     /**
      * 分配物流方式
      * @param salesOrder
      * @return
      */
     Integer distributionExpress(SalesOrder salesOrder);
+    /**
+     * 批量分配快递方式
+     * @param salesOrder
+     * @return
+     */
+    Integer listSalesPostFirm(SalesOrder salesOrder);
 
 }

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

@@ -43,7 +43,7 @@
 
   <!-- 根据id查询订单信息 -->
   <select id="getSalesOrderById" resultType="SalesOrder" parameterType="java.lang.Integer" >
-    select
+    select 
       	t.*,
       	trsc.company_name companyName,
       	trsi.store_efast  storeEfast,
@@ -670,7 +670,7 @@
     </set>
     where sales_deal_code = #{salesDealCode}
   </update>
-
+  
   <select id="getLogisticsInfo" parameterType="LogisticsInfo" resultType="LogisticsInfo">
     SELECT * from tb_rst_logistics_info
     <where>
@@ -802,14 +802,22 @@
         AND
           sales_id = #{salesId}
     </update>
-
     <!-- 分配发货方式 -->
     <update id="distributionExpress" parameterType="SalesOrder">
         update tb_rst_sales_order_info
         SET
-          sales_post_firm = #{salesPostFirm}
+        sales_post_firm = #{salesPostFirm}
         WHERE
-          sales_id = #{salesId}
+        sales_id = #{salesId}
     </update>
 
+    <!-- 批量分配快递方式 -->
+    <update id="listSalesPostFirm" parameterType="SalesOrder" >
+        update tb_rst_sales_order_info
+        SET
+        sales_post_firm = #{salesPostFirm}
+        WHERE
+        sales_batch_id = #{salesBatchId}
+        and sales_shipping_status != 1
+    </update>
 </mapper>

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

@@ -1,5 +1,6 @@
 package com.iamberry.rst.controllers.order;
 
+import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.order.OrderBatch;
 import com.iamberry.rst.core.page.PagedResult;
@@ -86,4 +87,49 @@ public class AdminOrderBatchController {
     }
 
 
+    /**
+     * 按照批次分配快递方式
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("salesOrder:confirm:salesOrder")
+    @RequestMapping("/list_SalesPostFirm")
+    public ResponseJson listSalesPostFirm(HttpServletRequest request, SalesOrder salesOrder) {
+        ResponseJson rj = ResponseJson.getFAILURE();
+        if(salesOrder == null){
+            return rj;
+        }
+        if(salesOrder.getSalesPostFirm() == null || salesOrder.getSalesBatchId() == null){
+            return rj;
+        }
+        /*分配到该批次下的所有订单*/
+        Integer flag = 0;
+        try{
+            flag = salesOrderService.listSalesPostFirm(salesOrder);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        if(flag < 0){
+            return rj;
+        }else{
+            rj = ResponseJson.getSUCCESS();
+            return rj;
+        }
+
+    }
+
+    /**
+     * 跳转到分配快递方式页面
+     *
+     * @return
+     */
+    @RequiresPermissions("salesOrder:confirm:salesOrder")
+    @RequestMapping(value = "/to_distribution_postFirm")
+    public ModelAndView toDistributionPostFirm(HttpServletRequest request,String batchId) {
+        ModelAndView mv = new ModelAndView("order/bacth/distribution_postFirm");
+        mv.addObject("batchId",batchId);
+        return mv;
+    }
+
 }

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

@@ -100,7 +100,31 @@ public class AwaitSendController {
                 temp.setSalesOrderItemList(salesOrderService.listSalesOrderItem(item));
             }
         }
-        return new ModelAndView("order/salesOrder/print_order").addObject("page", pagedResult).addObject("posts", salesOrderService.getLogisticsInfo(new LogisticsInfo()));
+
+        int errorOrderNum = 0;
+
+        // 聚合打单方式
+        Map<String, List<SalesOrder>> postMap = new HashMap<>();
+        if (pagedResult != null && pagedResult.getDataList() != null && !pagedResult.getDataList().isEmpty()) {
+            for (SalesOrder temp : pagedResult.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);
+            }
+        }
+
+        return new ModelAndView("order/salesOrder/print_order").addObject("page", postMap).addObject("orderSize", pagedResult.getDataList().size()).addObject("errorOrderNum", errorOrderNum);
     }
 
     // 打单发货
@@ -136,8 +160,8 @@ public class AwaitSendController {
             // 省外EMS (无需操作)
         } else if (post.equalsIgnoreCase("STO")) {
             // 申通快递
-            eOrderRequestData.setCustomerName("爱贝源母婴直销店");
-            eOrderRequestData.setCustomerPwd("客户密码");
+            eOrderRequestData.setCustomerName("爱贝源");
+            eOrderRequestData.setCustomerPwd("Iamberry321.");
             eOrderRequestData.setSendSite("广东东莞公司");
         } else if (post.equalsIgnoreCase("DBL")) {
             eOrderRequestData.setCustomerName("月结编码");
@@ -179,12 +203,16 @@ public class AwaitSendController {
         SalesOrderItem item = new SalesOrderItem();
         item.setItemOrderId(salesOrderInfo.getSalesId());
         List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
+        String goodName = "";
         for (SalesOrderItem temp : items) {
-            Map<String, Object> product1 = new HashMap<String, Object>();
-            product1.put("GoodsName", temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum());
-            product1.put("GoodsWeight", 10.0);
-            Commodity.add(product1);
+            goodName += temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum() + ";";
         }
+        Map<String, Object> product1 = new HashMap<String, Object>();
+        product1.put("GoodsName", goodName);
+        product1.put("GoodsWeight", 10.0);
+        Commodity.add(product1);
+
+
         eOrderRequestData.setCommodity(Commodity);
         eOrderRequestData.setWeight(1.0);
         eOrderRequestData.setQuantity(1);
@@ -201,7 +229,7 @@ public class AwaitSendController {
                 SalesOrder salesOrder = new SalesOrder();
                 salesOrder.setSalesPostFirm(post);
                 salesOrder.setSalesPostNum(code);
-                salesOrder.setSalesShippingStatus(2);
+                salesOrder.setSalesShippingStatus(1);
                 salesOrder.setSalesSendTime(new Date());
                 salesOrder.setSalesId(salesId);
                 salesOrderService.updateSalesOrder(salesOrder);
@@ -226,7 +254,7 @@ public class AwaitSendController {
                 }
             } else {
                 // 获取电子面单失败
-                LOGGER.info("{} 获取电子名单失败，原因{}", orderId, jsonObject.get("Reason"));
+                LOGGER.error("{} 获取电子面单失败，原因:{}", orderId, jsonObject.get("Reason"));
             }
             return ResponseJson.getSUCCESS().addResponseKeyValue("json", json);
         } catch (Exception e) {

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

@@ -61,7 +61,7 @@
                         <input type="checkbox" name="online" id="remember_me" value="">&nbsp;&nbsp;使我保持登录状态</label>
                 </div>
             </div>
-            <div>
+            <div class="row loginbox_btn">
                 <div class="formControls col-8 col-offset-3">
                     <input name="" id="login-btn" type="submit" class="btn btn-block btn-primary radius size-L my-btn-login" value="&nbsp;登&nbsp;&nbsp;&nbsp;&nbsp;录&nbsp;">
                 </div>

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

@@ -0,0 +1,92 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+<#include "/base/add_base.ftl">
+    <title>分配快递方式</title>
+    <style>
+        .my-title{font-weight: 500;padding-left: 15px;position: relative;}
+        .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
+        .my-input{padding: 8px 5px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-input-date{padding: 8px 10px;border:1px solid rgba(0,0,0,.1);width: 80%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 50%;}
+        .input-box{margin: 18px 0;}
+        .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
+        .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
+        .add-list>li{margin: 10px 0;}
+        .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+    </style>
+    <meta name="keywords" content="${path}">
+    <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
+</head>
+<body>
+<article class="page-container">
+    <form class="form form-horizontal" id="form-admin-add">
+        <div class="input-box"  >
+            <span class="input-dic spanhidth" style="margin-top: 12px;margin-left: 120px;">快递方式：</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>
+            </select>
+        </div>
+
+        <div style="text-align:center;" >
+        <#if batchId??>
+            <input type="hidden" value="${batchId!''}" id="batchId" name="batchId">
+        </#if>
+            <button type="button" class="my-btn-submit" onclick="listSalesPostFirm();">确认分配</button>
+        </div>
+
+    </form>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript">
+
+    /**
+     * 分配快递方式
+     */
+    function listSalesPostFirm(){
+        var batchId = $("#batchId").val();
+        var salesPostFirm = $("#salesPostFirm").val();
+        $.ajax('${path}/admin/order_batch/list_SalesPostFirm?dates=' + new Date().getTime(), {
+            data: {"salesBatchId":batchId,"salesPostFirm" : salesPostFirm},
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                layer.msg('分配快递方式成功',{icon: 1,time:1000},function () {
+                    window.parent.location.reload();
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index)
+                });
+            },
+            error: function(xhr, type, errorThrown) {
+                layer.msg("分配快递方式失败，请重试！", {icon: 5, time: 3000});
+            }
+        });
+    }
+
+</script>
+</body>
+</html>

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

@@ -55,7 +55,7 @@
             <th width="80">店铺</th>
             <th width="50">订单数量</th>
             <th width="50">待审核数量</th>
-            <th width="50">代发货数量</th>
+            <th width="50">待发货数量</th>
             <th width="50">已发货数量</th>
             <#--<th width="100">Excel下载</th>-->
             <#--<th width="80">交易号下载</th>-->
@@ -85,7 +85,9 @@
                                         确认订单
                                     </a>
                                 </#if>
-
+                                <a style="text-decoration:none;color: #00E;" href="javascript:void(0);" title="分配快递方式"onclick="distribution_postFirm('分配快递方式','${path}/admin/order_batch/to_distribution_postFirm?batchId=${batch.batchId!''}','570','450');">
+                                    分配快递方式
+                                </a>
                             </td>
                         </tr>
                     </#list>
@@ -152,6 +154,10 @@
         });
     }
 
+    /*分配快递方式*/
+    function distribution_postFirm(title,url,w,h){
+        layer_show(title,url,w,h);
+    }
 </script>
 </body>
 </html>

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

@@ -15,58 +15,69 @@
 </head>
 <body>
 <div class="page-container">
-    <div class="order-list">
 
+    <div class="order-list">
         <div>
-            本次共 <span style="color: red;">${(page.dataList?size)!"0"}</span> 个订单
+            本次共 <span style="color: red;">${(orderSize)!"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: 330px;overflow: auto;overflow-x: hidden;margin-bottom: 12px;border: 1px solid #ddd;">
-            <table class="table table-border table-bordered table-bg table-hover table-sort">
-                <thead>
-                <tr class="text-c">
-                    <th width="20">状态</th>
-                    <th width="70">订单编号</th>
-                    <th width="30">姓名</th>
-                    <th width="50">电话</th>
-                    <th width="100">收货地址</th>
-                    <th width="100">订单产品</th>
-                </tr>
-                </thead>
-                <tbody id="productHtml">
-                    <#if (page.dataList?size <= 0)>
-                        <tr class="text-c"><td colspan="12">暂无数据</td></tr>
-                    <#else>
-                        <#list page.dataList as o>
-                            <tr class="text-c wait-print-order" printState="1">
-                                <td>待处理</td>
-                                <td salesId="${o.salesId}">${(o.salesOrderId)!}</td>
-                                <td>${(o.salesAddressName)!}</td>
-                                <td>${(o.salesAddressTel)!}</td>
-                                <td>${(o.salesAddressInfo)!}</td>
-                                <td style="text-align: left;">
-                                    <#if o.salesOrderItemList ??>
-                                        <#list o.salesOrderItemList as d>
-                                            <span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span>
-                                        </#list>
-                                    </#if>
-                                </td>
-                            </tr>
-                        </#list>
-                    </#if>
-                </tbody>
-            </table>
-        </div>
+        <div class="mt-20" style="height: 500px;overflow: auto;overflow-x: hidden;margin-bottom: 12px;border: 1px solid #ddd;">
 
-        <div class="formControls col-1 col-sm-1" style="width: 100%;">
-            <select class="select" id="all-post-select" style="margin-left: -15px;height: 31px;width: 150px">
-                <#list posts as d>
-                    <option value="${(d.logisticsRstCode)!}">${(d.logisticsName)!}</option>
+            <!-- 选项卡 头部 -->
+            <div id="tab_demo" class="HuiTab">
+                <div class="tabBar clearfix">
+                <#list page?keys as key>
+                    <span>${key}（${page[key]?size}）</span>
                 </#list>
-            </select>
-            <select class="select" id="print-machine" style="height: 31px;width: 150px;display: none">
-            </select>
-            <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;" id="sub-post">开始打印</button>
+                </div>
+
+            <!-- 选项卡 内容 -->
+            <#assign x = 0>
+            <#list page?values as value>
+                <div class="tabCon">
+                    <table class="table table-border table-bordered table-bg table-hover table-sort">
+                        <thead>
+                        <tr class="text-c">
+                            <th width="20">状态</th>
+                            <th width="70">订单编号</th>
+                            <th width="30">姓名</th>
+                            <th width="50">电话</th>
+                            <th width="100">收货地址</th>
+                            <th width="100">订单产品</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                            <#if (value?size <= 0)>
+                            <tr class="text-c"><td colspan="12">暂无数据</td></tr>
+                            <#else>
+                                <#list value as o>
+                                <tr class="text-c ${x}-wait-print-order" printState="1">
+                                    <td>待处理</td>
+                                    <td salesId="${o.salesId}" post="${(o.salesPostFirm)!}">${(o.salesOrderId)!}</td>
+                                    <td>${(o.salesAddressName)!}</td>
+                                    <td>${(o.salesAddressTel)!}</td>
+                                    <td>${(o.salesAddressInfo)!}</td>
+                                    <td style="text-align: left;">
+                                        <#if o.salesOrderItemList ??>
+                                            <#list o.salesOrderItemList as d>
+                                                <span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span>
+                                            </#list>
+                                        </#if>
+                                    </td>
+                                </tr>
+                                </#list>
+                            </#if>
+                        </tbody>
+                    </table>
+                </div>
+                <#assign x = x + 1>
+            </#list>
+
+            </div>
+        </div>
+
+        <div class="formControls col-1 col-sm-1" style="width: 100%;margin-left: -0.4%;">
+            <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;margin-left: -0.7%" id="sub-post">开始打印</button>
         </div>
 
         <div id="print-pageview-div" style="display: none"></div>
@@ -81,8 +92,11 @@
     // 选择打印设备
     var LODOP=getLodop();
     $(function () {
-        // 获取系统的打印机
-        setPrintMachine();
+        $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0");
+
+
+    // 获取系统的打印机
+        //setPrintMachine();
         function setPrintMachine() {
             var count = LODOP.GET_PRINTER_COUNT() - 1;
             for (var i = 0; i <= count; i++) {
@@ -93,8 +107,8 @@
         // 开始打印
         $("#sub-post").click(function() {
             LODOP.SELECT_PRINTER();
-
-            var orders = $(".wait-print-order");
+            var index = getCurrTab();
+            var orders = $("." + index + "-wait-print-order");
             if (orders == null || orders.length <= 0) {
                 layer.msg("未选中订单",{icon: 2,time:3000});
                 return;
@@ -104,7 +118,8 @@
         });
 
         function nextPrintOrder() {
-            var orders = $(".wait-print-order");
+            var index = getCurrTab();
+            var orders = $("." + index + "-wait-print-order");
             for(var i = 0; i < orders.length; i++) {
                 if ($(orders[i]).attr("printState") == "1") {
                     // 待打印
@@ -116,17 +131,18 @@
         function startPrint() {
             var order = nextPrintOrder();
             if (order == null || typeof(order) == undefined) {
-                alert("打印完成");
+                alert("打印完成，请切换快递公司继续打印");
                 return;
             }
             var $td = $(order.find("td")[1]);
             var orderId = $td.text().trim();
             var salesId = $td.attr("salesId");
+            var post = $td.attr("post");
             // 单个打印
             $.ajax({
                 type: "POST",
                 data: {
-                    "post":$("#all-post-select").val(),
+                    "post":post,
                     "orderId":orderId,
                     "salesId":salesId
                 },
@@ -158,6 +174,15 @@
             });
         }
     });
+
+    function getCurrTab() {
+        var spans = $(".tabBar").find("span");
+        for (var i = 0 ; i < spans.length; i++) {
+            if ($(spans[i]).attr("class").indexOf("current") != -1) {
+                return i;
+            }
+        }
+    }
 </script>
 </body>
 </html>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -173,7 +173,7 @@
             var produceModel =  produce.produceModel;        //获取产品型号后两位
             var produceName = produce.produceName;            //获取产品名称
             var produceBrand = produce.produceBrand;            //获取品牌字母
-
+            produceCreateTime = formatDate(new Date());
             var machineNo = "NO." + $("#"+machineBarcode+"Id").val();
             for (var i = 0; i < settingNumber; i++) {
                 code128(machineBarcode);
@@ -188,7 +188,7 @@
                         '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                         '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
                         '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
+                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                         '</div>');
                 /*}*/
                 /*if (machineProduceType == 2) {//冲奶机模板
@@ -350,7 +350,7 @@
         var produceModel =  produce.produceModel;        //获取产品型号后两位
         var produceName = produce.produceName;            //获取产品名称
         var produceBrand = produce.produceBrand;            //获取品牌字母
-
+        produceCreateTime = formatDate(new Date());
         for (var i=0;i<settingNumber;i++){
             code128(machineBarcode);
             var barcodes = $("#bcTarget").html();
@@ -363,7 +363,7 @@
                     '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                     '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
                     '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                    '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
+                    '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                     '</div>');
             /*}*/
             /*if(machineProduceType == 2){//冲奶机模板