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

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

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

@@ -81,6 +81,9 @@
               soi.*
             FROM tb_rst_sales_order_info soi
             LEFT JOIN tb_rst_sales_order_item oi ON soi.sales_id = oi.item_order_id
+            LEFT JOIN tb_rst_cm_relation cr ON soi.sales_customer_id = cr.customer_id
+            LEFT JOIN tb_rst_cm_proc_method pm ON pm.proc_method_id = cr.proc_method_id
+            LEFT JOIN tb_rst_cm_proc_type pt ON pt.proc_type_id = pm.proc_type_id
             <where>
                 <if test="isSelectCustomer !=null and isSelectCustomer !='' and isSelectCustomer == 2 ">
                     soi.sales_batch_id != 'KS00000000000001'
@@ -163,7 +166,9 @@
                 <if test="salesIsSublist != null  and salesIsSublist !=''">
                     AND sales_is_sublist = #{salesIsSublist}
                 </if>
-
+                <if test="procTypeId != null  and procTypeId !=''">
+                    AND pt.proc_type_id = #{procTypeId}
+                </if>
             </where>
             GROUP BY
             soi.sales_id
@@ -178,11 +183,6 @@
         LEFT JOIN tb_rst_cm_proc_method pm ON pm.proc_method_id = cr.proc_method_id
         LEFT JOIN tb_rst_cm_proc_type pt ON pt.proc_type_id = pm.proc_type_id
         LEFT JOIN tb_rst_sys_admin ao ON temp.sales_admin_id = ao.admin_id
-        <where>
-            <if test="procTypeId != null  and procTypeId !=''">
-                 pt.proc_type_id = #{procTypeId}
-            </if>
-        </where>
         ORDER BY
           temp.sales_create_time DESC
     </select>
@@ -411,6 +411,9 @@
           count(tb_rst_sales_order_info.sales_id)
         from tb_rst_sales_order_info
         LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
+        LEFT JOIN tb_rst_cm_relation cr ON tb_rst_sales_order_info.sales_customer_id = cr.customer_id
+        LEFT JOIN tb_rst_cm_proc_method pm ON pm.proc_method_id = cr.proc_method_id
+        LEFT JOIN tb_rst_cm_proc_type pt ON pt.proc_type_id = pm.proc_type_id
         <where>
             sales_status != 3
             <if test="salesIsDownload !=null and salesIsDownload !=''">
@@ -479,6 +482,9 @@
                     #{node}
                 </foreach >
             </if>
+            <if test="procTypeId != null  and procTypeId !=''">
+                AND pt.proc_type_id = #{procTypeId}
+            </if>
         </where>
     </select>
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -3,10 +3,12 @@ package com.iamberry.rst.controllers.pts;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.*;
+import com.iamberry.rst.core.sys.SysConfig;
 import com.iamberry.rst.core.tools.QRCJson;
 import com.iamberry.rst.core.tools.QrCodeUtil;
 import com.iamberry.rst.core.tools.WeixinUtil;
 import com.iamberry.rst.faces.pts.*;
