.

SlnMesnac.RfidUpload.Model/BatchNoInfo.cs

@@ -0,0 +1,29 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Security.Principal;
+using System.Text;
+
+namespace SlnMesnac.RfidUpload.Model
+{
+  
+    [SugarTable("BATCH_NO_INFO")]
+    public class BatchNoInfo
+    {
+
+        [SugarColumn(ColumnName = "id")]
+        public string Id { get; set; }
+
+        // 用于存储调拨单号、送货单号、封发计划编号
+        [SugarColumn(ColumnName = "code")]
+        public string code { get; set; }
+
+        //  用于存储调拨单号、送货单号、封发计划编号当前的上传编号1开头
+        [SugarColumn(ColumnName = "batchNo")]
+        public int batchNo { get; set; }
+
+        //时间
+        [SugarColumn(ColumnName = "recordtime")]
+        public string RecordTime { get; set; }
+    }
+}

SlnMesnac.RfidUpload.UI/DbTool.cs

@@ -20,16 +20,18 @@ namespace SlnMesnac.RfidUpload.UI
             string opBatch = dtDbt.opBatch;
 
             CsbHandleBusiness csbHandleBusiness = CsbHandleBusiness.Instance;
-            int batchNo = 0;
+            
             ListPage<string> ls = new ListPage<string>(strList, 500);
             CsbResult res = new CsbResult();
             foreach (var enumerable in ls.GetPage())
             {
-                batchNo++;
+                
+                int batchNo = sqliteHelper.GetBatchNo(dtDbt.ffjhNo);
+                
                 res = csbHandleBusiness.containerScanSealByCsb(dtDbt.ffjhNo,
                     opBatch,
                    dtDbt.ffjhscrq, batchNo.ToString(), enumerable.ToList());
-
+                sqliteHelper.AddBatchNo(dtDbt.ffjhNo);
                 action.Invoke(0,res.GetMsg());
             }
 

SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs

@@ -216,9 +216,22 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
             ReUploadRecordCommand = new RelayCommand(ReUploadRecord);
             this.Init();
            
-          //  test();
+           // test1();
         }
 
+        private void test1()
+        {
+           int aa =  sqliteHelper.GetBatchNo("1234");
+            sqliteHelper.AddBatchNo("1234");
+           int aa2 =  sqliteHelper.GetBatchNo("1234");
+
+
+            int aa1 = sqliteHelper.GetBatchNo("234");
+            sqliteHelper.AddBatchNo("234");
+            int aa11 = sqliteHelper.GetBatchNo("234");
+        }
+
+
         private void ReUploadRecord()
         {
             ReUploadRecordWindow reUploadRecordWindow = new ReUploadRecordWindow();
@@ -357,15 +370,21 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
                 {
                     var info = labelItems.ToList();
                     var strList = info.Select(x => x.result).ToList();
-                    int batchNo = 0;
+                   
                     string opBatch = System.Guid.NewGuid().ToString("N").Substring(0, 20);
                     ListPage<string> ls = new ListPage<string>(strList, 500);
                     CsbResult res = new CsbResult();
                     foreach (var enumerable in ls.GetPage())
                     {
-                        batchNo++;
+                        int batchNo = sqliteHelper.GetBatchNo(TrackNo);
+                        logger.Info($"=======记录---封发-按调拨单，送货单号:{TrackNo},批次号batchNo:{batchNo}");
+
                         res = csbHandleBusiness.containerStorageBatchQueryByCsb(TrackNo,batchNo.ToString(), enumerable.ToList());
                         PrintMessageToListBox($"新容器入库结果 [{res.GetMsg()}]");
+                        sqliteHelper.AddBatchNo(TrackNo);
+                        int batchNo1 = sqliteHelper.GetBatchNo(TrackNo);
+                        logger.Info($"=======记录---封发-按调拨单，送货单号:{TrackNo},批次号batchNo+1后，数据库更新为:{batchNo1}");
+
                     }
                     MainPageTipMessage = $"新容器入库 [{res.GetMsg()}]";
                     
@@ -381,6 +400,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
                             {
                                 MainPageTipMessage = $"新容器入库反馈接口，[{res.GetMsg()}]";
                             });
+                            EmptyFiles();
 
                         });
 
