From 0c9661af88f5533ac73fbab82da39ea78d42853b Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期一, 09 九月 2024 14:10:03 +0800
Subject: [PATCH] 修改托盘码生成规则
---
Wms/Wms/Controllers/SysController.cs | 10 +++++++---
Wms/WMS.BLL/SysServer/PalletsServer.cs | 41 ++++++++++++++++++++---------------------
2 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/PalletsServer.cs b/Wms/WMS.BLL/SysServer/PalletsServer.cs
index adbdd82..70e8485 100644
--- a/Wms/WMS.BLL/SysServer/PalletsServer.cs
+++ b/Wms/WMS.BLL/SysServer/PalletsServer.cs
@@ -71,13 +71,17 @@
{
try
{
- var time = DateTime.Now.ToString("yyyy");
- var time2 = time.Substring(2, 2);
- int codeId;
+ //var time = DateTime.Now.ToString("yyyy");
+ //var time2 = time.Substring(2, 2);
+ int liuShuiCode ;
if (!string.IsNullOrWhiteSpace(palletNo))
{
var code = PalletsRst.GetAllWhereAsync(m => m.PalletNo == palletNo).First();
+ if (code == null)
+ {
+ throw new Exception("鎵樼洏鐮佸湪绯荤粺涓湭鏌ヨ鍒�");
+ }
return code.PalletNo;
}
else
@@ -86,22 +90,14 @@
if (code != null)
{
- string riQi = code.PalletNo.Substring(1, 2);
- if (riQi == time2)
- {
- codeId = int.Parse(code.PalletNo.Substring(3, 5)) + 1;
- }
- else
- {
- codeId = int.Parse("00001");
- }
+ liuShuiCode = int.Parse(code.PalletNo.Substring(2, 6)) + 1;
}
else
{
- codeId = int.Parse("00001");
+ liuShuiCode = int.Parse("000001");
}
- int liuShuiId = codeId;
- var pallet = "T"+time2 + Convert.ToString(liuShuiId).PadLeft(5, '0');
+
+ var pallet = "LN" + Convert.ToString(liuShuiCode).PadLeft(6, '0');
return pallet;
}
}
@@ -120,21 +116,24 @@
{
throw new Exception("缁勬暟闇�澶т簬0");
}
-
+ //鎵樼洏鏉＄爜瑙勫垯 LN+6浣嶆祦姘� 渚嬪 LN000001
var pallNo = db.Queryable<SysPallets>().Max(m => m.PalletNo);
-
- var str = pallNo.Substring(3, 5);
- string remove = pallNo.Substring(0, 3);
+ if (string.IsNullOrWhiteSpace(pallNo))
+ {
+ pallNo = "LN000000";
+ }
+ var str = pallNo.Substring(2, 6); //
+ string remove = pallNo.Substring(0, 2);
int sibelius = Convert.ToInt16(str);
var num = 0;
for (int i = 0; i < groupCount; i++)
{
sibelius += 1;
- if (sibelius>99999)
+ if (sibelius>999999)
{
throw new Exception("鎵樼洏鐮佷綅鏁板凡杈句笂绾�");
}
- string code = remove + Convert.ToString(sibelius).PadLeft(5, '0');
+ string code = remove + Convert.ToString(sibelius).PadLeft(6, '0');
if (db.Queryable<SysPallets>().Count(m=>m.PalletNo == code)>=1)
{
continue;
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index 24560ea..a77e393 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -1374,17 +1374,21 @@
{
throw new Exception("褰撳墠鏄剧ず鐨勬潯鐮佷笉鏄渶鏂版潯鐮侊紝璇烽噸鏂版坊鍔�");
}
- string str = model.PalletNo.Substring(3, 5);
- string remove = model.PalletNo.Substring(0, 3);
+ string str = model.PalletNo.Substring(2, 6);
+ string remove = model.PalletNo.Substring(0, 2);
int sibelius = Convert.ToInt16(str);
for (int i = 0; i < model.GroupCount; i++)
{
+ if (sibelius>999999)
+ {
+ throw new Exception("鎵樼洏缁勪腑宸叉湁鎵樼洏鐮佷綅鏁板凡杈句笂绾�");
+ }
if (i != 0)
{
sibelius += 1;
}
- string code = remove + Convert.ToString(sibelius).PadLeft(5, '0');
+ string code = remove + Convert.ToString(sibelius).PadLeft(6, '0');
for (int j = 0; j < model.SameCount; j++)
{
var re = BarcodeHelper.GetCodeBarBase64(code, 80, 50);
--
Gitblit v1.8.0