From 7631b07ef475e8372811b01563a9719033a0a074 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 11 三月 2025 19:57:08 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs | 89 +++++++++++---------------------------------
1 files changed, 23 insertions(+), 66 deletions(-)
diff --git a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
index c7bb748..959b073 100644
--- a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
+++ b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
@@ -95,98 +95,38 @@
{
throw new Exception("璐ㄦ鍙蜂笉鍙负绌猴紝璇锋牳鏌ワ紒");
}
- //楠岃瘉鐗╂枡鍙锋槸鍚︿负绌�
- if (string.IsNullOrEmpty(model.SkuNo))
- {
- throw new Exception("鐗╂枡鍙蜂笉鍙负绌猴紝璇锋牳鏌ワ紒");
- }
- //鑾峰彇鐗╂枡淇℃伅
- var sku = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.SkuNo == model.SkuNo);
- if (sku == null)
- {
- throw new Exception("鐗╂枡淇℃伅涓虹┖锛岃鏍告煡锛�");
- }
//楠岃瘉鎵规鍙锋槸鍚︿负绌�
if (string.IsNullOrEmpty(model.LotNo))
{
throw new Exception("鎵规鍙蜂笉鍙负绌猴紝璇锋牳鏌ワ紒");
}
- //int isTui = 0;
- //楠岃瘉鍏ュ簱鍗曞彿鏄惁涓虹┖
- if (!string.IsNullOrEmpty(model.ASNNo))
- {
- //鏌ヨ鏄惁涓洪��璐у叆搴撳崟鎹�
- var Arrival = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.Type == "3");
- if (Arrival == null)
- {
- throw new Exception("鍙湁鍏ュ簱鍗曟嵁涓洪��璐у叆搴撳崟鍙緭鍏� 鍏ュ簱鍗曞彿锛岃鏍告煡锛�");
- }
-
- //鑾峰彇鍏ュ簱鍗曟槑缁�
- var ArrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.LotNo.Contains(model.LotNo) && a.SkuNo == model.SkuNo);
- if (ArrivalDetail == null)
- {
- throw new Exception("杈撳叆鐨勬壒娆℃垨鐗╂枡淇℃伅涓庡叆搴撳崟鎹笉绗︼紝璇锋牳鏌ワ紒");
- }
- //isTui = 1;
- }
-
- //鏌ユ壘璐ㄦ淇℃伅涓槸鍚﹀瓨鍦ㄥ悓鎵规璐ㄦ褰曞叆璁板綍
- //BllQualityInspect quality = Db.Queryable<BllQualityInspect>().First(m => m.IsDel == "0" && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
-
- //if (quality != null)
- //{
- ////鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
- //if (isTui == 1)
- //{
- // if (quality.ASNNo == model.ASNNo)
- // {
- // throw new Exception("褰撳墠閫�璐у叆搴撳崟宸插垱寤鸿川妫�淇℃伅锛岃鍕块噸澶嶅垱寤猴紒");
- // }
- //}
- // throw new Exception("褰撳墠鐗╂枡鍜屾壒娆″凡杩涜璐ㄦ锛岃鏍告煡锛�");
- //}
-
- ////鏌ユ壘鍚屾壒娆� 鍚屽崟鎹� 鍏ュ簱鍗曚俊鎭��
- //BllArrivalNoticeDetail arrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.ASNNo == model.ASNNo && m.LotNo == model.LotNo);
model.Origin = "WMS"; //鏉ユ簮
model.CreateTime = Db.GetDate(); //鍒涘缓鏃ユ湡
- model.SkuNo = sku.SkuNo; //鐗╂枡鍙�
- model.SkuName = sku.SkuName; //鐗╂枡鍚嶇О
+ model.SkuNo = ""; //鐗╂枡鍙�
+ model.SkuName = ""; //鐗╂枡鍚嶇О
model.PassQty = 0; //鍚堟牸鏁伴噺
model.FailQty = 0; //涓嶅悎鏍兼暟閲�
- model.Standard = sku.Standard; //瑙勬牸
- //model.SupplierLot = arrivalDetail.SupplierLot; //渚涜揣鎵规
+ model.Standard = ""; //瑙勬牸
//鏌ユ壘搴撳瓨鏄庣粏淇℃伅
- List<DataStockDetail> detail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo).ToList();
+ List<DataStockDetail> detail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.LotNo == model.LotNo).ToList();
foreach (var item in detail)
{
- List<BllBoxInfo> box = Db.Queryable<BllBoxInfo>().Where(a => a.IsDel == "0" && a.SkuNo == model.SkuNo && a.LotNo == model.LotNo).ToList();
//鍒ゆ柇鍚堟牸鐘舵�佹槸鍚﹀悎鏍�
if (model.IsQualified == "1")
{
- //鍚堟牸 鐩稿悓鎵规搴撳瓨淇℃伅鍏ㄩ儴鏀逛负鍚堟牸鐘舵�� 涓斿悎鏍兼暟閲忓鍔犱负鍚屾壒娆″悓鍗曞彿璇ョ墿鏂欏叏閮ㄦ暟閲忎箣鍜�
+ //鍚堟牸
model.PassQty += item.Qty;
//淇敼搴撳瓨鏄庣粏鍚堟牸鐘舵��
item.InspectStatus = "1"; //1鍚堟牸
- //foreach (var b1 in box)
- //{
- // b1.InspectMark = "1"; //1鍚堟牸
- //}
}
else //涓嶅悎鏍�
{
- //涓嶅悎鏍� 鐩稿悓鎵规銆佸叆搴撳崟搴撳瓨淇℃伅鍏ㄩ儴鏀逛负涓嶅悎鏍肩墿鏂� 涓斾笉鍚堟牸鏁伴噺澧炲姞涓哄悓鎵规鍚屽崟鍙疯鐗╂枡鍏ㄩ儴鏁伴噺涔嬪拰
+ //涓嶅悎鏍�
model.FailQty += item.Qty;
item.InspectStatus = "2"; //2涓嶅悎鏍�
- //foreach (var b1 in box)
- //{
- // b1.InspectMark = "2"; //2涓嶅悎鏍�
- //}
}
- Db.Updateable(box).ExecuteCommand();
Db.Updateable(item).ExecuteCommand();
}
var isquality = Db.Insertable(model).ExecuteCommand();
@@ -194,6 +134,23 @@
return isquality;
}
+ /// <summary>
+ /// 鑾峰彇搴撳瓨鎵规鍙烽泦鍚�
+ /// </summary>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public List<DataStockDetail> GetLotNoList()
+ {
+ try
+ {
+ var _list = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && !string.IsNullOrEmpty(w.LotNo)).ToList();
+ return _list;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
#endregion
}
--
Gitblit v1.8.0