处理京东拉取订单的bug

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

@@ -2284,7 +2284,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     // 后台拆分的订单不处理(mainOrderId为null，说明是主单)
                     if (salesOrder.getSalesMainOrderId() == null) {
                         Map<String, String> params = new HashMap<>();
-                        params.put("orderId", salesOrder.getSalesOrderId());
+                        params.put("orderId", salesOrder.getSalesExOrderId());
                         params.put("logiCoprId", logisticsInfoService.getLogisticsNameByRSTCode(salesOrder.getSalesPostFirm()).getLogisticsXytCode());
                         params.put("logiNo", o.getSalesPostNum());
                         params.put("code", AES.encrypt(salesOrder.getSalesOrderId()));

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

@@ -418,7 +418,7 @@ public class AwaitSendController {
                             orderTracking.setTrackingDesc("同步京东平台发货");
                             salesOrderService.addTracking(orderTracking);
                         }
-                    } else if("WAIT_SELLER_STOCK_OUT".equals(detail.getOrderState())) {
+                    } else if("WAIT_SELLER_STOCK_OUT".equals(detail.getOrderState()) && detail.getStoreOrder().equals("")) {
                         // 待发货订单
                         salesOrderList.add(temp);
                     } else {

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

@@ -574,7 +574,7 @@
                                 );
                             } else if(produceName == "德克西H6(富锶)净水机") {
                                 $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
-                                    '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机升级版</span>' +
+                                    '<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>' +
@@ -1139,7 +1139,7 @@
                     );
                 } else if(produceName == "德克西H6(富锶)净水机") {
                     $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
-                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机升级版</span>' +
+                        '<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>' +