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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

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

@@ -2376,7 +2376,6 @@
     <!--查询核对单信息-->
     <select id="getCheckOrders" parameterType="OrderStatisticsInfo" resultType="OrderStatisticsInfo">
         SELECT li.logistics_name AS logisticsName,count(1) AS num FROM  tb_rst_sales_order_info oi
-        LEFT JOIN tb_rst_sales_order_item soi on soi.item_order_id = oi.sales_id
         LEFT JOIN tb_rst_logistics_info li on li.logistics_rst_code = oi.sales_post_firm
         WHERE
         sales_status != 3

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

@@ -57,6 +57,7 @@
                     <th colspan="3" >
                         <span style="text-align:center;font-size: 1.75rem;">拣货单</span>
                         <div style="float: right;margin-top: 0.5cm">
+                            <#--<span style="margin-right: 2cm;" id="dateId1">时间：</span>-->
                             <span style="margin-right: 2cm;">仓库人员：</span>
                             <span style="margin-right: 2cm;">仓库主管：</span>
 
@@ -95,6 +96,7 @@
             <tr>
                 <th style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.28cm;"><strong>快递公司</strong></th>
                 <th style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.28cm;"><strong>面单数</strong></th>
+                <th style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.28cm;"><strong>未发单</strong></th>
                 <th style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.28cm;"><strong>截单数</strong></th>
                 <th style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.28cm;"><strong>快递实际取件</strong></th>
                 <th style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.28cm;"><strong>快递签名</strong></th>
@@ -115,6 +117,7 @@
 <script type="text/javascript">
 
     function print1(){
+        var LODOP=getLodop();
         var pickingStartDate = $("#pickingStartDate").val();
         $.ajax({
             type: "POST",
@@ -135,8 +138,8 @@
                                 '</tr>';
                     });
                     $("#listid1").html(html);
-
-
+                    /*var day1 = new Date();
+                    $("#dateId1").html("打印时间："+formatDate(day1,"yyyy-MM-dd HH:mm:ss"));*/
                     // 选择打印设备
                     var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
                     if (!isIE) {
@@ -156,9 +159,9 @@
                         }
                     } else {
                         LODOP.SELECT_PRINTER();
-                        LODOP.PRINT_INIT('打印维修单');
+                        LODOP.PRINT_INIT('打印拣货单');
                         LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
-                        LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#pageid1").html());
+                        LODOP.ADD_PRINT_HTM("0mm","-7mm","100%","100%", $("#pageid1").html());
                         var flag = LODOP.PRINT();
                         if (flag) {
                             layer.msg("打印成功", {icon: 6, time: 3000});
@@ -178,6 +181,7 @@
 
 
     function print2(){
+        var LODOP=getLodop();
         var checkStartDate = $("#checkStartDate").val();
         $.ajax({
             type: "POST",
@@ -197,6 +201,7 @@
                                 '<td style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.28cm;"></td>' +
                                 '<td style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.28cm;"></td>' +
                                 '<td style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.28cm;"></td>' +
+                                '<td style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.28cm;"></td>' +
                                 '</tr>';
                     });
                     $("#listid2").html(html);
@@ -220,9 +225,9 @@
                         }
                     } else {
                         LODOP.SELECT_PRINTER();
-                        LODOP.PRINT_INIT('打印维修单');
+                        LODOP.PRINT_INIT('打印拣货单');
                         LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
-                        LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#pageid2").html());
+                        LODOP.ADD_PRINT_HTM("0mm","-7mm","100%","100%", $("#pageid2").html());
                         var flag = LODOP.PRINT();
                         if (flag) {
                             layer.msg("打印成功", {icon: 6, time: 3000});