Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient

BPASmartClient.MorkS/Control_Morks.cs

@@ -330,6 +330,11 @@ namespace BPASmartClient.MorkS
                      Json<OrderStatistics>.Data.Count++;
                      Json<OrderStatistics>.Save();
                      OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
+                     if (order.MorkOrder.GoodBatchings.Count <= 1)
+                     {
+                         DeviceProcessLogShow($"数据解析失败，商品物料信息为空,请检查后台配置！");
+                         return;
+                     }
                      DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
                      mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
                      foreach (var item in order.MorkOrder.GoodBatchings)
@@ -364,6 +369,10 @@ namespace BPASmartClient.MorkS
                                  }
                              }
                          }
+                         else
+                         {
+                             DeviceProcessLogShow($"数据解析失败，未找到商品信息,请检查后台配置！");
+                         }
                      }
                  }
              });