From d13e6e7d5df05ba244971d2fabb788ccb0f5c12a Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 27 一月 2026 15:12:10 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu
---
/dev/null | 0
Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db | 0
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1e9e18ba-d12d-4daa-96ea-7fe50a508a88.vsidx | 0
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.995.13737/CodeChunks.db | 0
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/60e97583-6f25-423c-b860-7e0bba97dd5c.vsidx | 0
WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs | 4 ++--
Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db | 0
Print/.vs/Print/FileContentIndex/15adb170-eeb7-45a6-a3f7-920e0082297d.vsidx | 0
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.995.13737/SemanticSymbols.db | 0
9 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db b/Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db
index 41f175b..4f46f5f 100644
--- a/Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db
+++ b/Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db
Binary files differ
diff --git a/Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db-shm b/Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db-shm
deleted file mode 100644
index e478913..0000000
--- a/Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db-shm
+++ /dev/null
Binary files differ
diff --git a/Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db-wal b/Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db-wal
deleted file mode 100644
index 078d771..0000000
--- a/Print/.vs/Print/CopilotIndices/17.14.995.13737/CodeChunks.db-wal
+++ /dev/null
Binary files differ
diff --git a/Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db b/Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db
index 95be31b..2b3372a 100644
--- a/Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db
+++ b/Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db
Binary files differ
diff --git a/Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db-shm b/Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db-shm
deleted file mode 100644
index 43022fc..0000000
--- a/Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db-shm
+++ /dev/null
Binary files differ
diff --git a/Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db-wal b/Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db-wal
deleted file mode 100644
index fc088fd..0000000
--- a/Print/.vs/Print/CopilotIndices/17.14.995.13737/SemanticSymbols.db-wal
+++ /dev/null
Binary files differ
diff --git a/Print/.vs/Print/FileContentIndex/15adb170-eeb7-45a6-a3f7-920e0082297d.vsidx b/Print/.vs/Print/FileContentIndex/15adb170-eeb7-45a6-a3f7-920e0082297d.vsidx
new file mode 100644
index 0000000..a26c93a
--- /dev/null
+++ b/Print/.vs/Print/FileContentIndex/15adb170-eeb7-45a6-a3f7-920e0082297d.vsidx
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.995.13737/CodeChunks.db b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.995.13737/CodeChunks.db
index 3137871..62a10c9 100644
--- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.995.13737/CodeChunks.db
+++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.995.13737/CodeChunks.db
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.995.13737/SemanticSymbols.db b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.995.13737/SemanticSymbols.db
index ed0a9b1..2eb47dc 100644
--- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.995.13737/SemanticSymbols.db
+++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.995.13737/SemanticSymbols.db
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/127e07b2-29d7-4700-9530-3149b7bde32a.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/127e07b2-29d7-4700-9530-3149b7bde32a.vsidx
deleted file mode 100644
index 440beaa..0000000
--- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/127e07b2-29d7-4700-9530-3149b7bde32a.vsidx
+++ /dev/null
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1e9e18ba-d12d-4daa-96ea-7fe50a508a88.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1e9e18ba-d12d-4daa-96ea-7fe50a508a88.vsidx
new file mode 100644
index 0000000..c96f4b3
--- /dev/null
+++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1e9e18ba-d12d-4daa-96ea-7fe50a508a88.vsidx
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/60e97583-6f25-423c-b860-7e0bba97dd5c.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/60e97583-6f25-423c-b860-7e0bba97dd5c.vsidx
new file mode 100644
index 0000000..70dc134
--- /dev/null
+++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/60e97583-6f25-423c-b860-7e0bba97dd5c.vsidx
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/badeaeb0-3136-4e90-97a6-588750347e8c.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/badeaeb0-3136-4e90-97a6-588750347e8c.vsidx
deleted file mode 100644
index 99d433c..0000000
--- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/badeaeb0-3136-4e90-97a6-588750347e8c.vsidx
+++ /dev/null
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ed57ae5a-7c17-423d-b43d-9166e05f131f.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ed57ae5a-7c17-423d-b43d-9166e05f131f.vsidx
deleted file mode 100644
index 5ae3d1f..0000000
--- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ed57ae5a-7c17-423d-b43d-9166e05f131f.vsidx
+++ /dev/null
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs
index dc46441..cdf4bc5 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs
@@ -61,14 +61,14 @@
if (PrintSetting.Spare1 == DateTime.Now.ToString("yyyyMMdd"))
{
- PrintCode = palletCodeType+PrintSetting.Spare1 + PrintSetting.PrintNo.ToString().PadLeft(PrintSetting.Spare2, '0');
+ PrintCode = palletCodeType+PrintSetting.PrintNo.ToString().PadLeft(PrintSetting.Spare2, '0')+PrintSetting.Spare1;
PrintSetting.PrintNo = PrintSetting.PrintNo + 1;
}
else
{
PrintSetting.Spare1 = DateTime.Now.ToString("yyyyMMdd");
PrintSetting.PrintNo = 2;
- PrintCode = palletCodeType+PrintSetting.Spare1 + 1.ToString().PadLeft(PrintSetting.Spare2, '0');
+ PrintCode = palletCodeType+1.ToString().PadLeft(PrintSetting.Spare2, '0')+PrintSetting.Spare1;
}
Db.Updateable(PrintSetting).ExecuteCommand();
return PrintCode;
--
Gitblit v1.9.3