@@ -391,17 +411,25 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
                 {
                     var info = labelItems.ToList();
                     var strList = info.Select(x => x.result).ToList();
-                    int batchNo = 0;
+                    //string dbdh = info.First().dbdh;
+                   // logger.Info($"记录---封发-按调拨单，dbdh:{dbdh}");
+                   
                     string opBatch = System.Guid.NewGuid().ToString("N").Substring(0, 20);
                     ListPage<string> ls = new ListPage<string>(strList, 500);
                     CsbResult res = new CsbResult();
                     foreach (var enumerable in ls.GetPage())
                     {
-                        batchNo++;
+                        int batchNo = sqliteHelper.GetBatchNo(TransferOrderInfoItem.ffjhNo);
+                        logger.Info($"=======记录---封发-按调拨单，TransferOrderInfoItem.ffjhNo:{TransferOrderInfoItem.ffjhNo},批次号batchNo:{batchNo}");
+
                         res = csbHandleBusiness.containerScanSealByCsb(TransferOrderInfoItem.ffjhNo,
                            opBatch,
                            TransferOrderInfoItem.ffjhscrq, batchNo.ToString(), enumerable.ToList());
                         PrintMessageToListBox($"封发-按调拨单结果 [{res.GetMsg()}]");
+                        sqliteHelper.AddBatchNo(TransferOrderInfoItem.ffjhNo);
+                        int batchNo1 = sqliteHelper.GetBatchNo(TransferOrderInfoItem.ffjhNo);
+                       // logger.Info($"=======记录---封发-按调拨单，dbdh:{TransferOrderInfoItem.ffjhNo},批次号batchNo+1后，数据库更新为:{batchNo1}");
+
                     }
 
                     //  MessageBox.Show($"封发-按调拨单 [{res.GetMsg()}]");
@@ -424,7 +452,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
                                 // 如果需要弹出消息框，也需要在 UI 线程调用 MessageBox
                                 // MessageBox.Show($"封发-按调拨单反馈接口，[{res.GetMsg()}]");
                             });
-
+                            EmptyFiles();
                         });
 
                     }
@@ -436,7 +464,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
                     //四、6.9接收容器条码接口
                     var info = labelItems.ToList();
                     var strList = info.Select(x => x.result).ToList();
-                    int batchNo = 0;
+                    string dbdh = info.First().dbdh;
                     string opBatch = OpBatchManager.BathNo;
                     var dt = new Dbt();
                     dt.opBatch = opBatch;
@@ -499,6 +527,10 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
                         MainPageTipMessage = $"数据上传失败：{ex.Message}";
                         PrintMessageToListBox($"数据上传失败：{ex.Message}");
                     }
+                    finally
+                    {
+                        EmptyFiles();
+                    }
 
 
 
@@ -524,6 +556,10 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
             {
                 MessageBox.Show(ex.Message);
             }
+            finally
+            {
+               
+            }
             
         }
 

slnmesnac.rfidupload.Repository/SqlSugarHelper.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 
 #region << 版 本 注 释 >>
 /*--------------------------------------------------------------------
@@ -35,7 +36,7 @@ namespace slnmesnac.rfidupload.Repository
     {
         private static SqlSugarHelper instance = null;
         private static readonly object padlock = new object();
-
+        private readonly LogHelper logger = LogHelper.Instance;
         private SqlSugarHelper() { }
         public static SqlSugarHelper Instance
         {
@@ -131,6 +132,58 @@ namespace slnmesnac.rfidupload.Repository
 
 
         #region RFID数据表相关操作
+
+        /// <summary>
+        /// 根据调拨单号、送货单号、分发计划编号获取批次号
+        /// </summary>
+        /// <param name="printRecord"></param>
+        /// <returns></returns>
+        public  int GetBatchNo(string code)
+        {
+            try
+            {
+                BatchNoInfo? batchNoInfo = db.Queryable<BatchNoInfo>().First(x => x.code == code);
+                if (batchNoInfo == null)
+                {
+                 
+                    batchNoInfo = new BatchNoInfo();
+                    batchNoInfo.Id = Guid.NewGuid().ToString();
+                    batchNoInfo.code = code;
+                    batchNoInfo.batchNo = 1;
+                    batchNoInfo.RecordTime = DateTime.Now.ToString();
+                    int result = db.Insertable(batchNoInfo).ExecuteCommand();
+                   
+                }
+                return batchNoInfo.batchNo;
+            }catch(Exception ex)
+            {
+               
+                return 1;
+            }
+        }
+
+       
+
+        public  void AddBatchNo(string code)
+        {
+            try
+            {
+                BatchNoInfo? batchNoInfo = db.Queryable<BatchNoInfo>().First(x => x.code == code);
+                if (batchNoInfo != null)
+                {
+                    batchNoInfo.batchNo += 1;
+                    batchNoInfo.RecordTime = DateTime.Now.ToString();
+                    db.Updateable(batchNoInfo).ExecuteCommand();
+                }
+            }catch(Exception ex)
+            {
+
+            }
+        }
+
+      
+
+
         /// <summary>
         /// 查询记录列表--不包含strList字段
         /// </summary>