From 225a85b1a55f4475ba4441b3ed350e0df35ff735 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期二, 26 三月 2024 08:22:36 +0800
Subject: [PATCH] 点击取消移库任务时无法将目标储位与起始储位恢复，扫描完箱码数量后，未显示出向内条码信息。 取消分配后 点击编辑库存数量显示错误，锁定数量超出库存数量，添加明细时获取的物料信息存在问题。
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 42f39e2..a0e81f2 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -255,9 +255,9 @@
//{
// if (expr)
// {
-
+
// }
-
+
//}
var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 != null && m.BoxNo3 == demo.BoxNo);
if (com != null)
@@ -336,7 +336,7 @@
throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍒嗛厤淇℃伅锛岃鏍稿疄锛�");
}
}
-
+
//搴撳瓨鏄庣粏
var detail = Db.Queryable<DataStockDetail>().First(a => a.IsDel == "0" && a.PalletNo == palletNo);
if (detail == null)
@@ -352,7 +352,7 @@
{
SkuNo = detail.SkuNo,
BoxNo = detail.SkuNo,
- Qty = allot == null ? (int)(detail.Qty-detail.LockQty) : (int)allot.Qty,
+ Qty = allot == null ? (int)(detail.Qty - detail.LockQty) : (int)allot.Qty,
PickedQty = allot == null ? 0 : (int)allot.CompleteQty,
};
@@ -452,7 +452,7 @@
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
{
- if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+ if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3) && item.BoxNo3 != null)
{
throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
}
@@ -617,7 +617,7 @@
}
}
var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
-
+
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
{
@@ -648,7 +648,7 @@
if (biaoShi != "2")
{
//鍒犻櫎搴撳瓨绠辩爜鏄庣粏
- Db.Deleteable(item).ExecuteCommand();
+ Db.Deleteable(item).ExecuteCommand();
}
else//鏁伴噺鎷ｈ揣
{
@@ -875,7 +875,7 @@
Db.Updateable(complete).ExecuteCommand();
}
-
+
//淇敼鍑哄簱鍒嗛厤淇℃伅
@@ -936,7 +936,7 @@
pallet.Status = "0";
Db.Updateable(pallet).ExecuteCommand();
}
-
+
//淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
noticeDetail.CompleteQty += int.Parse(PickQty);
Db.Updateable(noticeDetail).ExecuteCommand();
@@ -1331,25 +1331,25 @@
{
var type = "";
var detail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
- if (detail== null)
+ if (detail == null)
{
throw new Exception("褰撳墠鎵樼洏鏈湪搴撳瓨涓�");
}
//鎬庝箞鍒ゆ柇褰撳墠鎵樼洏鏄簱澶栬鍙栨牱鐨勬墭鐩橈紝姝ｅ父鍑哄簱鍓╀綑鎵樼洏鐩墠杩欑鎯呭喌涔熻兘鎷ｈ揣鍟婏紝涔熸病鏈夊垎閰嶄俊鎭�
var allot = Db.Queryable<BllExportAllot>().First(m =>
m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "5" && m.Status != "6");
- if (allot!=null)
+ if (allot != null)
{
var soNo = Db.Queryable<BllExportNotice>()
.First(m => m.IsDel == "0" && m.SONo == allot.SONo);
if (soNo == null)
{
throw new Exception("鏈壘鍒版墭鐩樹笂鍑哄簱鍗曟嵁淇℃伅");
- }
+ }
if (soNo.Type != "3")
{
throw new Exception("璇ユ墭鐩樹笉鏄彇鏍锋墭鐩�");
- }
+ }
type = "0";//搴撳唴鍙栨牱
}
else
@@ -1392,7 +1392,7 @@
}
//鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
- public void SampleSoSetPick(string soType,string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string asnNo, int userId)
+ public void SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string asnNo, int userId)
{
Db.BeginTran();
try
@@ -1401,7 +1401,7 @@
{
throw new Exception("鍙栨牱鏍囪瘑涓嶈兘涓虹┖");
}
-
+
//soType: 0搴撳唴鍙栨牱锛屾湁鍑哄簱鍗曞強鍒嗛厤淇℃伅锛� 1搴撳墠鍙栨牱锛屽弽鍚戞坊鍔犲嚭搴撳崟鍙婂垎閰嶄俊鎭�
if (soType == "1")
{
@@ -1411,7 +1411,7 @@
if (string.IsNullOrWhiteSpace(asnNo))
{
throw new Exception("鍏ュ簱鍗曚笉鑳戒负绌�");
- }
+ }
if (string.IsNullOrWhiteSpace(palletNo))
{
throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
@@ -1436,7 +1436,7 @@
throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樼殑搴撳瓨鏄庣粏淇℃伅锛�");
}
- var sku = Db.Queryable<SysMaterials>().First(m=>m.IsDel == "0" && m.SkuNo == stockDetail.SkuNo);
+ var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == stockDetail.SkuNo);
if (sku == null)
{
throw new Exception("鏈煡璇㈠埌褰撳墠鎵樼洏涓婄殑鐗╂枡淇℃伅");
@@ -1451,7 +1451,7 @@
//鍑哄簱鍗�
var notice = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.AsnSampleNo == asnNo);
//鍒涘缓鍑哄簱鍗�
- if (notice == null || notice.Status == "6")
+ if (notice == null || notice.Status == "6")
{
var billNo = "";
var bl = true;
@@ -1463,7 +1463,7 @@
bl = Db.Queryable<BllExportNotice>().Any(m => m.SONo == no);
} while (bl);
-
+
var addNotice = new BllExportNotice()
{
SONo = billNo,
@@ -1475,7 +1475,7 @@
WaveNo = "",
IsDespatch = "0",
CompleteTime = DateTime.Now,
- CreateUser = userId,
+ CreateUser = userId,
};
var n = Db.Insertable(addNotice).ExecuteReturnEntity();
@@ -1509,7 +1509,7 @@
IsIssueLotNo = "0",
Status = "3",
CreateUser = userId,
-
+
};
var m = Db.Insertable(addNoticeDetail).ExecuteReturnEntity();
noticeDetail = m;
@@ -1532,8 +1532,8 @@
SkuName = sku.SkuName,
Standard = sku.Standard,
PalletNo = palletNo,
- IsBale = "0" , //鏄惁瑁瑰寘
- IsBelt = "0" , //鏄惁鎵撳甫
+ IsBale = "0", //鏄惁瑁瑰寘
+ IsBelt = "0", //鏄惁鎵撳甫
Qty = 0,
CompleteQty = 0,
@@ -1550,7 +1550,7 @@
var fp = Db.Insertable(addAllot).ExecuteReturnEntity();
allot2 = fp;
}
-
+
#endregion
@@ -1624,7 +1624,7 @@
}
}
var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
-
+
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
{
@@ -1679,7 +1679,7 @@
}
pickQty += biaoShi == "2" ? int.Parse(pickQty1) : item.Qty;
}
-
+
//鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
if (biaoShi == "1")
@@ -1696,13 +1696,13 @@
Db.Insertable(comList).ExecuteCommand();
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot2.Qty += pickQty;
- allot2.CompleteQty += pickQty;
+ allot2.CompleteQty += pickQty;
Db.Updateable(allot2).ExecuteCommand();
//鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
stockDetail.Qty -= pickQty;
-
+
if (stockDetail.Qty <= 0)
{
Db.Deleteable(stockDetail).ExecuteCommand();
@@ -1741,7 +1741,7 @@
Db.Updateable(noticeDetail).ExecuteCommand();
}
- else if(soType == "0")
+ else if (soType == "0")
{
#region 鍒ゆ柇
@@ -1887,7 +1887,7 @@
}
}
var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
-
+
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
{
@@ -2216,7 +2216,7 @@
SkuName = allot2.SkuName,
Standard = allot2.Standard,
PalletNo = palletNo,
- CompleteQty = int.Parse(PickQty) ,
+ CompleteQty = int.Parse(PickQty),
InspectMark = "1",
CreateUser = userId
@@ -2239,7 +2239,7 @@
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot2.Qty += int.Parse(PickQty);
- allot2.CompleteQty += int.Parse(PickQty);
+ allot2.CompleteQty += int.Parse(PickQty);
Db.Updateable(allot2).ExecuteCommand();
int isDel = 0;
@@ -2248,7 +2248,7 @@
stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
stockDetail.InspectMark = "1";//淇敼涓烘娊妫�鎵樻爣璇�
stockDetail.Qty -= int.Parse(PickQty);
- if (stockDetail.Qty == stockDetail.LockQty&& stockDetail.Qty != 0)
+ if (stockDetail.Qty == stockDetail.LockQty && stockDetail.Qty != 0)
{
stockDetail.Status = "2";
}
@@ -2301,7 +2301,7 @@
noticeDetail.CompleteQty += int.Parse(PickQty);
noticeDetail.Money = string.IsNullOrWhiteSpace(sku.Price.ToString()) ? null : sku.Price * noticeDetail.Qty;
Db.Updateable(noticeDetail).ExecuteCommand();
-
+
}
else if (soType == "0")
{
@@ -2516,7 +2516,7 @@
/// <param name="pickQty1"></param>
/// <param name="palletNoNew"></param>
/// <param name="userId"></param>
- public void SoSetPinPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1,string palletNoNew,int userId)
+ public void SoSetPinPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string palletNoNew, int userId)
{
Db.BeginTran();
try
@@ -2608,7 +2608,7 @@
{
isNew = true;
- var newPalletInfo = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status=="0");
+ var newPalletInfo = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
if (newPalletInfo == null)
{
throw new Exception("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
@@ -2626,7 +2626,7 @@
sd.SkuNo = stockDetail.SkuNo;
sd.SkuName = stockDetail.SkuName;
sd.Standard = stockDetail.Standard;
-
+
sd.FrozenQty = 0;
sd.InspectQty = 0;
sd.ASNNo = "";
@@ -2664,7 +2664,7 @@
sdId = Db.Insertable(sd).ExecuteReturnIdentity();
}
#endregion
-
+
var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
if (string.IsNullOrWhiteSpace(boxNo))//鏁存墭鎷ｈ揣
{
@@ -2998,7 +2998,7 @@
pinStockDetail.LockQty += pickQty;
Db.Updateable(pinStockDetail).ExecuteCommand();
}
-
+
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鎷兼墭", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勫師鎵樼洏鐮佷负锛歿palletNo}锛屾柊鎵樼洏鐮佷负锛歿palletNoNew}鐨勬嫞璐ф嫾鎵樻搷浣�", userId);
Db.CommitTran();
@@ -3018,7 +3018,7 @@
/// <param name="PickQty"></param>
/// <param name="palletNoNew"></param>
/// <param name="userId"></param>
- public void SoSetQtyPinPick(string soNo, string soDetailId, string palletNo, string PickQty,string palletNoNew, int userId)
+ public void SoSetQtyPinPick(string soNo, string soDetailId, string palletNo, string PickQty, string palletNoNew, int userId)
{
Db.BeginTran();
try
@@ -3116,7 +3116,7 @@
newPalletInfo.Status = "1";
Db.Updateable(newPalletInfo).ExecuteCommand();
}
-
+
if (isNew)
{
var sd = new DataStockDetail();
@@ -3260,7 +3260,7 @@
isDel = 1;
Db.Updateable(stockDetail).ExecuteCommand();
}
-
+
//鍒ゆ柇鎵樼洏涓婄墿鏂欐槸鍚︽嫞璐у畬姣�
if (isDel == 0)
{
--
Gitblit v1.8.0