From 951c9a4e80495429338b9c495addda1ebae9703b Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 21 三月 2024 16:56:06 +0800
Subject: [PATCH] agv转运功能修改
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index e226b67..8793a2c 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -120,7 +120,7 @@
.AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuName.Contains(model.SkuName.Trim()))
- .AndIF((model.BindNo != 0 && !string.IsNullOrWhiteSpace(model.BindNo.ToString())),it=>it.BindNo == model.BindNo)
+ .AndIF((model.BindNo != 0 && !string.IsNullOrWhiteSpace(model.BindNo.ToString())), it => it.BindNo == model.BindNo)
.And(m => m.IsDel == "0")
.ToExpression();
@@ -563,16 +563,16 @@
#region 鎸囧畾鍌ㄤ綅
//鎸囧畾鍌ㄤ綅鏁版嵁婧愶紙姝ｅ父鐨勭┖鍌ㄤ綅锛�
- public List<LocatDto> GetLocateList(string houseNo, string roadwayNo, string row, string column, string layer,
+ public List<LocatDto> GetLocateList(string houseNo, string roadwayNo, string row, string column, string layer,
string locateNo, string BindId, int page, int limit, out int count)
{
try
{
//鑾峰彇鎵樼洏缁戝畾
- var bindASNDetailNo = Db.Queryable<BllPalletBind>().Where(a => a.IsDel == "0" && a.Status == "0"
+ var bindASNDetailNo = Db.Queryable<BllPalletBind>().Where(a => a.IsDel == "0" && a.Status == "0"
&& a.Id == int.Parse(BindId)).Select(a => a.ASNDetailNo).First();
//鑾峰彇鍗曟嵁鏄庣粏
- var noticeDetailSkuNo = Db.Queryable<BllArrivalNoticeDetail>().Where(a => a.Id == bindASNDetailNo
+ var noticeDetailSkuNo = Db.Queryable<BllArrivalNoticeDetail>().Where(a => a.Id == bindASNDetailNo
&& a.IsDel == "0").Select(a => a.SkuNo).First();
//鑾峰彇鐗╂枡
var skuCategoryNo = Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.SkuNo == noticeDetailSkuNo)
@@ -591,7 +591,7 @@
.And(m => m.AreaNo.Contains(categoryAreaNo))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
var total = 0;
- var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a=>a.Depth).OrderBy(a=>a.Column)
+ var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column)
.Select(a => new LocatDto()
{
Id = a.Id,
@@ -640,7 +640,7 @@
throw new Exception("璇ュ偍浣嶇姸鎬佷笉鏄┖鍌ㄤ綅鎴栨爣蹇椾笉鏄甯哥殑");
}
-
+
//鍒ゆ柇褰撳墠鎵樼洏鏄惁瀛樺湪缁戝畾淇℃伅
if (!string.IsNullOrWhiteSpace(bind.LocatNo))
@@ -960,7 +960,7 @@
{
continue;
}
- //濡傛灉缁撴灉涓�0锛屽垯璇存槑涓や釜瀛楃涓茬浉绛夛紱
+ //濡傛灉缁撴灉涓�0锛屽垯璇存槑涓や釜瀛楃涓茬浉绛夛紱 ABC BCE
//濡傛灉缁撴灉灏忎簬0锛屽垯璇存槑绗竴涓瓧绗︿覆灏忎簬绗簩涓瓧绗︿覆锛�
//濡傛灉缁撴灉澶т簬0锛屽垯璇存槑绗竴涓瓧绗︿覆澶т簬绗簩涓瓧绗︿覆銆�
var bol = String.CompareOrdinal(r, useLog.RoadwayNo);
@@ -1632,7 +1632,17 @@
}
//鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
- var quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == noticeDetail.ASNNo && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
+ BllQualityInspect quality = new BllQualityInspect();
+ //鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
+ if (notice.Type == "3")
+ {
+ quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == noticeDetail.ASNNo && a.SkuNo == noticeDetail.SkuNo && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
+ }
+ else
+ {
+ quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == noticeDetail.SkuNo && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
+ }
+
#region 搴撳瓨鏄庣粏
var sd = new DataStockDetail()
{
@@ -1679,8 +1689,8 @@
sd.OwnerName = notice.CustomerName;//璐т富鍚嶇О
}
else if (notice.Type == "1" || notice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
- {
- sd.SupplierNo= notice.CustomerNo;//渚涘簲鍟嗙紪鐮�
+ {
+ sd.SupplierNo = notice.CustomerNo;//渚涘簲鍟嗙紪鐮�
sd.SupplierName = notice.CustomerName;//渚涘簲鍟嗗悕绉�
}
--
Gitblit v1.8.0