From b88cbdbc97735732fe6406fbe5aa3228eaa1b551 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 20 十月 2025 13:13:44 +0800
Subject: [PATCH] 修改包装管理，包装可输入小数
---
Wms/WMS.BLL/HttpServer.cs | 4 +-
Wms/WMS.Entity/SysEntity/SysPackag.cs | 10 ++--
HTML/views/BaseSetting/PackagFrom.html | 6 +-
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 10 ++--
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 4 +-
Wms/WMS.BLL/Logic/AllotSku.cs | 2
Wms/WMS.DAL/Common.cs | 22 +++++-----
Wms/WMS.BLL/SysServer/PackagServer.cs | 10 ++--
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 28 +++++++-------
9 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/HTML/views/BaseSetting/PackagFrom.html b/HTML/views/BaseSetting/PackagFrom.html
index 00f81dc..3fd8a2b 100644
--- a/HTML/views/BaseSetting/PackagFrom.html
+++ b/HTML/views/BaseSetting/PackagFrom.html
@@ -59,7 +59,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: auto;">涓�绾у寘瑁�</label>
<div class="layui-input-inline">
- <input type="number" name="OnelevelNum" lay-verify="required" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+ <input type="number" name="OnelevelNum" lay-verify="required" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" class="layui-input">
</div>
<div class="layui-input-inline" style="float: left;left: 40px;">
<input type="text" name="OnelevelUnit" lay-verify="required" placeholder="璇疯緭鍏ュ崟浣嶆弿杩�" autocomplete="off" class="layui-input">
@@ -70,7 +70,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: auto;">浜岀骇鍖呰</label>
<div class="layui-input-inline">
- <input type="number" name="TwolevelNum" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+ <input type="number" name="TwolevelNum" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" class="layui-input">
</div>
<div class="layui-input-inline" style="float: left;left: 40px;">
<input type="text" name="TwolevelUnit" placeholder="璇疯緭鍏ュ崟浣嶆弿杩�" autocomplete="off" class="layui-input">
@@ -81,7 +81,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: auto;">涓夌骇鍖呰</label>
<div class="layui-input-inline">
- <input type="number" name="ThreelevelNum" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+ <input type="number" name="ThreelevelNum" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" class="layui-input">
</div>
<div class="layui-input-inline" style="float: left;left: 40px;">
<input type="text" name="ThreelevelUnit" placeholder="璇疯緭鍏ュ崟浣嶆弿杩�" autocomplete="off" class="layui-input">
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index 6296674..cb79491 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -672,8 +672,8 @@
#region 鍖呰鏌ヨ
- var bNum = 0;//绠辩墿鍝佹暟閲�
- var zNum = 0;//鏀墿鍝佹暟閲�
+ var bNum = 0m;//绠辩墿鍝佹暟閲�
+ var zNum = 0m;//鏀墿鍝佹暟閲�
var packLevel = 0;
if (pack.L2Num.HasValue)
@@ -681,7 +681,7 @@
if (pack.L2Name != "鎵�")
{
packLevel = 1;//JC34椤圭洰鍙湁涓�绾ф爣绛�
- bNum = Convert.ToInt32(pack.L2Num);
+ bNum = Convert.ToDecimal(pack.L2Num);
}
}
if (pack.L1Num.HasValue)
@@ -689,9 +689,9 @@
if (packLevel == 0)
{
packLevel = 1;
- bNum = Convert.ToInt32(pack.L1Num);
+ bNum = Convert.ToDecimal(pack.L1Num);
}
- zNum = Convert.ToInt32(pack.L1Num);
+ zNum = Convert.ToDecimal(pack.L1Num);
}
if (packLevel < 1)//鍖呰绛夌骇灏忎簬1锛屾寜鐓�1绾ф爣绛炬墦鍗�
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index ae98c96..0a3894e 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -151,8 +151,8 @@
{
throw new Exception("褰撳墠鐗╂枡鍖呰淇℃伅涓嶅瓨鍦紝璇锋牳瀹�!");
}
- var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
- var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺
//鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
@@ -1235,8 +1235,8 @@
throw new Exception("鏈煡璇㈠埌璇ョ墿鏂欏寘瑁呬俊鎭紝璇锋牳瀹烇紒");
}
- var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
- var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺
//鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
@@ -1986,8 +1986,8 @@
var addComBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allotId).ToList();
var addComList = addComBox.GroupBy(m => m.BoxNo).ToList();
var sku = Db.Queryable<SysMaterials>().First(m => m.SkuNo == addComBox.First().SkuNo);
- var pNum = 0;
- var bNum = 0;
+ var pNum = 0m;
+ var bNum = 0m;
new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
var boxList = new List<BllBoxInfo>();
foreach (var com in addComList)
@@ -2261,8 +2261,8 @@
throw new Exception($"鏈煡璇㈠埌鐗╂枡{obj.Data.SkuNo}淇℃伅");
}
- var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
- var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺
//鑾峰彇鍖呰淇℃伅
new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
if (pNum == 0 || bNum == 0)
@@ -2692,8 +2692,8 @@
var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == boxInfoOne.SkuNo);
var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);
- var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
- var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺
//鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
new Common().GetPackQtyInfo(pack.PackagNo, ref pNum, ref bNum);
@@ -2958,8 +2958,8 @@
var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == skuInfo.PackagNo);
- var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
- var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺
//鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
new Common().GetPackQtyInfo(pack.PackagNo, ref pNum, ref bNum);
@@ -3305,8 +3305,8 @@
}
//鑾峰彇鎵樼洏淇℃伅
var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == "100099");
- var pNum = 0;
- var bNum = 0;
+ var pNum = 0m;
+ var bNum = 0m;
new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 2e052c0..6d6f545 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2765,8 +2765,8 @@
}
#region 鍖呰淇℃伅
- var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
- var bNum = 0;//绠辩墿鍝佹暟閲�
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩墿鍝佹暟閲�
//鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
new Common().GetPackQtyInfo(detail.PackagNo, ref pNum, ref bNum);
diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs
index 7ca3643..8994443 100644
--- a/Wms/WMS.BLL/HttpServer.cs
+++ b/Wms/WMS.BLL/HttpServer.cs
@@ -87,8 +87,8 @@
{
throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒扮┖鎵樼洏鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
}
- var pNum = 0;
- var bNum = 0;
+ var pNum = 0m;
+ var bNum = 0m;
new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
diff --git a/Wms/WMS.BLL/Logic/AllotSku.cs b/Wms/WMS.BLL/Logic/AllotSku.cs
index b4be3d2..ef388f5 100644
--- a/Wms/WMS.BLL/Logic/AllotSku.cs
+++ b/Wms/WMS.BLL/Logic/AllotSku.cs
@@ -23,7 +23,7 @@
/// <param name="lotNo">鎵规</param>
/// <param name="isMixBox">鏄惁鎺ュ彈鎷肩 0锛氬惁 1锛氭槸</param>
/// <returns></returns>
- public decimal AllotPallets(List<DataStockDetail> palletList, decimal needQty, int fullPalletQty, int fullBoxQty, Dictionary<int, decimal> stockQtyDic,string house)
+ public decimal AllotPallets(List<DataStockDetail> palletList, decimal needQty, decimal fullPalletQty, decimal fullBoxQty, Dictionary<int, decimal> stockQtyDic,string house)
{
//浼樺厛鍏堣繘鍏堝嚭锛堝揩杩囨湡鐨勫厛鍑猴級
//浼樺厛闆剁銆侀浂鎵橈紙鍑哄畬闆剁鍑烘暣绠憋級
diff --git a/Wms/WMS.BLL/SysServer/PackagServer.cs b/Wms/WMS.BLL/SysServer/PackagServer.cs
index b898786..c9d5a7c 100644
--- a/Wms/WMS.BLL/SysServer/PackagServer.cs
+++ b/Wms/WMS.BLL/SysServer/PackagServer.cs
@@ -210,7 +210,7 @@
//鍒ゆ柇浜旂骇鍖呰鏄惁涓虹┖
if (!string.IsNullOrEmpty(model.L5Num) && !string.IsNullOrEmpty(model.L5Name))
{
- packagItems.L5Num = int.Parse(model.L5Num);
+ packagItems.L5Num = decimal.Parse(model.L5Num);
packagItems.L5Name = model.L5Name;
packagItems.Level += 1;
//鍒ゆ柇鍥涚骇鍖呰鏄惁涓虹┖
@@ -227,7 +227,7 @@
//鍒ゆ柇鍥涚骇鍖呰鏄惁涓虹┖
if (!string.IsNullOrEmpty(model.L4Num) && !string.IsNullOrEmpty(model.L4Name))
{
- packagItems.L4Num = int.Parse(model.L4Num);
+ packagItems.L4Num = decimal.Parse(model.L4Num);
packagItems.L4Name = model.L4Name;
packagItems.Level += 1;
//鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
@@ -244,7 +244,7 @@
//鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
if (!string.IsNullOrEmpty(model.L3Num) && !string.IsNullOrEmpty(model.L3Name))
{
- packagItems.L3Num = int.Parse(model.L3Num);
+ packagItems.L3Num = decimal.Parse(model.L3Num);
packagItems.L3Name = model.L3Name;
packagItems.Level += 1;
//鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
@@ -261,7 +261,7 @@
//鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
if (!string.IsNullOrEmpty(model.L2Num) && !string.IsNullOrEmpty(model.L2Name))
{
- packagItems.L2Num = int.Parse(model.L2Num);
+ packagItems.L2Num = decimal.Parse(model.L2Num);
packagItems.L2Name = model.L2Name;
packagItems.Level += 1;
//鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
@@ -278,7 +278,7 @@
//鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
if (!string.IsNullOrEmpty(model.L1Num) && !string.IsNullOrEmpty(model.L1Name))
{
- packagItems.L1Num = int.Parse(model.L1Num);
+ packagItems.L1Num = decimal.Parse(model.L1Num);
packagItems.L1Name = model.L1Name;
packagItems.Level += 1;
}
diff --git a/Wms/WMS.DAL/Common.cs b/Wms/WMS.DAL/Common.cs
index 3941cf0..df82c63 100644
--- a/Wms/WMS.DAL/Common.cs
+++ b/Wms/WMS.DAL/Common.cs
@@ -338,7 +338,7 @@
/// <param name="packNo"></param>
/// <param name="pNum">鎵樼洏鍖呰鏁�</param>
/// <param name="bNum">绠卞寘瑁呮暟</param>
- public void GetPackQtyInfo(string packNo, ref int pNum, ref int bNum)
+ public void GetPackQtyInfo(string packNo, ref decimal pNum, ref decimal bNum)
{
try
{
@@ -348,28 +348,28 @@
{
if (pack.L5Num.HasValue)
{
- pNum = Convert.ToInt32(pack.L5Num);
- bNum = Convert.ToInt32(pack.L4Num);
+ pNum = Convert.ToDecimal(pack.L5Num);
+ bNum = Convert.ToDecimal(pack.L4Num);
}
else if (pack.L4Num.HasValue)
{
- pNum = Convert.ToInt32(pack.L4Num);
- bNum = Convert.ToInt32(pack.L3Num);
+ pNum = Convert.ToDecimal(pack.L4Num);
+ bNum = Convert.ToDecimal(pack.L3Num);
}
else if (pack.L3Num.HasValue)
{
- pNum = Convert.ToInt32(pack.L3Num);
- bNum = Convert.ToInt32(pack.L2Num);
+ pNum = Convert.ToDecimal(pack.L3Num);
+ bNum = Convert.ToDecimal(pack.L2Num);
}
else if (pack.L2Num.HasValue)
{
- pNum = Convert.ToInt32(pack.L2Num);
- bNum = Convert.ToInt32(pack.L1Num);
+ pNum = Convert.ToDecimal(pack.L2Num);
+ bNum = Convert.ToDecimal(pack.L1Num);
}
else if (pack.L1Num.HasValue)
{
- pNum = Convert.ToInt32(pack.L1Num);
- bNum = Convert.ToInt32(pack.L1Num);
+ pNum = Convert.ToDecimal(pack.L1Num);
+ bNum = Convert.ToDecimal(pack.L1Num);
}
}
}
diff --git a/Wms/WMS.Entity/SysEntity/SysPackag.cs b/Wms/WMS.Entity/SysEntity/SysPackag.cs
index 290adbe..ff011fb 100644
--- a/Wms/WMS.Entity/SysEntity/SysPackag.cs
+++ b/Wms/WMS.Entity/SysEntity/SysPackag.cs
@@ -33,7 +33,7 @@
/// 涓�绾у寘瑁�-鏁伴噺
/// Nullable:True
/// </summary>
- public int? L1Num { get; set; }
+ public decimal? L1Num { get; set; }
/// <summary>
/// 涓�绾у寘瑁�-鎻忚堪
@@ -45,7 +45,7 @@
/// 浜岀骇鍖呰-鏁伴噺
/// Nullable:True
/// </summary>
- public int? L2Num { get; set; }
+ public decimal? L2Num { get; set; }
/// <summary>
/// 浜岀骇鍖呰-鎻忚堪
@@ -57,7 +57,7 @@
/// 涓夌骇鍖呰-鏁伴噺
/// Nullable:True
/// </summary>
- public int? L3Num { get; set; }
+ public decimal? L3Num { get; set; }
/// <summary>
/// 涓夌骇鍖呰-鎻忚堪
@@ -69,7 +69,7 @@
/// 鍥涚骇鍖呰-鏁伴噺
/// Nullable:True
/// </summary>
- public int? L4Num { get; set; }
+ public decimal? L4Num { get; set; }
/// <summary>
/// 鍥涚骇鍖呰-鎻忚堪
@@ -81,7 +81,7 @@
/// 鍏朵粬鍖呰-鏁伴噺
/// Nullable:True
/// </summary>
- public int? L5Num { get; set; }
+ public decimal? L5Num { get; set; }
/// <summary>
/// 鍏朵粬鍖呰-鎻忚堪
--
Gitblit v1.8.0