From a9522f978edf6dee98949f9ed715fc36f999ed4f Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期五, 22 三月 2024 15:37:04 +0800
Subject: [PATCH] 修改bug问题
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 42 ++++++++++++---------
Pda/View/SoSetting/SampleOut.html | 4 +-
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 31 ++++++++-------
3 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/Pda/View/SoSetting/SampleOut.html b/Pda/View/SoSetting/SampleOut.html
index 0daa6f8..8ed7e48 100644
--- a/Pda/View/SoSetting/SampleOut.html
+++ b/Pda/View/SoSetting/SampleOut.html
@@ -1315,7 +1315,7 @@
$('#kuneilabel2').show();
$('#kuqianlabel2').hide();
updateBillList2();
- // console.log($('#bar2').val())
+ console.log($('#bar2').val())
if ($('#bar2').val() == "") {
console.log(1)
clear21();
@@ -1333,7 +1333,7 @@
$('#kuqianlabel2').show();
$('#kuneilabel2').hide();
updateAsnBillList2();
- GetBoxInfo();
+ GetDataInfo();
sampleType = "1";
}
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 2485aa5..81ab6c3 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -377,12 +377,12 @@
{
//鑾峰彇浠诲姟淇℃伅
var logtask = Db.Queryable<LogTask>().First(a => a.PalletNo == upBindPalletNo && a.IsDel == "0" && a.Status == "1");
- if (logtask == null)
+ if (logtask != null)
{
strMsg = "璇ユ墭鐩樹换鍔″凡瀹屾垚 鎴栨湭鎴愬姛鍒涘缓浠诲姟 璇锋牳瀹烇紒";
return strMsg;
}
- string bindstr = "select * from BllPalletBind Where IsDel = @isdel and PalletNo = @palletno and ASNDetailNo = 0 and ASNNo = ''";
+ string bindstr = "select * from BllPalletBind Where IsDel = @isdel and PalletNo = @palletno and ASNDetailNo = 0 and ASNNo = '' ";
//鑾峰彇缁戝畾鎵樼洏琛ㄤ俊鎭�
List<PalletBindVm> bindVms = Db.Ado.SqlQuery<PalletBindVm>(bindstr, new
{
@@ -398,10 +398,13 @@
return strMsg;
}
//鍒犻櫎缁戝畾鎵樼洏琛ㄤ俊鎭�
- string delstr = "delete from BllPalletBind Where PalletNo = @palletno";
+ string delstr = "update BllPalletBind set IsDel = 1,UpdateUser = @UpdateUser,UpdateTime = @UpdateTime Where PalletNo = @palletno and Id =@Id ";
int i = Db.Ado.ExecuteCommand(delstr, new
{
- palletno = upBindPalletNo
+ UpdateUser = createUser,
+ UpdateTime = DateTime.Now,
+ palletno = upBindPalletNo,
+ Id = bindVms[0].Id
});
//淇敼鎵樼洏鐘舵��
Db.BeginTran();
@@ -428,12 +431,12 @@
box.IsDel = "1";
Db.Updateable(box).ExecuteCommand();
- //淇敼浠诲姟鐘舵��
- logtask.IsDel = "1";
- logtask.Status = "4"; //3 宸插彇娑�
- logtask.UpdateUser = createUser; //鍙栨秷浜�
- logtask.UpdateTime = DateTime.Now; //鍙栨秷鏃堕棿
- Db.Updateable(logtask).ExecuteCommand();
+ ////淇敼浠诲姟鐘舵��
+ //logtask.IsDel = "1";
+ //logtask.Status = "4"; //3 宸插彇娑�
+ //logtask.UpdateUser = createUser; //鍙栨秷浜�
+ //logtask.UpdateTime = DateTime.Now; //鍙栨秷鏃堕棿
+ //Db.Updateable(logtask).ExecuteCommand();
//鏇存敼搴撳瓨鏁伴噺
//string str = $"update DataStock set Qty = Qty - {(int)bindVms[0].Qty} Where SkuNo = '100099'";
// 鏇存敼鎵樼洏浣跨敤鐘舵��
@@ -2032,10 +2035,10 @@
Demo = model.Demo,
};
- if (model.TableType == 0 && isDeposit == 0 && isTextTable == 0)
- {
- throw new Exception($"缁戝畾澶辫触锛寋model.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
- }
+ //if (model.TableType == 0 && isDeposit == 0 && isTextTable == 0) 涓嶅お鐞嗚В杩欐浠ｇ爜鐨勫惈涔�
+ //{
+ // throw new Exception($"缁戝畾澶辫触锛寋model.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
+ //}
// 鎻掑叆鎵樼洏缁戝畾琛�
bindId = Db.Insertable(bind).ExecuteReturnIdentity();
}
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 7172e55..42f39e2 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -313,24 +313,30 @@
{
throw new Exception($"{palletNo}鎵樼洏涓婂瓨鍦ㄧ鐮佷俊鎭紝鏃犳硶鍦ㄦ暟閲忔嫞璐ц繘琛屾搷浣滐紒");
}
- //鍑哄簱鍗曟槑缁�
- var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(a => a.Id == int.Parse(soDetailId) && a.IsDel == "0");
- if (noticeDetail == null)
+
+ BllExportAllot allot = null;
+ if (!string.IsNullOrWhiteSpace(soDetailId))
{
- throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍑哄簱鍗曟槑缁嗕俊鎭紝璇锋牳瀹烇紒");
+ //鍑哄簱鍗曟槑缁�
+ var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(a => a.Id == int.Parse(soDetailId) && a.IsDel == "0");
+ if (noticeDetail == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍑哄簱鍗曟槑缁嗕俊鎭紝璇锋牳瀹烇紒");
+ }
+ //鍑哄簱鍗曟�诲崟
+ var notice = Db.Queryable<BllExportNotice>().First(a => a.IsDel == "0" && a.SONo == noticeDetail.SONo);
+ if (notice == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍑哄簱鍗曟�诲崟淇℃伅锛岃鏍稿疄锛�");
+ }
+ //鍒嗛厤淇℃伅
+ allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.PalletNo == palletNo && (a.Status == "2" || a.Status == "3"));
+ if (allot == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍒嗛厤淇℃伅锛岃鏍稿疄锛�");
+ }
}
- //鍑哄簱鍗曟�诲崟
- var notice = Db.Queryable<BllExportNotice>().First(a => a.IsDel == "0" && a.SONo == noticeDetail.SONo);
- if (notice == null)
- {
- throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍑哄簱鍗曟�诲崟淇℃伅锛岃鏍稿疄锛�");
- }
- //鍒嗛厤淇℃伅
- var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.PalletNo == palletNo && (a.Status == "2" || a.Status == "3"));
- if (allot == null)
- {
- throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍒嗛厤淇℃伅锛岃鏍稿疄锛�");
- }
+
//搴撳瓨鏄庣粏
var detail = Db.Queryable<DataStockDetail>().First(a => a.IsDel == "0" && a.PalletNo == palletNo);
if (detail == null)
@@ -346,8 +352,8 @@
{
SkuNo = detail.SkuNo,
BoxNo = detail.SkuNo,
- Qty = (int)allot.Qty,
- PickedQty = (int)allot.CompleteQty,
+ Qty = allot == null ? (int)(detail.Qty-detail.LockQty) : (int)allot.Qty,
+ PickedQty = allot == null ? 0 : (int)allot.CompleteQty,
};
pdaInfo.Add(info);
--
Gitblit v1.8.0