+import com.iamberry.rst.faces.sys.SysConfigService;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResponseJson;
@@ -61,6 +63,9 @@ public class AdminMachineController {
     @Autowired
     private PtsSalesCompanyService ptsSalesCompanyService;
 
+    @Autowired
+    private SysConfigService sysConfigService;
+
     /**
      * 查询机器列表
      *
@@ -673,6 +678,15 @@ public class AdminMachineController {
         int year = DateTimeUtil.year();
         int month = DateTimeUtil.month() + 1;
         int day = DateTimeUtil.day();
+
+        SysConfig sysConfig = sysConfigService.getSysConfigAll(6);
+        if(sysConfig.getConfigStatus() == 1){
+            String config = sysConfig.getConfigParameter();
+            String[] configs = config.split(",");
+            month = Integer.valueOf(configs[0]);
+            day = Integer.valueOf(configs[1]);
+        }
+
         char dateYear;
         char dateMonth;
         char dateDay;

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

@@ -101,7 +101,7 @@
                     <option value="">订单类型</option>
                     <option value="2" <#if salesOrder.procTypeId??><#if salesOrder.procTypeId == '2' >selected="selected"</#if></#if>>换货订单</option>
                     <option value="3" <#if salesOrder.procTypeId??><#if salesOrder.procTypeId == '3' >selected="selected"</#if></#if>>维修订单</option>
-                    <option value="4" <#if salesOrder.procTypeId??><#if salesOrder.procTypeId == '5' >selected="selected"</#if></#if>>补发订单</option>
+                    <option value="5" <#if salesOrder.procTypeId??><#if salesOrder.procTypeId == '5' >selected="selected"</#if></#if>>补发订单</option>
 
                 </select>
 

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

@@ -223,15 +223,37 @@
                         }
                     }else{
                         if(isGeneralQrcode == 1 || berGenerateRules == 2){
-                            $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                                '<span style="position: absolute;left: 10px;font-size: 14px;"></span>' +
-                                '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">生产日期：'+produceCreateTime+'</span>' +
-                                '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
-                                '<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:23px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                                '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;display: none;">'+ produceCreateTime +'</span>' +
-                                '</div>');
+                            if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机"){
+                                $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                                        '<span style="position: absolute;left: 162px;font-size: 8px;"><b>淘&nbsp;&nbsp;宝&nbsp;/&nbsp;天&nbsp;&nbsp;猫&nbsp;A&nbsp;P&nbsp;P</b></span>' +
+                                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">生产日期：'+produceCreateTime+'</span>' +
+                                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                                        '<div style="position: absolute;left: -2px;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:13px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                        '<span style="position: absolute;right: 8px;top: 87px;font-size: 8px;"><b>扫&nbsp;&nbsp;码&nbsp;&nbsp;购&nbsp;&nbsp;买&nbsp;&nbsp;滤&nbsp;&nbsp;芯</b></span>' +
+                                        '</div>');
+                                /*$("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">生产日期：'+produceCreateTime+'</span>' +
+                                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                                        '<div style="position: absolute;left: -2px;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:13px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                        '<span style="position: absolute;right: 0px;top: 87px;font-size: 8px;display: none;"><b>淘宝/天猫APP 滤芯购买</b></span>' +
+                                        '</div>');*/
+                            }else{
+                                $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                                        '<span style="position: absolute;left: 10px;font-size: 14px;"></span>' +
+                                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;"></span>' +
+                                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                                        '<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:23px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;display: none;">'+ produceCreateTime +'</span>' +
+                                        '</div>');
+                            }
                         }else{
                                 $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
                                         '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
@@ -397,28 +419,23 @@
         var isGeneralQrcode = produce.isGeneralQrcode;     //是否使用通用二维码 1 是 2否
         var berGenerateRules = produce.berGenerateRules;     //1 序列化生成（原有生成规则）、2 随机生成
         produceCreateTime = formatDate(new Date());
-        for (var i=0;i<settingNumber;i++){
-            code128(machineBarcode);
+        for (var i = 0; i < settingNumber; i++) {
+            code1282(machineBarcode);
             var barcodes = $("#bcTarget").html();
+            /*$("#barcodeId").html(machineBarcode);
+            $("#qrcodeImg").attr('src',machineQrcode);*/
             if (isPrintQrcode == 2) {
                 if(berGenerateRules === 3){
+                    code128(machineBarcode);
+                    var barcodes2 = $("#bcTarget").html();
                     $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                            '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                            '<span style="padding-left: 10px;">反渗透净水机</span>' +
                             '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                             '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
-                            '<div style="position: absolute;left: -12px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                            '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 166px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-
+                            '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
+                            /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                             '</div>');
-                   /* $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                            '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
-                            '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                            '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
-                            '<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; display: none;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                            '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;"></span>' +
-                            '</div>');*/
+                    // $("#printlist").append();
                 }else{
                     $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
                             '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
@@ -432,15 +449,38 @@
                 }
             }else{
                 if(isGeneralQrcode == 1 || berGenerateRules == 2){
-                    $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                            '<span style="position: absolute;left: 10px;font-size: 14px;"></span>' +
-                            '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">生产日期：'+produceCreateTime+'</span>' +
-                            '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
-                            '<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:23px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                            '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;display: none;">'+ produceCreateTime +'</span>' +
-                            '</div>');
+                    if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机"){
+                        $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                                '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                                '<span style="position: absolute;left: 162px;font-size: 8px;"><b>淘&nbsp;&nbsp;宝&nbsp;/&nbsp;天&nbsp;&nbsp;猫&nbsp;A&nbsp;P&nbsp;P</b></span>' +
+                                '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">生产日期：'+produceCreateTime+'</span>' +
+                                '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                                '<div style="position: absolute;left: -2px;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:13px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                '<span style="position: absolute;right: 8px;top: 87px;font-size: 8px;"><b>扫&nbsp;&nbsp;码&nbsp;&nbsp;购&nbsp;&nbsp;买&nbsp;&nbsp;滤&nbsp;&nbsp;芯</b></span>' +
+                                '</div>');
+                        /*$("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                                '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                                '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">生产日期：'+produceCreateTime+'</span>' +
+                                '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                                '<div style="position: absolute;left: -2px;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:13px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                '<span style="position: absolute;right: 0px;top: 87px;font-size: 8px;display: none;"><b>淘宝/天猫APP 滤芯购买</b></span>' +
+                                '</div>');*/
+                    }else{
+                        $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                                '<span style="position: absolute;left: 10px;font-size: 14px;"></span>' +
+                                '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;"></span>' +
+                                '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                                '<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:23px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;display: none;">'+ produceCreateTime +'</span>' +
+                                '</div>');
+                    }
+
                 }else{
                     $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
                             '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +