好哒推送的交易数据，需要判断设备类型

AppStart/HaoDa/GetHaoDaFTPInfoService.cs

@@ -774,6 +774,7 @@ namespace MySystem
             try
             {
                 MpMainModels2.WebCMSEntities db = new MpMainModels2.WebCMSEntities();
+                JavaProductModels.WebCMSEntities javadb = new JavaProductModels.WebCMSEntities();
                 List<MpMainModels2.HdOrderTmp> orders = db.HdOrderTmp.Where(m => m.Status == 0).Take(200).ToList();
                 if (orders.Count > 0)
                 {
@@ -858,6 +859,16 @@ namespace MySystem
 
                             }
 
+                            if (DeviceKind.Contains("好哒设备"))
+                            {
+                                JavaProductModels.KxsMachine pos = javadb.KxsMachine.FirstOrDefault(m => m.PosSn == BaseNo) ?? new JavaProductModels.KxsMachine();
+                                if(pos.BrandId == 18) DeviceKind = "好哒语音王";
+                                if(pos.BrandId == 19) DeviceKind = "收款王M820";
+                                if(pos.BrandId == 20) DeviceKind = "收款王M826";
+                                if(pos.BrandId == 21) DeviceKind = "S312";
+                                if(pos.BrandId == 29) DeviceKind = "好哒扫码通";
+                                if(pos.BrandId == 20) DeviceKind = "好哒二维码";
+                            }
                             PosPushDataNewHelper.Trade(query, DeviceKind);
 
                             if (DeviceKind.Contains("好哒二维码"))
@@ -925,6 +936,7 @@ namespace MySystem
                     }
                 }
                 db.Dispose();
+                javadb.Dispose();
             }
             catch (WebException ex)
             {