23

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<CsbResult>(str);
                 
                 return res;

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; }
+    }
+}

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);

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(() =>