From bd049e3a09695dd68285c5ab9ddf33be847d77db Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期五, 02 二月 2024 13:21:24 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 272 +++++++++++++++++++++--------------------------------
1 files changed, 109 insertions(+), 163 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index fddc652..05d0bac 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1490,34 +1490,22 @@
{
try
{
- if (string.IsNullOrEmpty(model.ASNNo))
- {
- throw new Exception("璇烽�夋嫨鍏ュ簱鍗曟嵁!");
- }
if (string.IsNullOrEmpty(model.BoxNo))
{
- throw new Exception("绠辩爜涓嶈兘涓虹┖!");
- }
- var order = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo);
- if (order == null)
- {
- throw new Exception("鍏ュ簱鍗曟嵁涓嶅瓨鍦�!");
+ throw new Exception("璇锋壂鎻忓绠辨潯鐮�!");
}
string sqlString = string.Empty;
- //鍏ュ簱鍗曠被鍨嬶紝0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴�
- if (order.Type == "0" || order.Type == "3" || order.Type == "5" || order.Type == "6")
+ sqlString = "select ASNNo,BoxNo, SkuNo,SkuName, LotNo, Qty from BLLLabelBoxNo where IsDel = '0' ";
+ sqlString += $"and BoxNo = '{model.BoxNo}' ";
+ var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
+ if (models == null || models.Count <= 0)
{
sqlString = "select BoxNo, SkuNo,SkuName, LotNo, SUM(Qty) as Qty from BllBoxInfo where IsDel = '0' ";
sqlString += $"and BoxNo = '{model.BoxNo}' and Status='0' ";
sqlString += $"group by BoxNo,SkuNo,SkuName,LotNo; ";
- }
- else
- {
- sqlString = "select BoxNo, SkuNo,SkuName, LotNo, SUM(Qty) as Qty from BLLLabelBoxNo where IsDel = '0' ";
- sqlString += $"and BoxNo = '{model.BoxNo}' and IsUse='0' ";
- sqlString += $"group by BoxNo,SkuNo,SkuName,LotNo; ";
- }
- var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
+
+ models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
+ }
if (models == null)
{
throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
@@ -1529,6 +1517,7 @@
throw ex;
}
}
+
public void BindPallet(PdaPalletBindVm model, int userId, string origin)
{
@@ -1812,47 +1801,6 @@
{
try
{
- #region 鍒ゆ柇
-
- if (string.IsNullOrEmpty(model.AsnNo))
- {
- throw new Exception("-1:鍗曟嵁鍙蜂笉鍙负绌�!");
- }
- if (model.AsnDetailId == null || model.AsnDetailId == 0)
- {
- throw new Exception("-1:鐗╂枡涓嶅彲涓虹┖!");
- }
- if (string.IsNullOrEmpty(model.PalletNo))
- {
- throw new Exception("-1:鎵樼洏鍙蜂笉鍙负绌�!");
- }
- if (model.SkuQty == 0)
- {
- if (string.IsNullOrEmpty(model.BoxNo))
- {
- throw new Exception("-1:绠辩爜淇℃伅涓嶅彲涓虹┖!");
- }
-
- if (model.IsContinue == "1")
- {
- if (string.IsNullOrWhiteSpace(model.TailBoxNo))
- {
- throw new Exception("-1:寮�鍚繛缁粍鎵樻椂锛屽熬绠辩爜淇℃伅涓嶅彲涓虹┖!");
- }
-
- }
- if (model.IsContinue == "0" && model.IsContinue2 == "1")
- {
- if (string.IsNullOrWhiteSpace(model.TailBoxNo01))
- {
- throw new Exception("-1:寮�鍚繛缁粍鎵樻椂锛屼簩绾х爜灏剧爜淇℃伅涓嶅彲涓虹┖!");
- }
-
- }
- }
-
- #endregion
-
Db.BeginTran();
//鎵樼洏鏄惁瀛樺湪
@@ -1960,121 +1908,119 @@
#region 绠辩爜淇℃伅
var boxInfoList = new List<BllLabelBoxNo>();
var msgStr = $"绠卞彿涓簕model.BoxNo}";
- decimal factQty = 0.00m;//鎵樼洏鎬绘暟閲�
- if (model.SkuQty == 0)
+ //棣栫
+ var boxInfo = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.Level == "1").ToList();
+ if (boxInfo.Count == 0)
{
- //棣栫
- var boxInfo = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.IsUse == "0" && m.Level == "1").ToList();
- if (boxInfo.Count == 0)
+ throw new Exception("-1:绠辩爜淇℃伅涓嶅瓨鍦�!");
+ }
+ //鏄惁杩炵画缁勬墭
+ if (model.IsContinue == "1")
+ {
+ boxInfoList.AddRange(boxInfo);
+ //灏剧
+ var boxInfo2 = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo && m.Level == "1").ToList();
+ if (boxInfo2.Count == 0)
{
- throw new Exception("-1:绠辩爜淇℃伅涓嶅瓨鍦�!");
+ throw new Exception("-1:灏剧鐮佷俊鎭笉瀛樺湪!");
}
- //鏄惁杩炵画缁勬墭
- if (model.IsContinue == "1")
- {
- boxInfoList.AddRange(boxInfo);
- //灏剧
- var boxInfo2 = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo && m.IsUse == "0" && m.Level == "1").ToList();
- if (boxInfo2.Count == 0)
- {
- throw new Exception("-1:灏剧鐮佷俊鎭笉瀛樺湪!");
- }
- boxInfoList.AddRange(boxInfo2);
- var sql = $"select * from BllLabelBoxNo where IsDel = '0' and IsUse = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}' and Level='1'; ";
- var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
- boxInfoList.AddRange(list);
+ boxInfoList.AddRange(boxInfo2);
+ var sql = $"select * from BllLabelBoxNo where IsDel = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}' and Level='1'; ";
+ var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
+ boxInfoList.AddRange(list);
- //鎵惧埌鐩稿叧鐨勪簩绾х爜
- foreach (var item in boxInfoList)
+ //鎵惧埌鐩稿叧鐨勪簩绾х爜
+ foreach (var item in boxInfoList)
+ {
+ sql = $"select * from BllLabelBoxNo where IsDel = '0' and IsUse = '0' and ParentBoxNo='{item.BoxNo}' and Level = '2' ";
+ list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
+ boxInfoList.AddRange(list);
+ }
+ msgStr += $"灏剧鍙蜂负{model.TailBoxNo}";
+ }
+ else
+ {
+ var boxInfoList2 = new List<BllLabelBoxNo>();//鎵�鏈変簩绾х爜
+ decimal boxQty = 0.00m;//绠卞唴浜岀骇鐮佹暟閲�
+ if (!string.IsNullOrEmpty(model.BoxNo01))
+ {
+ //浜岀骇鐮侀鐮�
+ var box01Info = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo01 && m.IsUse == "0" && m.Level == "2" && (string.IsNullOrEmpty(m.ParentBoxNo) || m.ParentBoxNo == model.BoxNo)).ToList();
+ if (box01Info.Count == 0)
{
- sql = $"select * from BllLabelBoxNo where IsDel = '0' and IsUse = '0' and ParentBoxNo='{item.BoxNo}' and Level = '2' ";
- list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
- boxInfoList.AddRange(list);
+ throw new Exception("-1:浜岀骇鐮侀鐮佷俊鎭笉瀛樺湪!");
}
- msgStr += $"灏剧鍙蜂负{model.TailBoxNo}";
+ boxInfoList2.AddRange(box01Info);
+ if (model.IsContinue2 == "1")
+ {
+ //浜岀骇鐮佸熬鐮�
+ var box01Info2 = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo01 && m.IsUse == "0" && m.Level == "2" && (string.IsNullOrEmpty(m.ParentBoxNo) || m.ParentBoxNo == model.BoxNo)).ToList();
+ if (box01Info2.Count == 0)
+ {
+ throw new Exception("-1:浜岀骇鐮佸熬鐮佷俊鎭笉瀛樺湪!");
+ }
+ boxInfoList2.AddRange(box01Info2);
+ //涓棿鐮�
+ var sql = $"select * from BllLabelBoxNo where IsDel = '0' and IsUse = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}' and Level='2' and (ParentBoxNo='' || ParentBoxNo='{model.BoxNo}'); ";
+ var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
+ boxInfoList2.AddRange(list);
+ }
+ foreach (var item in boxInfoList2)
+ {
+ item.ParentBoxNo = model.BoxNo;
+ boxQty += item.Qty;
+ }
+ boxInfoList.AddRange(boxInfoList2);
+ foreach (var item in boxInfo)
+ {
+ item.Qty += boxQty;
+ }
}
else
{
- var boxInfoList2 = new List<BllLabelBoxNo>();//鎵�鏈変簩绾х爜
- decimal boxQty = 0.00m;//绠卞唴浜岀骇鐮佹暟閲�
- if (!string.IsNullOrEmpty(model.BoxNo01))
+ //鎵惧埌鐩稿叧鐨勪簩绾х爜
+ foreach (var item in boxInfo)
{
- //浜岀骇鐮侀鐮�
- var box01Info = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo01 && m.IsUse == "0" && m.Level == "2" && (string.IsNullOrEmpty(m.ParentBoxNo) || m.ParentBoxNo == model.BoxNo)).ToList();
- if (box01Info.Count == 0)
- {
- throw new Exception("-1:浜岀骇鐮侀鐮佷俊鎭笉瀛樺湪!");
- }
- boxInfoList2.AddRange(box01Info);
- if (model.IsContinue2 == "1")
- {
- //浜岀骇鐮佸熬鐮�
- var box01Info2 = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo01 && m.IsUse == "0" && m.Level == "2" && (string.IsNullOrEmpty(m.ParentBoxNo) || m.ParentBoxNo == model.BoxNo)).ToList();
- if (box01Info2.Count == 0)
- {
- throw new Exception("-1:浜岀骇鐮佸熬鐮佷俊鎭笉瀛樺湪!");
- }
- boxInfoList2.AddRange(box01Info2);
- //涓棿鐮�
- var sql = $"select * from BllLabelBoxNo where IsDel = '0' and IsUse = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}' and Level='2' and (ParentBoxNo='' || ParentBoxNo='{model.BoxNo}'); ";
- var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
- boxInfoList2.AddRange(list);
- }
- foreach (var item in boxInfoList2)
- {
- item.ParentBoxNo = model.BoxNo;
- boxQty += item.Qty;
- }
- boxInfoList.AddRange(boxInfoList2);
- foreach (var item in boxInfo)
- {
- item.Qty = boxQty;
- }
- }
- boxInfoList.AddRange(boxInfo);
- }
-
-
-
- #endregion
- #endregion
- // 鏇存敼绠辨敮鍏崇郴琛�
- var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
- foreach (var g in boxGroup)
- {
- decimal boxFullQty = 0.00m;//绠卞唴鎬绘暟閲�
- foreach (var box in g)
- {
- if (box.IsUse != "0")
- {
- continue;
- }
- //绠卞唴鐗╂枡鎵规涓庡崟鎹槑缁嗕笉绗﹀悎
- if (box.SkuNo != detail.SkuNo || box.LotNo != detail.LotNo)
- {
- throw new Exception($"-1:{box.BoxNo}绠卞唴鐗╂枡鍙婃壒娆′笌鍗曟嵁涓嶄竴鑷达紝璇锋牳瀹�!");
- }
-
- box.ASNNo = model.AsnNo;
- box.ASNDetailNo = model.AsnDetailId;
- box.IsUse = "1";
- box.CompleteTime = DateTime.Now;
- box.UpdateTime = DateTime.Now;
- box.UpdateUser = userId;
-
- if (box.ParentBoxNo == "" && box.Level == "1")
- {
- factQty += box.Qty;
- boxFullQty += box.Qty;
- }
- }
- if (boxFullQty > bNum)
- {
- throw new Exception($"缁戝畾澶辫触锛寋g.Key}绠辩爜缁戝畾鏁伴噺澶т簬璇ョ墿鍝佸寘瑁呮暟閲忥紒");
+ string sql = $"select * from BllLabelBoxNo where IsDel = '0' and IsUse = '0' and ParentBoxNo='{item.BoxNo}' and Level = '2' ";
+ var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
+ boxInfoList.AddRange(list);
}
}
- Db.Updateable(boxInfoList).ExecuteCommand();
+ boxInfoList.AddRange(boxInfo);
}
+ #endregion
+
+ #endregion
+ // 鏇存敼绠辨敮鍏崇郴琛�
+ decimal factQty = 0.00m;//鎵樼洏鎬绘暟閲�
+ foreach (var box in boxInfoList)
+ {
+ //绠卞唴鐗╂枡鎵规涓庡崟鎹槑缁嗕笉绗﹀悎
+ if (box.SkuNo != detail.SkuNo || box.LotNo != detail.LotNo)
+ {
+ throw new Exception($"-1:{box.BoxNo}绠卞唴鐗╂枡鍙婃壒娆′笌鍗曟嵁涓嶄竴鑷达紝璇锋牳瀹�!");
+ }
+ if (box.IsUse != "0")
+ {
+ continue;
+ }
+ if (box.Level == "1")
+ {
+ if (box.Qty > bNum)
+ {
+ throw new Exception($"缁戝畾澶辫触锛寋box.BoxNo}绠辩爜缁戝畾鏁伴噺澶т簬璇ョ墿鍝佸寘瑁呮暟閲忥紒");
+ }
+ factQty += box.Qty;
+ }
+ //box.ASNNo = model.AsnNo;
+ //box.ASNDetailNo = model.AsnDetailId;
+ box.IsUse = "1";
+ box.CompleteTime = DateTime.Now;
+ box.UpdateTime = DateTime.Now;
+ box.UpdateUser = userId;
+ }
+ Db.Updateable(boxInfoList).ExecuteCommand();
+
// 鏇存柊鎵樼洏缁戝畾琛�
bind.Qty += factQty;
if (bind.FullQty < bind.Qty)
--
Gitblit v1.8.0