From f8957ba7f0ade842553bd37254cf31da639a1925 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 20 十月 2024 17:41:36 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 199 ++++++++++++++++++++++++++-----------------------
1 files changed, 104 insertions(+), 95 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index ff2c8d6..1b59027 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -388,7 +388,7 @@
{
throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
}
- if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)
+ if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)
{
throw new Exception("杩芥函鏉＄爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏�");
}
@@ -580,18 +580,18 @@
biaoShi = "1";
}
- else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
+ else if (!string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
{
if (boxInfo.Count() > 1)
{
throw new Exception("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
}
decimal boxQty = boxInfo.First().Qty;
- if (Convert.ToInt32(pickQty1) > boxQty)
+ if (Convert.ToDecimal(pickQty1) > boxQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
}
- if (Convert.ToInt32(pickQty1) > needQty)
+ if (Convert.ToDecimal(pickQty1) > needQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
}
@@ -821,7 +821,7 @@
}
//鍓╀綑鎷ｈ揣鏁伴噺锛堝緟鎷ｅ噺鍘诲凡鎷ｏ級
var needQty = allot.Qty - allot.CompleteQty;
- if (int.Parse(PickQty) > needQty)
+ if (decimal.Parse(PickQty) > needQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鎵樺唴鍓╀綑寰呮嫞鏁伴噺");
}
@@ -884,7 +884,7 @@
}
else if (isComplete == 1)
{
- complete.CompleteQty += int.Parse(PickQty);
+ complete.CompleteQty += decimal.Parse(PickQty);
complete.UpdateUser = userId;
complete.UpdateTime = Db.GetDate();
@@ -892,7 +892,7 @@
}
//淇敼鍑哄簱鍒嗛厤淇℃伅
- allot.CompleteQty += int.Parse(PickQty);
+ allot.CompleteQty += decimal.Parse(PickQty);
allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
Db.Updateable(allot).ExecuteCommand();
@@ -901,8 +901,8 @@
//鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
- stockDetail.Qty -= int.Parse(PickQty);
- stockDetail.LockQty -= int.Parse(PickQty);
+ stockDetail.Qty -= decimal.Parse(PickQty);
+ stockDetail.LockQty -= decimal.Parse(PickQty);
if (stockDetail.Qty == stockDetail.LockQty)
{
stockDetail.Status = "2";
@@ -925,8 +925,8 @@
Db.Updateable(stockDetail).ExecuteCommand();
}
//鍒犻櫎鎴栦慨鏀瑰簱瀛�
- stock.Qty -= int.Parse(PickQty);
- stock.LockQty -= int.Parse(PickQty);
+ stock.Qty -= decimal.Parse(PickQty);
+ stock.LockQty -= decimal.Parse(PickQty);
if (stock.Qty <= 0)
{
Db.Deleteable(stock).ExecuteCommand();
@@ -1352,35 +1352,35 @@
{
#region 鍒嗛厤
- //娣诲姞鍒嗛厤琛ㄤ俊鎭�
- var allot = new BllExportAllot
- {
- SONo = "",
- WaveNo = "",
- SODetailNo = 0,
- StockId = s.Id,
- LotNo = "",
- LotText = "",
- SupplierLot = "",
- SkuNo = s.SkuNo,
- SkuName = s.SkuName,
- Standard = s.Standard,
- PalletNo = s.PalletNo,
- IsBale = "0", //鏄惁瑁瑰寘
- IsBelt = "0", //鏄惁鎵撳甫
+ ////娣诲姞鍒嗛厤琛ㄤ俊鎭�
+ //var allot = new BllExportAllot
+ //{
+ // SONo = "",
+ // WaveNo = "",
+ // SODetailNo = 0,
+ // StockId = s.Id,
+ // LotNo = "",
+ // LotText = "",
+ // SupplierLot = "",
+ // SkuNo = s.SkuNo,
+ // SkuName = s.SkuName,
+ // Standard = s.Standard,
+ // PalletNo = s.PalletNo,
+ // IsBale = "0", //鏄惁瑁瑰寘
+ // IsBelt = "0", //鏄惁鎵撳甫
- //BoxexQty = s.Qty,
- Qty = (int)s.Qty,
- CompleteQty = 0,
- Status = "1",
- LogisticsId = 0,
- IsAdvance = "0",
- OutMode = model.OutMode,//鍑哄簱鍙�
+ // //BoxexQty = s.Qty,
+ // Qty = (int)s.Qty,
+ // CompleteQty = 0,
+ // Status = "1",
+ // LogisticsId = 0,
+ // IsAdvance = "0",
+ // OutMode = model.OutMode,//鍑哄簱鍙�
- CreateUser = userId,
- CreateTime = DateTime.Now
- };
- Db.Insertable(allot).ExecuteCommand();
+ // CreateUser = userId,
+ // CreateTime = DateTime.Now
+ //};
+ //Db.Insertable(allot).ExecuteCommand();
#endregion
@@ -1395,7 +1395,10 @@
}
//鑾峰彇绉诲簱鐨勫簱浣�
var newSlot = MoveAddress(slotBefore.LocatNo, slotBefore.RoadwayNo, SkuNo, slotBefore.AreaNo);
-
+ if (string.IsNullOrWhiteSpace(newSlot))
+ {
+ continue;
+ }
var taskNo = new Common().GetMaxNo("TK");
var exTask = new LogTask //鍑哄簱浠诲姟
{
@@ -1415,7 +1418,7 @@
OrderType = "1",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
CreateTime = serverTime, //鍒涘缓鏃堕棿
CreateUser = userId, //鍒涘缓浜�
- Msg = "Pda绌烘墭浠�" + locat == null ? "" : s.LocatNo + "鍒�" + newSlot + "鐨勭Щ搴撲换鍔�", //鍏抽敭淇℃伅
+ Msg = "Pda绌烘墭浠�" + locat == null ? "" : slotBefore.LocatNo + "鍒�" + newSlot + "鐨勭Щ搴撲换鍔�", //鍏抽敭淇℃伅
//FinishDate = serverTime, //瀹屾垚鏃堕棿
};
moveDto.Add(new OutCommandDto()
@@ -1425,7 +1428,7 @@
StartRoadway = locat.RoadwayNo, //鎵�灞炲贩閬�
EndLocate = exTask.EndLocat, // 鐩爣浣嶇疆
TaskNo = exTask.TaskNo, // 浠诲姟鍙�
- TaskType = "2",// 浠诲姟绫诲瀷 (鍑哄簱)
+ TaskType = "2",// 浠诲姟绫诲瀷 (绉诲簱)
OutMode = "", //鐩爣鍦板潃
Order = 1
});
@@ -1437,6 +1440,12 @@
//鏇存敼鍌ㄤ綅鐘舵�佷负绉诲嚭涓�
slotBefore.Status = "5"; //5 绉诲嚭涓�
Db.Updateable(slotBefore).ExecuteCommand();//淇敼鍌ㄤ綅淇℃伅
+ var newSlot2 = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == newSlot && m.IsDel == "0");
+ if (newSlot2!= null)
+ {
+ newSlot2.Status = "4";//绉诲叆涓�
+ Db.Updateable(newSlot2).ExecuteCommand();//淇敼鍌ㄤ綅淇℃伅
+ }
#endregion
}
else //鍑哄簱
@@ -1444,17 +1453,17 @@
#region 鏀瑰彉搴撳瓨
//澧炲姞搴撳瓨閿佸畾鏁伴噺
- stock.LockQty += (int)s.Qty; //閿佸畾鏁伴噺
+ stock.LockQty += (int)pallSku.Qty; //閿佸畾鏁伴噺
stock.UpdateTime = serverTime; //淇敼鏃堕棿
stock.UpdateUser = userId; //淇敼浜�
Db.Updateable(stock).ExecuteCommand();//淇敼搴撳瓨鎬昏〃淇℃伅
//澧炲姞搴撳瓨鏄庣粏閿佸畾鏁伴噺
- s.LockQty += (int)s.Qty; //閿佸畾鏁伴噺
- s.UpdateTime = serverTime; //淇敼鏃堕棿
- s.UpdateUser = userId; //淇敼浜�
- s.Status = "2"; //2 宸插垎閰�
- Db.Updateable(s).ExecuteCommand();//淇敼搴撳瓨鏄庣粏淇℃伅
+ pallSku.LockQty += (int)pallSku.Qty; //閿佸畾鏁伴噺
+ pallSku.UpdateTime = serverTime; //淇敼鏃堕棿
+ pallSku.UpdateUser = userId; //淇敼浜�
+ pallSku.Status = "2"; //2 宸插垎閰�
+ Db.Updateable(pallSku).ExecuteCommand();//淇敼搴撳瓨鏄庣粏淇℃伅
#endregion
@@ -1466,19 +1475,19 @@
SONo = "",
WaveNo = "",
SODetailNo = 0,
- StockId = s.Id,
+ StockId = pallSku.Id,
LotNo = "",
LotText = "",
SupplierLot = "",
- SkuNo = s.SkuNo,
- SkuName = s.SkuName,
- Standard = s.Standard,
- PalletNo = s.PalletNo,
+ SkuNo = pallSku.SkuNo,
+ SkuName = pallSku.SkuName,
+ Standard = pallSku.Standard,
+ PalletNo = pallSku.PalletNo,
IsBale = "0", //鏄惁瑁瑰寘
IsBelt = "0", //鏄惁鎵撳甫
//BoxexQty = s.Qty,
- Qty = (int)s.Qty,
+ Qty = (int)pallSku.Qty,
CompleteQty = 0,
Status = "1",
LogisticsId = 0,
@@ -1502,9 +1511,9 @@
Receiver = "PDA",
IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
- StartLocat = locat == null ? "" : s.LocatNo,//璧峰浣嶇疆
+ StartLocat = locat == null ? "" : pallSku.LocatNo,//璧峰浣嶇疆
EndLocat = model.OutMode,//鐩爣浣嶇疆
- PalletNo = s.PalletNo,//鎵樼洏鐮�
+ PalletNo = pallSku.PalletNo,//鎵樼洏鐮�
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
@@ -1513,7 +1522,7 @@
OrderType = "1",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
CreateTime = serverTime, //鍒涘缓鏃堕棿
CreateUser = userId, //鍒涘缓浜�
- Msg = "Pda绌烘墭浠�" + locat == null ? "" : s.LocatNo + "鍒�" + model.OutMode + "鐨勫嚭搴撲换鍔�", //鍏抽敭淇℃伅
+ Msg = "Pda绌烘墭浠�" + locat == null ? "" : pallSku.LocatNo + "鍒�" + model.OutMode + "鐨勫嚭搴撲换鍔�", //鍏抽敭淇℃伅
//FinishDate = serverTime, //瀹屾垚鏃堕棿
};
outDto2.Add(new OutCommandDto()
@@ -2729,7 +2738,7 @@
{
throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
}
- if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)
+ if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)
{
throw new Exception("杩芥函鏉＄爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏�");
}
@@ -2904,7 +2913,7 @@
}
biaoShi = "1";
}
- else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
+ else if (!string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
{
if (boxInfo.Count() > 1)
{
@@ -3070,7 +3079,7 @@
{
throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
}
- if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)
+ if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)
{
throw new Exception("杩芥函鏉＄爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏�");
}
@@ -3158,18 +3167,18 @@
}
biaoShi = "1";
}
- else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
+ else if (!string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
{
if (boxInfo.Count() > 1)
{
throw new Exception("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
}
decimal boxQty = boxInfo.First().Qty;
- if (Convert.ToInt32(pickQty1) > boxQty)
+ if (Convert.ToDecimal(pickQty1) > boxQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
}
- if (Convert.ToInt32(pickQty1) > needQty)
+ if (Convert.ToDecimal(pickQty1) > needQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
}
@@ -3533,7 +3542,7 @@
SkuName = allot2.SkuName,
Standard = allot2.Standard,
PalletNo = palletNo,
- CompleteQty = int.Parse(PickQty),
+ CompleteQty = decimal.Parse(PickQty),
InspectMark = "1",
CreateUser = userId
@@ -3545,7 +3554,7 @@
}
else if (isComplete == 1)
{
- complete.CompleteQty += int.Parse(PickQty);
+ complete.CompleteQty += decimal.Parse(PickQty);
complete.UpdateUser = userId;
complete.UpdateTime = Db.GetDate();
@@ -3555,8 +3564,8 @@
//淇敼鍑哄簱鍒嗛厤淇℃伅
- allot2.Qty += int.Parse(PickQty);
- allot2.CompleteQty += int.Parse(PickQty);
+ allot2.Qty += decimal.Parse(PickQty);
+ allot2.CompleteQty += decimal.Parse(PickQty);
Db.Updateable(allot2).ExecuteCommand();
int isDel = 0;
@@ -3564,7 +3573,7 @@
//鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
stockDetail.InspectMark = "1";//淇敼涓烘娊妫�鎵樻爣璇�
- stockDetail.Qty -= int.Parse(PickQty);
+ stockDetail.Qty -= decimal.Parse(PickQty);
if (stockDetail.Qty == stockDetail.LockQty && stockDetail.Qty != 0)
{
stockDetail.Status = "2";
@@ -3612,10 +3621,10 @@
}
//淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
- noticeDetail.Qty += int.Parse(PickQty);
- noticeDetail.AllotQty += int.Parse(PickQty);
- noticeDetail.FactQty += int.Parse(PickQty);
- noticeDetail.CompleteQty += int.Parse(PickQty);
+ noticeDetail.Qty += decimal.Parse(PickQty);
+ noticeDetail.AllotQty += decimal.Parse(PickQty);
+ noticeDetail.FactQty += decimal.Parse(PickQty);
+ noticeDetail.CompleteQty += decimal.Parse(PickQty);
noticeDetail.Money = string.IsNullOrWhiteSpace(sku.Price.ToString()) ? null : sku.Price * noticeDetail.Qty;
Db.Updateable(noticeDetail).ExecuteCommand();
@@ -3664,7 +3673,7 @@
}
//鍓╀綑鎷ｈ揣鏁伴噺锛堝緟鎷ｅ噺鍘诲凡鎷ｏ級
var needQty = allot.Qty - allot.CompleteQty;
- if (int.Parse(PickQty) > needQty)
+ if (decimal.Parse(PickQty) > needQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鎵樺唴鍓╀綑寰呮嫞鏁伴噺");
}
@@ -3714,7 +3723,7 @@
SkuName = allot.SkuName,
Standard = allot.Standard,
PalletNo = palletNo,
- CompleteQty = int.Parse(PickQty),
+ CompleteQty = decimal.Parse(PickQty),
CreateUser = userId,
CreateTime = Db.GetDate(),
@@ -3726,7 +3735,7 @@
}
else if (isComplete == 1)
{
- complete.CompleteQty += int.Parse(PickQty);
+ complete.CompleteQty += decimal.Parse(PickQty);
complete.UpdateUser = userId;
complete.UpdateTime = Db.GetDate();
@@ -3736,7 +3745,7 @@
//淇敼鍑哄簱鍒嗛厤淇℃伅
- allot.CompleteQty += int.Parse(PickQty);
+ allot.CompleteQty += decimal.Parse(PickQty);
allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
@@ -3746,8 +3755,8 @@
//鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
- stockDetail.Qty -= int.Parse(PickQty);
- stockDetail.LockQty -= int.Parse(PickQty);
+ stockDetail.Qty -= decimal.Parse(PickQty);
+ stockDetail.LockQty -= decimal.Parse(PickQty);
if (stockDetail.Qty == stockDetail.LockQty)
{
stockDetail.Status = "2";
@@ -3770,8 +3779,8 @@
Db.Updateable(stockDetail).ExecuteCommand();
}
//鍒犻櫎鎴栦慨鏀瑰簱瀛�
- stock.Qty -= int.Parse(PickQty);
- stock.LockQty -= int.Parse(PickQty);
+ stock.Qty -= decimal.Parse(PickQty);
+ stock.LockQty -= decimal.Parse(PickQty);
if (stock.Qty <= 0)
{
Db.Deleteable(stock).ExecuteCommand();
@@ -3796,7 +3805,7 @@
}
//淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
- noticeDetail.CompleteQty += int.Parse(PickQty);
+ noticeDetail.CompleteQty += decimal.Parse(PickQty);
Db.Updateable(noticeDetail).ExecuteCommand();
var num = Db.Queryable<BllExportNoticeDetail>()
@@ -3853,7 +3862,7 @@
{
throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
}
- if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)
+ if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)
{
throw new Exception("杩芥函鏉＄爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏�");
}
@@ -4149,7 +4158,7 @@
biaoShi = "1";
}
- else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
+ else if (!string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
{
if (boxInfo.Count() > 1)
{
@@ -4307,7 +4316,7 @@
}
- pickQty += int.Parse(pickQty1);
+ pickQty += decimal.Parse(pickQty1);
}
}
//鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
@@ -4477,7 +4486,7 @@
}
//鍓╀綑鎷ｈ揣鏁伴噺锛堝緟鎷ｅ噺鍘诲凡鎷ｏ級
var needQty = allot.Qty - allot.CompleteQty;
- if (int.Parse(PickQty) > needQty)
+ if (decimal.Parse(PickQty) > needQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鎵樺唴鍓╀綑寰呮嫞鏁伴噺");
}
@@ -4496,7 +4505,7 @@
}
if (palletNo == palletNoNew)//鍘熸墭鐩樹笌鏂版墭鐩樹竴鑷�
{
- if (int.Parse(PickQty) != stockDetail.Qty)
+ if (decimal.Parse(PickQty) != stockDetail.Qty)
{
throw new Exception("鍘熸墭鐩樹笌鏂版墭鐩樹竴鑷达紝闇�瑕佹妸鎵樼洏涓婃墍鏈夋暟閲忔嫞璐�");
}
@@ -4545,8 +4554,8 @@
sd.SkuName = stockDetail.SkuName;
sd.Standard = stockDetail.Standard;
- sd.Qty = int.Parse(PickQty);
- sd.LockQty = int.Parse(PickQty);
+ sd.Qty = decimal.Parse(PickQty);
+ sd.LockQty = decimal.Parse(PickQty);
sd.FrozenQty = 0;
sd.InspectQty = 0;
@@ -4589,8 +4598,8 @@
if (palletNo != palletNoNew)
{
//淇敼鎷兼墭鎵樼洏搴撳瓨鏄庣粏
- pinStockDetail.Qty += int.Parse(PickQty);
- pinStockDetail.LockQty += int.Parse(PickQty);
+ pinStockDetail.Qty += decimal.Parse(PickQty);
+ pinStockDetail.LockQty += decimal.Parse(PickQty);
Db.Updateable(pinStockDetail).ExecuteCommand();
}
else
@@ -4634,7 +4643,7 @@
SkuName = allot.SkuName,
Standard = allot.Standard,
PalletNo = palletNo,
- CompleteQty = int.Parse(PickQty),
+ CompleteQty = decimal.Parse(PickQty),
CreateUser = userId,
CreateTime = Db.GetDate(),
@@ -4646,7 +4655,7 @@
}
else if (isComplete == 1)
{
- complete.CompleteQty += int.Parse(PickQty);
+ complete.CompleteQty += decimal.Parse(PickQty);
complete.UpdateUser = userId;
complete.UpdateTime = Db.GetDate();
@@ -4654,7 +4663,7 @@
}
//淇敼鍑哄簱鍒嗛厤淇℃伅
- allot.CompleteQty += int.Parse(PickQty);
+ allot.CompleteQty += decimal.Parse(PickQty);
allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
Db.Updateable(allot).ExecuteCommand();
@@ -4665,8 +4674,8 @@
{
//鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
- stockDetail.Qty -= int.Parse(PickQty);
- stockDetail.LockQty -= int.Parse(PickQty);
+ stockDetail.Qty -= decimal.Parse(PickQty);
+ stockDetail.LockQty -= decimal.Parse(PickQty);
if (stockDetail.Qty == stockDetail.LockQty)
{
stockDetail.Status = "2";
@@ -4708,7 +4717,7 @@
}
//淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
- noticeDetail.CompleteQty += int.Parse(PickQty);
+ noticeDetail.CompleteQty += decimal.Parse(PickQty);
noticeDetail.Status = "2";
Db.Updateable(noticeDetail).ExecuteCommand();
--
Gitblit v1.8.0