From 94885ec296274e3e6a848a65c41febf3434bdf9b Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 28 五月 2024 15:25:24 +0800
Subject: [PATCH] 解决打印条码内容和实际生成条码不一致问题

---
 Wms_09/WMS.BLL/SysServer/PalletsServer.cs |   19 ++++++++++++++-----
 Wms_09/Wms_09/Wms_09.csproj               |    4 ++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Wms_09/WMS.BLL/SysServer/PalletsServer.cs b/Wms_09/WMS.BLL/SysServer/PalletsServer.cs
index adbdd82..d18ef71 100644
--- a/Wms_09/WMS.BLL/SysServer/PalletsServer.cs
+++ b/Wms_09/WMS.BLL/SysServer/PalletsServer.cs
@@ -101,7 +101,7 @@
                         codeId = int.Parse("00001");
                     }
                     int liuShuiId = codeId;
-                    var pallet = "T"+time2 + Convert.ToString(liuShuiId).PadLeft(5, '0');
+                    var pallet = "T" + time2 + Convert.ToString(liuShuiId).PadLeft(5, '0');
                     return pallet;
                 }
             }
@@ -125,17 +125,26 @@
 
                 var str = pallNo.Substring(3, 5);
                 string remove = pallNo.Substring(0, 3);
-                int sibelius = Convert.ToInt16(str);
+                int sibelius = 0;
                 var num = 0;
+                if (remove != "T" + DateTime.Now.ToString("yy"))
+                {
+                    remove = "T" + DateTime.Now.ToString("yy");
+                    sibelius = 0;
+                }
+                else
+                {
+                    sibelius = Convert.ToInt16(str);
+                }
                 for (int i = 0; i < groupCount; i++)
                 {
                     sibelius += 1;
-                    if (sibelius>99999)
+                    if (sibelius > 99999)
                     {
                         throw new Exception("鎵樼洏鐮佷綅鏁板凡杈句笂绾�");
                     }
                     string code = remove + Convert.ToString(sibelius).PadLeft(5, '0');
-                    if (db.Queryable<SysPallets>().Count(m=>m.PalletNo == code)>=1)
+                    if (db.Queryable<SysPallets>().Count(m => m.PalletNo == code) >= 1)
                     {
                         continue;
                     }
@@ -158,7 +167,7 @@
                         {
                             await _operation.InsertOperation("浠撳簱璁剧疆", "鏉$爜绠$悊", item.PalletNo, "娣诲姞", "娣诲姞鎵樼洏淇℃伅 鎵樼洏鍙凤細" + item.PalletNo, userId);
                         }
-                        
+
                     }
                 }
 
diff --git a/Wms_09/Wms_09/Wms_09.csproj b/Wms_09/Wms_09/Wms_09.csproj
index 6eafd06..e088fb2 100644
--- a/Wms_09/Wms_09/Wms_09.csproj
+++ b/Wms_09/Wms_09/Wms_09.csproj
@@ -11,9 +11,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="log\**" />
     <Compile Remove="ModelVm\**" />
+    <Content Remove="log\**" />
     <Content Remove="ModelVm\**" />
+    <EmbeddedResource Remove="log\**" />
     <EmbeddedResource Remove="ModelVm\**" />
+    <None Remove="log\**" />
     <None Remove="ModelVm\**" />
   </ItemGroup>
 	

--
Gitblit v1.8.0