diff --git a/SlnMesnac.RfidUpload.Business/CsbHandleBusiness.cs b/SlnMesnac.RfidUpload.Business/CsbHandleBusiness.cs index 5bace73..2857cc4 100644 --- a/SlnMesnac.RfidUpload.Business/CsbHandleBusiness.cs +++ b/SlnMesnac.RfidUpload.Business/CsbHandleBusiness.cs @@ -425,7 +425,8 @@ namespace SlnMesnac.RfidUpload.Business }; string jsonString = jsonObject.ToString(); - var str = webApiClientApp.UploadAsync("tranPlanCheckByCsb", "TdjContainerAllotQuery", jsonString, "容器直连配发-校验发运计划"); + var str = webApiClientApp.UploadAsync("tranPlanCheckByCsb", "TdjContainerAllotQuery", + jsonString, "容器直连配发-校验发运计划"); res = JsonConvert.DeserializeObject(str); return res; diff --git a/SlnMesnac.RfidUpload.Common/OpBatchManager.cs b/SlnMesnac.RfidUpload.Common/OpBatchManager.cs new file mode 100644 index 0000000..005d898 --- /dev/null +++ b/SlnMesnac.RfidUpload.Common/OpBatchManager.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace SlnMesnac.RfidUpload.Common +{ + public class OpBatchManager + { + public static string BathNo { get; set; } + } +} diff --git a/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs b/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs index f02ebd6..8b447d8 100644 --- a/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs +++ b/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs @@ -129,10 +129,10 @@ namespace SlnMesnac.RfidUpload.UI var button = sender as Button; var institution = button.DataContext as Institution; if (institution != null) - { - string opBatch = Guid.NewGuid().ToString("N").Substring(0, 20); + { + string opBatch = OpBatchManager.BathNo; CsbResult res = csbHandleBusiness.tranPlanCheckByCsb(_transferOrderInfo.ffjhNo, opBatch, institution.stationOrgCode,institution.stationOrgName); - // MessageBox.Show($"执行配发 6.12.容器直连配发-校验发运计划 容器封发完毕后直接向指定机构进行容器配发 :{res.message}"); + MessageBox.Show($"执行配发 6.12.容器直连配发-校验发运计划 容器封发完毕后直接向指定机构进行容器配发 :{res.message}"); if (res.code == "200") { RefreshSubmitVerifyEvent?.Invoke(3, res.GetMsg(), _transferOrderInfo); diff --git a/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs index 7245cde..900a3c1 100644 --- a/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs +++ b/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs @@ -436,7 +436,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel MessageBox.Show($"封发-按调拨单 [{res.GetMsg()}]"); - + OpBatchManager.BathNo = opBatch; Task.Run(() => { //若干秒以后调反馈接口,确认是否和实际相符 @@ -450,7 +450,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel }else if(WorkModelParam == 3) //库存容器封发配发 -- 6.13.容器直连配发-开始配发 { - string opBatch = Guid.NewGuid().ToString("N").Substring(0, 20); + string opBatch = OpBatchManager.BathNo; CsbResult res = csbHandleBusiness.containerAllotByCsb(TransferOrderInfoItem.ffjhNo,opBatch); MessageBox.Show($"库存容器封发配发 -- 6.13.容器直连配发-开始配发 [{res.GetMsg()}]"); Task.Run(() =>