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-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -1109,7 +1109,7 @@ public class AdminSalesOrderController {
                    newOrder.setSalesOrderId(salesOrder.getSalesDealCode());
                    newOrder.setSalesShippingStatus(11);
                    newOrder.setSalesWarehouseId(warehouseId);
-
+                   newOrder.setSalesIsSublist(1);
                    /*判断主订单是否是其它订单的子订单 2019-10-08新需求     state*/
                    newOrder = suSalesOrder(newOrder);
                    /*判断主订单是否是其它订单的子订单 2019-10-08新需求     end*/
@@ -1131,6 +1131,7 @@ public class AdminSalesOrderController {
                        newOrder.setSalesOrderId(so.getSalesDealCode());
                        newOrder.setSalesShippingStatus(11);
                        newOrder.setSalesWarehouseId(warehouseId);
+                       newOrder.setSalesIsSublist(1);
 
                        /*判断主订单是否是其它订单的子订单 2019-10-08新需求     state*/
                        newOrder = suSalesOrder(newOrder);

watero-rst-web/src/main/resources/dev-jdbc.properties

@@ -1,13 +1,13 @@
 jdbc.driver=com.mysql.jdbc.Driver
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD ####
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=watero_rst
-#jdbc.password=watero_RST
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=watero_rst
+jdbc.password=watero_RST
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD end #####
 
-jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=rst_test
-jdbc.password=RST_test
+#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=rst_test
+#jdbc.password=RST_test
 
 #pool settings
 jdbc.pool.init=1

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

@@ -148,12 +148,12 @@
                 <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><br>
+                            <img style="width: 20px;height: 20px;" src="/common/images/zhudindan.png"><span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span><br>
                         </#list>
                     </#if>
                     <#if o.suSalesOrderItemList ??>
                         <#list o.suSalesOrderItemList as d>
-                            子：<span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span><span style="display: none;">${(d.itemOrderId)!}</span><br>
+                            <img style="width: 20px;height: 20px;" src="/common/images/zidingdan.png"><span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span><span style="display: none;">${(d.itemOrderId)!}</span><br>
                         </#list>
                     </#if>
                 </td>

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

@@ -60,12 +60,12 @@
                                     <td style="text-align: left;">
                                         <#if o.salesOrderItemList ??>
                                             <#list o.salesOrderItemList as d>
-                                                <#if o.suSalesOrderItemList ??>主：</#if><span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span><br>
+                                                <#if o.suSalesOrderItemList ??><img style="width: 20px;height: 20px;" src="/common/images/zhudindan.png"></#if><span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span><br>
                                             </#list>
                                         </#if>
                                         <#if o.suSalesOrderItemList ??>
                                             <#list o.suSalesOrderItemList as d>
-                                                子：<span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span><span style="display: none;">${(d.itemOrderId)!}</span><br>
+                                                <img style="width: 20px;height: 20px;" src="/common/images/zidingdan.png"><span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span><span style="display: none;">${(d.itemOrderId)!}</span><br>
                                             </#list>
                                         </#if>
                                     </td>
@@ -174,6 +174,7 @@
                     $(order.find("td")[0]).html("<span style='color: rgba(243, 123, 29, 1);'>处理中</span>");
                 },
                 success: function(data){
+
                     var tempObject = data;
                     if ('string' == typeof(data)) {
                         tempObject = $.parseJSON(data);
@@ -212,20 +213,21 @@
             if (isIE) {
                 // IE类浏览器，直接打印
                 if (LODOP.PRINT()) {
-                    SubPrintTemplates.map(function (item,index,ary ) {
-                        console.log(item);
-                        $("#temp-print-order").html(item);
-                        var subPrintTemplate = $("#temp-print-order").html();
-                        var orderid = SubOrders[i];
-                        /* (function(){
-                                        LODOP.ADD_PRINT_HTM("0mm", "0mm", "100%", "100%", subPrintTemplate);
-                                        LODOP.PRINT();
-                                    })();*/
-                        suPrint(subPrintTemplate);
-                        $(order.find("td")[0]).html("<span style='color: blue'>打印完成</span>");
-                        startPrint(isIE, false);
-                    });
-
+                    if(SubPrintTemplates != null){
+                        SubPrintTemplates.map(function (item,index,ary ) {
+                            console.log(item);
+                            $("#temp-print-order").html(item);
+                            var subPrintTemplate = $("#temp-print-order").html();
+                            var orderid = SubOrders[i];
+                            /* (function(){
+                                            LODOP.ADD_PRINT_HTM("0mm", "0mm", "100%", "100%", subPrintTemplate);
+                                            LODOP.PRINT();
+                                        })();*/
+                            suPrint(subPrintTemplate);
+                        });
+                    }
+                    $(order.find("td")[0]).html("<span style='color: blue'>打印完成</span>");
+                    startPrint(isIE, false);
                 } else {
                     order.attr("printState", "2");
                     $(order.find("td")[0]).html("<span style='color: red;'>失败(打印机异常)</span>");

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

@@ -192,57 +192,59 @@
             var berGenerateRules = produce.berGenerateRules;     //1 序列化生成（原有生成规则）、2 随机生成 3 博乐宝生成规则
             produceCreateTime = formatDate(new Date());
             var machineNo = "NO." + $("#"+machineBarcode+"Id").val();
-            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="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;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();
-                    }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;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;">'+ produceCreateTime +'</span>' +
-                                '</div>');
-                    }
-                }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;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: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{
+            if(isEmpty(machineId)){
+                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="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;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();
+                        }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;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;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                    '<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;">'+ produceCreateTime +'</span>' +
                                     '</div>');
-                    }
-                 }
+                        }
+                    }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;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: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>' +
+                                        '<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;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
+                                        '</div>');
+                        }
+                     }
+                }
                 if(${machineIsPrint} == '1')
                 {
                     updatePrint(machineBarcode,false);