diff --git a/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs b/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs
index da91032..6887c52 100644
--- a/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs
+++ b/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs
@@ -57,6 +57,7 @@ namespace SlnMesnac.RfidUpload.UI
// 自动生成opBatch
string opBatch = Guid.NewGuid().ToString("N").Substring(0, 20);
OpBatchManager.BathNo = opBatch;
+
CsbResult res = csbHandleBusiness.findStationSequenceByCsb(_transferOrderInfo.ffjhNo, opBatch);
this.PageMessage.Content = res.GetMsg();
if (res.code == "200")
@@ -69,6 +70,8 @@ namespace SlnMesnac.RfidUpload.UI
foreach (var institution in institutionList)
{
institution.No = count++.ToString();
+ institution.opBatch = opBatch;
+
}
InstitutionList.ItemsSource = institutionList;
}
@@ -166,6 +169,9 @@ namespace SlnMesnac.RfidUpload.UI
public string stationOrgCode { get; set; }
public string stationOrgName { get; set; }
+ public string opBatch { get; set; }
+
+
}
diff --git a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
index 958b2e4..c03500f 100644
--- a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
+++ b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
@@ -89,7 +89,7 @@
-
+
diff --git a/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs
index a770e26..9ac8ca9 100644
--- a/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs
+++ b/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs
@@ -219,11 +219,4 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
}
}
}
-class result1
-{
- public string status { get; set; }
-
- public string msg { get; set; }
- public List @object { get; set; }
-}
diff --git a/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
index 0f0c15b..73de889 100644
--- a/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
+++ b/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
@@ -227,13 +227,12 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
#region 正式启用
CsbResult res = csbHandleBusiness.transferOrderFfjhCheckByCsb(transferOrderInfo.ffjhNo, transferOrderInfo.ffjhscrq);
TransferMsg = $"验证调拨单结果:{res.GetMsg()}";
+
if (res.code== "200")
{ //封发计划正常可封发
// MessageBox.Show($"验证调拨单结果,[{res.GetMsg()}];");
SuccessEvent?.Invoke();
RefreshSubmitVerifyEvent?.Invoke(2, res.GetMsg(), transferOrderInfo);
-
-
}
else
{