From ecb386a4201213c6635f28f9e9e02e3faf217b51 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期六, 16 三月 2024 11:08:34 +0800
Subject: [PATCH] 修改储位图例柱状图以及圆形图显示数据问题。
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 167 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 103 insertions(+), 64 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 5075348..bfa4cdf 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,18 +563,23 @@
#region 鎸囧畾鍌ㄤ綅
//鎸囧畾鍌ㄤ綅鏁版嵁婧愶紙姝ｅ父鐨勭┖鍌ㄤ綅锛�
- 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)
+ 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" && a.Id == int.Parse(BindId)).Select(a => a.ASNDetailNo).First();
+ 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 && a.IsDel == "0").Select(a => a.SkuNo).First();
+ 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).Select(a => a.CategoryNo).First();
+ var skuCategoryNo = Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.SkuNo == noticeDetailSkuNo)
+ .Select(a => a.CategoryNo).First();
//鑾峰彇鐗╂枡瀵瑰簲鍖哄煙
- var categoryAreaNo = Db.Queryable<SysMaterialCategory>().Where(a => a.IsDel == "0" && a.CategoryNo == skuCategoryNo).Select(a => a.AreaNo).First();
+ var categoryAreaNo = Db.Queryable<SysMaterialCategory>().Where(a => a.IsDel == "0" && a.CategoryNo == skuCategoryNo)
+ .Select(a => a.AreaNo).First();
Expression<Func<SysStorageLocat, bool>> item = Expressionable.Create<SysStorageLocat>()
.AndIF(!string.IsNullOrWhiteSpace(roadwayNo), m => m.RoadwayNo == roadwayNo)
@@ -586,7 +591,7 @@
.And(m => m.AreaNo.Contains(categoryAreaNo))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
var total = 0;
- var list = Db.Queryable<SysStorageLocat>().Where(item)
+ var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column)
.Select(a => new LocatDto()
{
Id = a.Id,
@@ -595,6 +600,7 @@
Row = a.Row,
Column = a.Column,
Layer = a.Layer,
+ Depth = a.Depth,
Status = a.Status
}).ToOffsetPage(page, limit, ref total);
count = total;
@@ -634,10 +640,10 @@
throw new Exception("璇ュ偍浣嶇姸鎬佷笉鏄┖鍌ㄤ綅鎴栨爣蹇椾笉鏄甯哥殑");
}
-
+
//鍒ゆ柇褰撳墠鎵樼洏鏄惁瀛樺湪缁戝畾淇℃伅
- if (bind.LocatNo != null)
+ if (!string.IsNullOrWhiteSpace(bind.LocatNo))
{
//鍒嗗壊宸茬粦鍌ㄤ綅涓庢柊鍌ㄤ綅
//宸茬粦鍌ㄤ綅
@@ -755,6 +761,7 @@
{
try
{
+ #region 楠岃瘉鎵樼洏鍚堟硶鎬�
//楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
if (string.IsNullOrEmpty(palletNo))
{
@@ -771,17 +778,17 @@
throw new Exception("骞冲簱璇蜂娇鐢≒DA鎵嬫寔杩涜骞冲簱鍏ュ簱");
}
- OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
- var isHaveLocateNo = false; //鎵樼洏缁戝畾淇℃伅涓槸鍚﹀凡鏈夋寚瀹氬偍浣�
-
var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//鎵樼洏淇℃伅
-
//鍒ゆ柇鎵樼洏鏉＄爜鏄惁鏈夋晥
if (stock == null)
{
throw new Exception("鎵樼洏鏉＄爜涓嶅彈WMS绠＄悊锛屼笉鍙叆搴擄紒");
}
+ #endregion
+
+ OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
+ var isHaveLocateNo = false; // 鏄惁宸叉湁鎸囧畾鍌ㄤ綅
#region
//鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱鐨�)
@@ -823,6 +830,8 @@
isHaveLocateNo = true; //宸叉湁鎸囧畾鍌ㄤ綅
}
+
+ // 楠岃瘉鏄惁鍏宠仈鍗曟嵁锛岃幏鍙栨墭鐩樹笂瀛樻斁鐨勭墿鏂�
if (palletBindList.First().Type == "0") //鐗╂枡鎵樺叆搴�
{
//鍒ゆ柇鏄惁缁戝畾鍗曟嵁鍙婂崟鎹姸鎬佹槸鍚︽甯�
@@ -833,7 +842,7 @@
{
throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟锛屼笉鍙叆搴擄紒");
}
- if (notice.Status == "3")
+ if (notice.Status == "3" || notice.Status == "4")
{
throw new Exception($"鍏ュ簱鍗晎item.ASNNo}宸插叧闂紝涓嶅彲鍏ュ簱锛�");
}
@@ -865,29 +874,23 @@
skuNo = stockDetail.First().SkuNo;
//鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
- var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "鎵樼洏鍥炲簱楠岃瘉" && a.IsEnable == "NO");
+ var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun041" && a.IsEnable == "NO");
#region 鎵樼洏鍥炲簱瑙勫垯
-
if (function != null)
{
//鎷ｈ揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
- if (function.SetValue == "CompletePick")
- {
- var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
+ var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
- //楠岃瘉鎷ｈ揣鏄庣粏鏄惁瀛樺湪
- if (allot != null)
+ //楠岃瘉鎷ｈ揣鏄庣粏鏄惁瀛樺湪
+ if (allot != null)
+ {
+ //楠岃瘉褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏄惁宸插畬鎴�
+ if (allot.Status != "5")
{
- //楠岃瘉褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏄惁宸插畬鎴�
- if (allot.Status != "5")
- {
- throw new Exception("褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏈畬鎴愶紝璇峰畬鎴愬悗鍥炲簱锛�");
- }
+ throw new Exception("褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏈畬鎴愶紝璇峰畬鎴愬悗鍥炲簱锛�");
}
}
}
-
-
#endregion
}
@@ -895,6 +898,7 @@
SysStorageLocat locate;
+ #region 鏍规嵁sku纭鍖哄煙鍒掑垎
var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
if (sku == null)
{
@@ -940,9 +944,10 @@
.GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
SysRoadwayUseLog useLog = Db.Queryable<SysRoadwayUseLog>().Where(m => m.IsDel == "0" && roadList.Contains(m.RoadwayNo)).OrderByDescending(l => l.Id).First(); //宸烽亾鏈�鍚庝竴娆′娇鐢ㄨ褰�
+ #endregion
+
#region 纭畾宸烽亾鎺掑簭
-
List<string> roadList2 = new List<string>();
List<string> roadSmall = new List<string>();
List<string> roadLarge = new List<string>();
@@ -1054,19 +1059,43 @@
Db.BeginTran();
try
{
- if (roadNo != null)
+ //娣诲姞宸烽亾浣跨敤璁板綍
+ var log = new SysRoadwayUseLog
{
- //娣诲姞宸烽亾浣跨敤璁板綍
- var log = new SysRoadwayUseLog
- {
- RoadwayNo = roadNo,
- WareHouseNo = houseNo,
- Row = 0,
- Column = 0,
- Layer = 0,
- };
- Db.Insertable(log).ExecuteCommand();
- }
+ RoadwayNo = roadNo,
+ WareHouseNo = houseNo,
+ Row = 0,
+ Column = 0,
+ Layer = 0,
+ };
+ Db.Insertable(log).ExecuteCommand();
+
+ // 娣诲姞鍏ュ簱鏃ュ織璁板綍
+ var taskNo = new Common().GetMaxNo("TK");
+ var exTask = new LogTask //鍏ュ簱浠诲姟
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ SendDate = DateTime.Now, //鍙戦�佹椂闂�
+ BackDate = DateTime.Now, //杩斿洖鏃堕棿
+ StartRoadway = "", // 璧峰宸烽亾
+ StartLocat = "",//璧峰浣嶇疆
+ EndLocat = "",//鐩爣浣嶇疆
+ EndRoadway = roadNo, // 鐩爣宸烽亾
+ PalletNo = palletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+ Msg = "鍏ュ簱鍙ｅ埌=>>" + roadNo + "宸烽亾鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+
+ };
+ Db.Insertable(exTask).ExecuteCommand();
+
if (palletBindList.Count >= 1)
{
@@ -1079,6 +1108,7 @@
Db.Updateable(palletBindList).ExecuteCommand();
}
Db.CommitTran();
+
comDto = new OutCommandDto()
{
PalletNo = palletNo,//鎵樼洏鍙�
@@ -1086,12 +1116,11 @@
StartLocate = "", // 璧峰浣嶇疆
EndLocate = "", // 鐩爣浣嶇疆
EndRoadway = roadNo, // 鐩爣宸烽亾
- TaskNo = "", // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ TaskNo = taskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷:鍏ュ簱浠诲姟
OutMode = "", //鐩爣鍦板潃
Order = 1
};
-
}
catch (Exception ex)
{
@@ -1603,7 +1632,17 @@
}
//鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
- //var quality = Db.Queryable<BllQualityInspect>().Where(a => a.LotNo == noticeDetail.LotNo && a.IsDel == "0").OrderByDescending(a => a.CreateTime).ToList();
+ 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()
{
@@ -1650,28 +1689,28 @@
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;//渚涘簲鍟嗗悕绉�
}
- //if (quality.Count() > 0)
- //{
- // //淇敼鍚堟牸涓嶅悎鏍兼暟閲�
- // if (quality[0].IsQualified == "1") //鍚堟牸
- // {
- // //澧炲姞鍚堟牸鏁伴噺
- // quality[0].PassQty += item.Qty;
- // sd.InspectStatus = "1";
- // }
- // else if (quality[0].IsQualified == "0") //涓嶅悎鏍�
- // {
- // //澧炲姞涓嶅悎鏍兼暟閲�
- // quality[0].FailQty += item.Qty;
- // sd.InspectStatus = "2";
- // }
- // Db.Updateable(quality[0]).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
- //}
+ if (quality != null)
+ {
+ //淇敼鍚堟牸涓嶅悎鏍兼暟閲�
+ if (quality.IsQualified == "1") //鍚堟牸
+ {
+ //澧炲姞鍚堟牸鏁伴噺
+ quality.PassQty += item.Qty;
+ sd.InspectStatus = "1";
+ }
+ else if (quality.IsQualified == "0") //涓嶅悎鏍�
+ {
+ //澧炲姞涓嶅悎鏍兼暟閲�
+ quality.FailQty += item.Qty;
+ sd.InspectStatus = "2";
+ }
+ Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
+ }
var sdId = Db.Insertable(sd).ExecuteReturnIdentity(); //鏂板搴撳瓨鏄庣粏淇℃伅
--
Gitblit v1.8.0