From 1b804d3e0c990bd45be003170a5e1cd8138b3743 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期六, 23 三月 2024 15:00:52 +0800
Subject: [PATCH] 修改信息
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 113 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 15 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 1e4095d..2485aa5 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -17,6 +17,7 @@
using Model.ModelDto.PdaDto;
using Dm;
using Model.InterFaceModel;
+using WMS.Entity.BllQualityEntity;
namespace WMS.BLL.BllPdaServer
{
@@ -68,7 +69,17 @@
sqlString = $"select * from BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' and isdel='0' order by CreateTime;";
var modelList = Db.Ado.SqlQuery<ArrivalNoticeDetailDto>(sqlString);
- return modelList;
+ List<ArrivalNoticeDetailDto> list = new List<ArrivalNoticeDetailDto>();
+ foreach (var item in modelList)
+ {
+ string str = BySkuNoGetPackInfo(item.SkuNo);
+ if (str == "涓嶅瓨鍦�")
+ {
+ list.Add(item);
+ }
+ }
+
+ return list;
}
catch (Exception ex)
{
@@ -1751,11 +1762,44 @@
}
}
}
- return noticeList;
+ List<ArrivalNoticeDetailDto> list = new List<ArrivalNoticeDetailDto>();
+ foreach (var item in noticeList)
+ {
+ string str = BySkuNoGetPackInfo(item.SkuNo);
+ if (str == "瀛樺湪")
+ {
+ list.Add(item);
+ }
+ }
+
+ return list;
}
catch (Exception ex)
{
throw ex;
+ }
+ }
+
+ //鏍规嵁鐗╂枡鑾峰彇鏄惁瀛樺湪鍖呰淇℃伅
+ public string BySkuNoGetPackInfo(string skuNo)
+ {
+ try
+ {
+ //鑾峰彇鐗╂枡淇℃伅
+ var sku = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.SkuNo == skuNo);
+ //鍒ゆ柇鐗╂枡淇℃伅鏄惁涓虹┖
+ if (!string.IsNullOrWhiteSpace(sku.PackagNo))
+ {
+ return "瀛樺湪";
+ }
+ else
+ {
+ return "涓嶅瓨鍦�";
+ }
+ }
+ catch (Exception ex)
+ {
+ return ex.Message;
}
}
@@ -1788,9 +1832,9 @@
}
//鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
- if (notice.Status != "0" && notice.Status != "1")
+ if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
{
- throw new Exception("-1:鍏ュ簱鍗曠姸鎬佷笉鏄瓑寰呮墽琛屾垨鎵ц瀹屾垚!");
+ throw new Exception("-1:璇ュ崟鎹凡鍏冲崟!");
}
if (string.IsNullOrEmpty(model.LotNo))
{
@@ -1815,7 +1859,7 @@
}
}
//鍒ゆ柇鐗╂枡鏁伴噺鏄惁涓�0 涓�0鍒ゆ柇绠辩爜淇℃伅 涓嶄负0缁х画
- if (model.SkuQty == 0)
+ if (model.TableType == 0)
{
if (string.IsNullOrEmpty(model.BoxNo))
{
@@ -1831,6 +1875,7 @@
}
}
+ int isTextTable = model.TableType;
int isDeposit = 0;
//鍒ゆ柇鎬诲崟鍗曟嵁鏄惁涓哄瘎瀛樺崟鎹�
if (notice.Type == "7")
@@ -1889,12 +1934,12 @@
}
//鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱澶�
var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
- if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
+ if (stockDetail != null)// && !string.IsNullOrEmpty(stockDetail.WareHouseNo)
{
- throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳瀹烇紒");
+ throw new Exception("璇ユ墭鐩樺湪搴撳瓨宸叉湁淇℃伅锛岃鏍稿疄锛�");
}
// 楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
- var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && model.LotNo.Contains(m.LotNo));
+ var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
if (detail == null)
{
throw new Exception("-1:褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
@@ -1908,7 +1953,7 @@
var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
//鍒ゆ柇鏄惁涓哄瘎瀛樼墿鏂�
- if (isDeposit == 0)
+ if (isDeposit == 0 && isTextTable == 0)
{
if (pack == null)
{
@@ -1987,7 +2032,7 @@
Demo = model.Demo,
};
- if (model.SkuQty > pNum && isDeposit == 0)
+ if (model.TableType == 0 && isDeposit == 0 && isTextTable == 0)
{
throw new Exception($"缁戝畾澶辫触锛寋model.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
}
@@ -2037,7 +2082,7 @@
// 鏇存敼绠辨敮鍏崇郴琛�
decimal factQty = 0.00m;//鎵樼洏鎬绘暟閲�
//鎴愬搧缁勬墭
- if (model.SkuQty == 0)
+ if (isTextTable == 0)
{
var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
foreach (var g in boxGroup)
@@ -2077,7 +2122,7 @@
// 鏇存柊鎵樼洏缁戝畾琛�
bind.Qty += factQty;
}
- if (bind.FullQty < bind.Qty && isDeposit == 0)
+ if (bind.FullQty < bind.Qty && isDeposit == 0 && isTextTable == 0)
{
throw new Exception("鎵樼洏缁戝畾鏁伴噺宸茶秴鍑鸿鐗╂枡鍖呰鏁伴噺");
}
@@ -2086,7 +2131,7 @@
{
bind.BitPalletMark = "0";
}
- if (bind.Qty > pNum && isDeposit == 0)
+ if (bind.Qty > pNum && isDeposit == 0 && isTextTable == 0)
{
throw new Exception($"缁戝畾澶辫触锛寋bind.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
}
@@ -2224,7 +2269,7 @@
#endregion
#region 绠辩爜淇℃伅
- var boxInfoList = Db.Queryable<BllBoxInfo>().Where(w => w.IsDel == "0" && w.ASNNo == model.ASNNo).ToList();
+ var boxInfoList = Db.Queryable<BllBoxInfo>().Where(w => w.IsDel == "0" && w.ASNNo == model.ASNNo && w.PalletNo == model.PalletNo).ToList();
// type 0:鎴愬搧鍏ュ簱 1:閲囪喘鍏ュ簱 2:涓棿鍝佸叆搴� 3:閫�璐у叆搴� 4:杞﹂棿浣欐枡閫�鍥炲叆搴� 5:鍏跺畠鍏ュ簱 6:浠ｅ偍鍏ュ簱 7:瀵勫瓨鍏ュ簱
if (notice.Type == "2" || notice.Type == "6" || notice.Type == "7")
{
@@ -2298,6 +2343,12 @@
CreateUser = (int)model.CreateUser,
CreateTime = serverTime
};
+ //缁存姢搴撳瓨璐т富淇℃伅
+ if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠ｅ偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+ {
+ stockModel.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+ stockModel.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+ }
//鏂板搴撳瓨鎬讳俊鎭�
Db.Insertable<DataStock>(stockModel).ExecuteCommand();
}
@@ -2350,11 +2401,43 @@
PackagNo = sku.PackagNo,
IsBale = bindInfo.IsBale,
IsBelt = bindInfo.IsBelt,
+
CreateUser = (int)model.CreateUser,
CreateTime = serverTime
};
+ //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭�
+ if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠ｅ偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+ {
+ detailModel.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+ detailModel.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+ }
+ else if (notice.Type == "1" || notice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
+ {
+ detailModel.SupplierNo = notice.CustomerNo;//渚涘簲鍟嗙紪鐮�
+ detailModel.SupplierName = notice.CustomerName;//渚涘簲鍟嗗悕绉�
+ }
+ #region 缁存姢璐ㄦ缁撴灉
+ //鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
+ var quality = Db.Queryable<BllQualityInspect>().Where(a => a.LotNo == noticeDetail.LotNo && a.IsDel == "0").OrderByDescending(a => a.CreateTime).First();
+ if (quality != null)
+ {
+ //淇敼鍚堟牸涓嶅悎鏍兼暟閲�
+ if (quality.IsQualified == "1") //鍚堟牸
+ {
+ //澧炲姞鍚堟牸鏁伴噺
+ quality.PassQty += detailModel.Qty;
+ detailModel.InspectStatus = "1";
+ }
+ else if (quality.IsQualified == "0") //涓嶅悎鏍�
+ {
+ //澧炲姞涓嶅悎鏍兼暟閲�
+ quality.FailQty += detailModel.Qty;
+ detailModel.InspectStatus = "2";
+ }
+ Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
+ }
+ #endregion
stId = Db.Insertable<DataStockDetail>(detailModel).ExecuteReturnIdentity();
-
}
else
{
--
Gitblit v1.8.0