|
@@ -38,7 +38,14 @@ namespace MySystem
|
|
|
var tran = db.Database.BeginTransaction();
|
|
var tran = db.Database.BeginTransaction();
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- if(Mer.Field2 != "解绑" && Mer.Field2 != "UNBIND" && Mer.ProductType != "12" && Mer.ProductType != "30") PosPushDataNewHelper.Bind(Mer);
|
|
|
|
|
|
|
+ if(Mer.Field2 != "解绑" && Mer.Field2 != "UNBIND" && Mer.ProductType != "12" && Mer.ProductType != "30")
|
|
|
|
|
+ {
|
|
|
|
|
+ if(Utils.Instance.IsWifi(int.Parse(Mer.ProductType)))
|
|
|
|
|
+ {
|
|
|
|
|
+ Mer.MerNo = Mer.SnNo;
|
|
|
|
|
+ }
|
|
|
|
|
+ PosPushDataNewHelper.Bind(Mer);
|
|
|
|
|
+ }
|
|
|
PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == Mer.SnNo) ?? new PxcModels.PosMachinesTwo();
|
|
PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == Mer.SnNo) ?? new PxcModels.PosMachinesTwo();
|
|
|
if (pos.BindingState == 1 && Mer.Field2 != "解绑" && Mer.Field2 != "UNBIND")
|
|
if (pos.BindingState == 1 && Mer.Field2 != "解绑" && Mer.Field2 != "UNBIND")
|
|
|
{
|
|
{
|