根据签收日期查询

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/JingdongTask.java

@@ -185,6 +185,10 @@ public class JingdongTask {
 //                        logger.error("【京东订单】{}获取订单详细数据失败", trade.getTid());
 //                        return;
 //                    }
+                        /**
+                         * 解密数据
+                         */
+
                         // 组装数据
                         SalesOrder salesOrder = packageOrder(orderSearchInfo, storeId, salesCompanyId);
                         if (salesOrder != null) {

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

@@ -592,6 +592,16 @@
                                     '<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;display: none">'+ produceCreateTime +'</span>' +
                                     '</div>');
+                            } else if(produceName == "GE净饮机") {
+                                $("#printlist").append('<div style="width: 243px;height: 125px;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;visibility:hidden;">'+ produceCreateTime +'</span>' +
+                                        '</div>');
                             } else {
                                 $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
                                         '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
@@ -1167,6 +1177,16 @@
                         '<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;display: none">'+ produceCreateTime +'</span>' +
                         '</div>');
+                } else if(produceName == "GE净饮机") {
+                    $("#printlist").append('<div style="width: 243px;height: 125px;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;visibility:hidden;">'+ produceCreateTime +'</span>' +
+                        '</div>');
                 } else{
                     $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
                             '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +