From b2d25faa69ee7e9f24b6ac98d3b4dcbddada70bc Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期四, 14 三月 2024 13:37:15 +0800
Subject: [PATCH] 修改pda托盘绑定同一物料多批次 无法具体选中批次问题。
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 622 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 548 insertions(+), 74 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index a5e06a7..4e5e8b7 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -49,7 +49,7 @@
.AndIF(!string.IsNullOrWhiteSpace(model.LocatNo), it => it.LocatNo.Contains(model.LocatNo.Trim()))
.AndIF(!string.IsNullOrEmpty(model.RoadwayNo), a => a.RoadwayNo == model.RoadwayNo)
.AndIF(!string.IsNullOrEmpty(model.WareHouseNo), a => a.WareHouseNo == model.WareHouseNo)
- .AndIF(strList.Count>0, it => strList.Contains((int)it.ASNDetailNo))
+ .AndIF(strList.Count > 0, it => strList.Contains((int)it.ASNDetailNo))
.AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.LotText), it => it.LotText.Contains(model.LotText.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.StartTime), it => it.CreateTime >= Convert.ToDateTime(model.StartTime))
@@ -99,7 +99,7 @@
})
.OrderBy(a => a.Status).OrderByDescending(a => a.CreateTime)
.ToOffsetPage(model.Page, model.Limit, ref total);
-
+
count = data.Count;
return data;
@@ -114,8 +114,19 @@
{
try
{
+ Expression<Func<BllBoxInfo, bool>> item1 = Expressionable.Create<BllBoxInfo>()
+ .AndIF(!string.IsNullOrWhiteSpace(model.ASNNo), it => it.ASNNo.Contains(model.ASNNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(model.PalletNo), it => it.PalletNo.Contains(model.PalletNo.Trim()))
+ .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)
+ .And(m => m.IsDel == "0")
+ .ToExpression();
+
var total = 0;
- var data = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel =="0" && m.BindNo == model.BindNo)
+ DbHelper<BllBoxInfo> helper = new DbHelper<BllBoxInfo>(Db);
+ var data = helper.GetAllWhereAsync(item1).Where(m => m.IsDel == "0")
.LeftJoin<BllPalletBind>((a, b) => a.BindNo == b.Id)
.GroupBy((a, b) => new
{
@@ -218,7 +229,7 @@
{
try
{
-
+ //鑾峰彇鎵樼洏缁戝畾淇℃伅
var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Id == id);
if (bind == null)
{
@@ -228,6 +239,8 @@
{
throw new Exception("璇ユ墭鐩樼粦瀹氫俊鎭殑鐘舵�佷笉鏄瓑寰呭叆搴擄紝涓嶈兘鍒犻櫎");
}
+ //鑾峰彇闄ゅ垹闄ょ粦瀹氫俊鎭鏄惁瀛樺湪璇ユ墭鐩樹笖鍚屽崟鎹叾瀹冪粦瀹氫俊鎭�
+ var bindid = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == bind.PalletNo && m.Id != id && m.ASNNo == bind.ASNNo).ToList();
//鑾峰彇鎵樼洏淇℃伅
var pallet = Db.Queryable<SysPallets>().First(a => a.IsDel == "0" && a.PalletNo == bind.PalletNo && a.Status == "1");
if (pallet == null)
@@ -256,7 +269,7 @@
b.UpdateTime = time;
b.UpdateUser = userId;
var i = Db.Updateable(b).ExecuteCommand();
- if (i!=1)
+ if (i != 1)
{
throw new Exception($"{b.BoxNo}绠辩爜銆亄b.BoxNo3}鏀爜鍒犻櫎澶辫触");
}
@@ -292,8 +305,8 @@
{
noticeDetail.Status = "0";
//鑾峰彇鐘舵�佷笉鏄瓑寰呮墽琛岀殑鏄庣粏淇℃伅
- var count = Db.Queryable<BllArrivalNoticeDetail>().Count(m => m.IsDel == "0" && m.Id != noticeDetail.Id && m.ASNNo == bind.ASNNo && m.Status !="0");
- if (count==0)
+ var count = Db.Queryable<BllArrivalNoticeDetail>().Count(m => m.IsDel == "0" && m.Id != noticeDetail.Id && m.ASNNo == bind.ASNNo && m.Status != "0");
+ if (count == 0)
{
//淇敼鍏ュ簱鍗曚俊鎭�
var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == bind.ASNNo);
@@ -307,10 +320,13 @@
Db.Updateable(noticeDetail).ExecuteCommand();
}
- pallet.Status = "0";
- pallet.UpdateUser = userId;
- pallet.UpdateTime = DateTime.Now;
- Db.Updateable(pallet).ExecuteCommand();
+ if (bindid.Count == 0)
+ {
+ pallet.Status = "0";
+ pallet.UpdateUser = userId;
+ pallet.UpdateTime = DateTime.Now;
+ Db.Updateable(pallet).ExecuteCommand();
+ }
new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鎵樼洏缁戝畾", bind.PalletNo, "鍒犻櫎", $"鍒犻櫎浜嗗叆搴撳崟锛歿bind.ASNNo}銆佹墭鐩樼爜锛歿bind.PalletNo}鐨勪俊鎭�", userId);
Db.CommitTran();
@@ -363,7 +379,7 @@
{
item.ASNNo = "";
item.ASNDetailNo = null;
- }
+ }
item.BindNo = null;
item.PalletNo = "";
item.Status = "0";
@@ -375,9 +391,10 @@
Db.Updateable(boxInfos).ExecuteCommand();
//淇敼鎵樼洏缁戝畾淇℃伅
- bind.Qty -= qty;
+ bind.Qty -= qty; // 鏁伴噺鍙樻洿
+ bind.BitPalletMark = "1"; // 闆舵墭鏍囪鍙樻洿
- if (bind.Qty ==0)
+ if (bind.Qty == 0)
{
//鍒ゆ柇鏄惁鏈夋寚瀹氬偍浣�
if (!string.IsNullOrWhiteSpace(bind.LocatNo))
@@ -509,11 +526,17 @@
}
var info = boxInfo.First(m => m.BindNo == bind.Id);
+ //鍏ュ簱鍗曟槑缁�
+ var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == bind.ASNDetailNo);
+ if (noticeDetail == null && info.SkuNo != "100099")
+ {
+ throw new Exception("鏈煡璇㈠埌鎵樼洏缁戝畾鐨勫叆搴撳崟鏄庣粏淇℃伅");
+ }
var log = new BllAuditLog()
{
OrderNo = notice.ASNNo,
PalletNo = bind.PalletNo,
- Msg = $"鐗╂枡锛歿info.SkuNo}銆佹壒娆★細{info.LotNo};",
+ Msg = info == null ? $"鐗╂枡锛歿noticeDetail.SkuNo}銆佹壒娆★細{noticeDetail.LotNo};" : $"鐗╂枡锛歿info.SkuNo}銆佹壒娆★細{info.LotNo};",
Reason = reason,
Status = "0",
Opinion = "",
@@ -540,20 +563,30 @@
#region 鎸囧畾鍌ㄤ綅
//鎸囧畾鍌ㄤ綅鏁版嵁婧愶紙姝ｅ父鐨勭┖鍌ㄤ綅锛�
- public List<LocatDto> GetLocateList(string houseNo, string roadwayNo, string row, string column, string layer, string locateNo, 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 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 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)
.AndIF(!string.IsNullOrWhiteSpace(row), m => m.Row == int.Parse(row))
.AndIF(!string.IsNullOrWhiteSpace(column), m => m.Column == int.Parse(column))
.AndIF(!string.IsNullOrWhiteSpace(layer), m => m.Layer == int.Parse(layer))
.AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo.Contains(locateNo))
- .And(m => m.IsDel == "0" && m.Status=="0" && m.Flag == "0" && m.WareHouseNo == houseNo)
+ .And(m => m.IsDel == "0" && m.Status == "0" && m.Flag == "0" && m.WareHouseNo == houseNo)
+ .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,
@@ -600,6 +633,59 @@
{
throw new Exception("璇ュ偍浣嶇姸鎬佷笉鏄┖鍌ㄤ綅鎴栨爣蹇椾笉鏄甯哥殑");
}
+
+
+
+ //鍒ゆ柇褰撳墠鎵樼洏鏄惁瀛樺湪缁戝畾淇℃伅
+ if (bind.LocatNo != null)
+ {
+ //鍒嗗壊宸茬粦鍌ㄤ綅涓庢柊鍌ㄤ綅
+ //宸茬粦鍌ㄤ綅
+ var bindRow = bind.LocatNo.Substring(0, 2);
+ var bindColumn = bind.LocatNo.Substring(2, 2);
+ var bindLayer = bind.LocatNo.Substring(4, 2);
+ var bindDepth = bind.LocatNo.Substring(6, 2);
+ //鏂板偍浣�
+ var Row = locate.LocatNo.Substring(0, 2);
+ var Column = locate.LocatNo.Substring(2, 2);
+ var Layer = locate.LocatNo.Substring(4, 2);
+ var Depth = locate.LocatNo.Substring(6, 2);
+
+ if (bindDepth == "02")
+ {
+ //鍒ゆ柇鎺掑垪灞傛槸鍚︾浉鍚�
+ if (bindRow == Row && bindColumn == Column && bindLayer == Layer)
+ {
+ throw new Exception("鍚屽偍浣嶆繁搴�2涓嶅彲鍚戞繁搴�1鍒囨崲锛�");
+ }
+ }
+ }
+ else
+ {
+ //鑻ユ槸娣卞害1鐨� 鍒欏垽鏂繁搴�2鏄惁涓虹┖鍌ㄤ綅
+ if (locate.Depth == "01")
+ {
+ var locateDepth = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.Row == locate.Row && a.Column == locate.Column && a.Layer == locate.Layer && a.Depth == "02");
+ if (locateDepth != null)
+ {
+ if (locateDepth.Status != "1")
+ {
+ throw new Exception("璇ュ偍浣嶆繁搴�2涓嶆槸鏈夌墿鍝侊紝涓嶅彲缁戝畾");
+ }
+ }
+ }
+ //鍒ゆ柇鏄惁涓烘繁搴�2鐨� 鑻ヤ负娣卞害2 鍒欒幏鍙栨繁搴�1鍌ㄤ綅 鍒ゆ柇鏄惁涓虹┖鍌ㄤ綅
+ if (locate.Depth == "02")
+ {
+ var locateDepth = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.Row == locate.Row && a.Column == locate.Column && a.Layer == locate.Layer && a.Depth == "01");
+ if (locateDepth.Status != "0" || locateDepth.Flag == "2")
+ {
+ throw new Exception("璇ュ偍浣嶆繁搴�1涓嶆槸绌哄偍浣嶆垨鏍囧織涓嶆槸姝ｅ父鐨�");
+ }
+ }
+ }
+
+
var bindIdList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == bind.PalletNo && m.Status != "2").Select(m => m.Id).ToList();
//鍒ゆ柇鏄惁鏈夐浂绠�
foreach (var item in bindIdList)
@@ -624,7 +710,7 @@
//鑾峰彇鍚屾墭鐩樼殑鎵樼洏缁戝畾淇℃伅
var bindList = Db.Queryable<BllPalletBind>()
.Where(m => m.IsDel == "0" && m.PalletNo == bind.PalletNo && m.Status == "0").ToList();
- if (bindList.Count>0)
+ if (bindList.Count > 0)
{
foreach (var b in bindList)
{
@@ -664,6 +750,364 @@
}
#endregion
+ // 鐢宠宸烽亾
+ public OutCommandDto RequestRoadWay(string palletNo, string houseNo)
+ {
+ try
+ {
+ //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("璇疯緭鍏ヨ鐢宠鐨勬墭鐩樻潯鐮�");
+ }
+ //楠岃瘉鎵�灞炰粨搴撴槸鍚︿负绌�
+ if (string.IsNullOrEmpty(houseNo))
+ {
+ throw new Exception("璇烽�夋嫨鎵�灞炰粨搴�");
+ }
+ //楠岃瘉鏄惁涓哄钩搴撳叆搴�
+ if (houseNo == "W02")
+ {
+ 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绠＄悊锛屼笉鍙叆搴擄紒");
+ }
+
+ #region
+
+ //鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱鐨�)
+ var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "2").ToList();
+ var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));
+
+ var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
+ //鐗╂枡绫诲埆淇℃伅
+ var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
+
+ var skuNo = ""; //鍏ュ簱鐗╂枡
+
+ if (palletBindList.Count >= 1) //姝ｅ父鍏ュ簱
+ {
+ var palletBind = palletBindList.FirstOrDefault(m => m.Status == "1");//鏌ヨ鏄惁鏈夋鍦ㄦ墽琛岀殑鎵樼洏缁戝畾
+ if (palletBind != null)
+ {
+ var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == palletBind.TaskNo);
+ if (beingTask == null)
+ {
+ throw new Exception("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
+ }
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+ StartLocate = "", // 璧峰浣嶇疆
+ EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+ EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
+ TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ };
+ return comDto;
+ }
+ if (haveLocate != null)
+ {
+ isHaveLocateNo = true; //宸叉湁鎸囧畾鍌ㄤ綅
+ }
+
+ if (palletBindList.First().Type == "0") //鐗╂枡鎵樺叆搴�
+ {
+ //鍒ゆ柇鏄惁缁戝畾鍗曟嵁鍙婂崟鎹姸鎬佹槸鍚︽甯�
+ foreach (var item in palletBindList)
+ {
+ var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == item.ASNNo);
+ if (notice == null)
+ {
+ throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟锛屼笉鍙叆搴擄紒");
+ }
+ if (notice.Status == "3")
+ {
+ throw new Exception($"鍏ュ簱鍗晎item.ASNNo}宸插叧闂紝涓嶅彲鍏ュ簱锛�");
+ }
+ }
+
+ //鑾峰彇鐗╂枡瀛樻斁鍖哄煙
+ var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m =>
+ m.IsDel == "0" && m.Id == palletBindList.First().ASNDetailNo);
+ if (noticeDetail == null)
+ {
+ throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟鏄庣粏锛屼笉鍙叆搴�");
+ }
+
+ skuNo = noticeDetail.SkuNo;
+
+ }
+ else if (palletBindList.First().Type == "1")//绌烘墭鐩�
+ {
+ skuNo = "100099";
+ }
+ }
+ else //鍥炴祦鍏ュ簱
+ {
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
+ if (stockDetail.Count == 0)
+ {
+ throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
+ }
+ skuNo = stockDetail.First().SkuNo;
+
+ //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
+ var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "鎵樼洏鍥炲簱楠岃瘉" && 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);
+
+ //楠岃瘉鎷ｈ揣鏄庣粏鏄惁瀛樺湪
+ if (allot != null)
+ {
+ //楠岃瘉褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏄惁宸插畬鎴�
+ if (allot.Status != "5")
+ {
+ throw new Exception("褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏈畬鎴愶紝璇峰畬鎴愬悗鍥炲簱锛�");
+ }
+ }
+ }
+ }
+
+
+ #endregion
+ }
+
+ var allotLocate = new AllotLocation();
+
+ SysStorageLocat locate;
+
+ var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
+ if (sku == null)
+ {
+ throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒板叆搴撳崟鏄庣粏鍖呭惈鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
+ }
+ //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
+ if (string.IsNullOrWhiteSpace(sku.CategoryNo))
+ {
+ throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
+ }
+
+ var skuCategory = skuCategoryList.FirstOrDefault(m => m.CategoryNo == sku.CategoryNo);
+ if (skuCategory == null)
+ {
+ throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
+ }
+
+ var areaStr = skuCategory.AreaNo.Split(",");
+ var areaList = new List<string>();
+ foreach (var item in areaStr)
+ {
+ areaList.Add(item);
+ }
+
+ var laneAllot = 0; //鍌ㄤ綅璺冲贩鍒嗛厤 0:璺崇潃鍒嗛厤(涓�涓竴涓垎閰�)1:宸烽亾鎸夌収浼樺厛绾у垎閰嶏紝鍚屼紭鍏堢骇椤哄簭鍒嗛厤(涓�涓贩閬撴弧浜嗗啀鍒嗛厤涓嬩竴涓殑宸烽亾鍌ㄤ綅)
+ var funSet3 = Db.Queryable<SysFunSetting>().First(m => m.IsDel == "0" && m.FunSetName == "鍌ㄤ綅璺冲贩鍒嗛厤" && m.IsEnable == "NO");
+ if (funSet3 != null)
+ {
+ switch (funSet3.SetValue)
+ {
+ case "JumpLaneAllot":
+ laneAllot = 0;//绔嬪簱鍌ㄤ綅鍒嗛厤 宸烽亾鍚屼紭鍏堢骇宸烽亾璺崇潃鍒嗛厤(涓�涓竴涓垎閰�)
+ break;
+ case "RankLaneAllot":
+ laneAllot = 1;//绔嬪簱鍌ㄤ綅鍒嗛厤 宸烽亾鎸夌収浼樺厛绾у垎閰嶏紝鍚屼紭鍏堢骇椤哄簭鍒嗛厤(涓�涓贩閬撴弧浜嗗啀鍒嗛厤涓嬩竴涓殑宸烽亾鍌ㄤ綅)
+ break;
+ default:
+ laneAllot = 1;// 榛樿 璺崇潃鍒嗛厤
+ break;
+ }
+ }
+ var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo))
+ .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(); //宸烽亾鏈�鍚庝竴娆′娇鐢ㄨ褰�
+
+ #region 纭畾宸烽亾鎺掑簭
+
+ List<string> roadList2 = new List<string>();
+ List<string> roadSmall = new List<string>();
+ List<string> roadLarge = new List<string>();
+ if (useLog != null)
+ {
+ roadList2.Add(useLog.RoadwayNo);
+ foreach (var r in roadList)
+ {
+ if (r == useLog.RoadwayNo)
+ {
+ continue;
+ }
+ //濡傛灉缁撴灉涓�0锛屽垯璇存槑涓や釜瀛楃涓茬浉绛夛紱
+ //濡傛灉缁撴灉灏忎簬0锛屽垯璇存槑绗竴涓瓧绗︿覆灏忎簬绗簩涓瓧绗︿覆锛�
+ //濡傛灉缁撴灉澶т簬0锛屽垯璇存槑绗竴涓瓧绗︿覆澶т簬绗簩涓瓧绗︿覆銆�
+ var bol = String.CompareOrdinal(r, useLog.RoadwayNo);
+ if (bol < 0)
+ {
+ roadSmall.Add(r);
+ }
+ if (bol > 0)
+ {
+ roadLarge.Add(r);
+ }
+ }
+ roadList2.AddRange(roadLarge);
+ roadList2.AddRange(roadSmall);
+ }
+
+ roadList = roadList2;
+ #endregion
+
+
+ var roadNo = "";
+ if (laneAllot == 0)//璺冲贩閬撳钩鍧囧垎閰�
+ {
+ //鍙栧悇宸烽亾鎵�鏈夋帓绗竴涓悎閫備綅
+ foreach (var l in roadList)
+ {
+ //濡傛灉涓婃鏄綋鍓嶅贩閬撳垯璺冲嚭
+ if (useLog != null && l == useLog.RoadwayNo)
+ {
+ continue;
+ }
+
+ var locateCount = Db.Queryable<SysStorageLocat>()
+ .Where(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == l).Count();
+
+ var bindNum = Db.Queryable<BllPalletBind>()
+ .Where(m => m.IsDel == "0" && m.Status == "0" && m.RoadwayNo == l)
+ .GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
+ if (locateCount - bindNum > 0)
+ {
+ roadNo = l;
+ }
+ //褰撳墠宸锋湁浣嶇疆鍒欓��鍑�
+ if (roadNo != null)
+ {
+ break;
+ }
+ }
+ //濡傛灉璺冲贩閬撳苟涓旀湭鎵惧埌鍚堥�傜┖鍌ㄤ綅,鍒欒烦鍒版渶鍚庝竴娆′娇鐢ㄧ殑宸烽亾鏌ヨ
+
+ if (roadNo == null)
+ {
+ if (useLog != null)
+ {
+ var locateCount = Db.Queryable<SysStorageLocat>()
+ .Where(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == useLog.RoadwayNo).Count();
+
+ var bindNum = Db.Queryable<BllPalletBind>()
+ .Where(m => m.IsDel == "0" && m.Status == "0" && m.RoadwayNo == useLog.RoadwayNo)
+ .GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
+ if (locateCount - bindNum > 0)
+ {
+ roadNo = useLog.RoadwayNo;
+ }
+ }
+ }
+ }
+ else//鎸夌収宸烽亾浼樺厛绾у垎閰�
+ {
+ foreach (var item in roadList)
+ {
+ var locateCount = Db.Queryable<SysStorageLocat>()
+ .Where(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == item).Count();
+
+ var bindNum = Db.Queryable<BllPalletBind>()
+ .Where(m => m.IsDel == "0" && m.Status == "0" && m.RoadwayNo == item)
+ .GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
+
+ if (locateCount - bindNum > 0)
+ {
+ roadNo = item;
+ }
+ //褰撳墠宸锋湁浣嶇疆鍒欓��鍑�
+ if (roadNo != null)
+ {
+ break;
+ }
+ }
+ }
+
+ if (string.IsNullOrWhiteSpace(roadNo))
+ {
+ throw new Exception("鏈煡璇㈠埌绌哄偍浣嶅贩閬�");
+ }
+
+ Db.BeginTran();
+ try
+ {
+ if (roadNo != null)
+ {
+ //娣诲姞宸烽亾浣跨敤璁板綍
+ var log = new SysRoadwayUseLog
+ {
+ RoadwayNo = roadNo,
+ WareHouseNo = houseNo,
+ Row = 0,
+ Column = 0,
+ Layer = 0,
+ };
+ Db.Insertable(log).ExecuteCommand();
+ }
+
+ if (palletBindList.Count >= 1)
+ {
+ foreach (var item in palletBindList)
+ {
+ item.WareHouseNo = houseNo;
+ item.RoadwayNo = roadNo;
+ item.TaskNo = "";
+ }
+ Db.Updateable(palletBindList).ExecuteCommand();
+ }
+ Db.CommitTran();
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = "",
+ StartLocate = "", // 璧峰浣嶇疆
+ EndLocate = "", // 鐩爣浣嶇疆
+ EndRoadway = roadNo, // 鐩爣宸烽亾
+ TaskNo = "", // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ };
+
+ }
+ catch (Exception ex)
+ {
+ Db.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+ #endregion
+
+ return comDto;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
//鐢宠鍌ㄤ綅
public OutCommandDto RequestLocation(string palletNo, string houseNo, string roadwayNo)
{
@@ -682,7 +1126,7 @@
//楠岃瘉鏄惁涓哄钩搴撳叆搴�
if (houseNo == "W02")
{
- throw new Exception("闆剁搴撹浣跨敤PDA鎵嬫寔杩涜骞冲簱鍏ュ簱");
+ throw new Exception("骞冲簱璇蜂娇鐢≒DA鎵嬫寔杩涜骞冲簱鍏ュ簱");
}
OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
@@ -699,11 +1143,11 @@
//鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱鐨�)
var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "2").ToList();
var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));
-
+
var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
//鐗╂枡绫诲埆淇℃伅
var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
-
+
var skuNo = ""; //鍏ュ簱鐗╂枡
if (palletBindList.Count >= 1) //姝ｅ父鍏ュ簱
@@ -771,36 +1215,42 @@
}
skuNo = noticeDetail.SkuNo;
-
+
}
- else if(palletBindList.First().Type == "1")//绌烘墭鐩�
+ else if (palletBindList.First().Type == "1")//绌烘墭鐩�
{
- skuNo = "100099";
+ skuNo = "100099";
}
}
else //鍥炴祦鍏ュ簱
{
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
- if (stockDetail.Count==0)
+ if (stockDetail.Count == 0)
{
throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
}
skuNo = stockDetail.First().SkuNo;
- //else
- //{
- // //鍒ゆ柇鏄惁鏈夐浂绠�
- // var detailIdList = stockDetail.Select(m => m.Id).ToList();
- // var dataBoxInfo = Db.Queryable<DataBoxInfo>().Where(m => detailIdList.Contains(m.StockDetailId)).ToList();
- // if (dataBoxInfo.Count(m => m.BitBoxMark == "1")>0)
- // {
- // throw new Exception($"{palletNo}鎵樼洏涓婃湁闆剁锛屼笉鍙叆搴擄紒");
- // }
+ if (!string.IsNullOrWhiteSpace(stockDetail.First().WareHouseNo))
+ {
+ if (stockDetail.First().WareHouseNo == "W01")//绔嬪簱
+ {
+ throw new Exception($"{palletNo}鎵樼洏涓婂湪绔嬪簱涓湁搴撳瓨鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");
+ }
- //}
+ if (stockDetail.First().WareHouseNo == "W02")//骞冲簱
+ {
+ var locatePingKu = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == stockDetail.First().LocatNo);
+ if (locatePingKu != null)
+ {
+ locatePingKu.Status = "0";
+ Db.Updateable(locatePingKu).ExecuteCommand();
+ }
+ }
+ }
//鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
- 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.FunSetName == "鎵樼洏鍥炲簱楠岃瘉" && a.IsEnable == "NO");
#region 鎵樼洏鍥炲簱瑙勫垯
if (function != null)
@@ -821,7 +1271,7 @@
}
}
}
-
+
#endregion
}
@@ -860,25 +1310,25 @@
}
locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo);
- }
+ }
Db.BeginTran();
try
{
- if (locate != null)
- {
- //娣诲姞宸烽亾浣跨敤璁板綍
- var log = new SysRoadwayUseLog
- {
- RoadwayNo = locate.RoadwayNo,
- LocateNo = locate.LocatNo,
- WareHouseNo = locate.WareHouseNo,
- Row = locate.Row,
- Column = locate.Column,
- Layer = locate.Layer,
- Depth = locate.Depth
- };
- Db.Insertable(log).ExecuteCommand();
- }
+ //if (locate != null)
+ //{
+ // //娣诲姞宸烽亾浣跨敤璁板綍
+ // var log = new SysRoadwayUseLog
+ // {
+ // RoadwayNo = locate.RoadwayNo,
+ // LocateNo = locate.LocatNo,
+ // WareHouseNo = locate.WareHouseNo,
+ // Row = locate.Row,
+ // Column = locate.Column,
+ // Layer = locate.Layer,
+ // Depth = locate.Depth
+ // };
+ // Db.Insertable(log).ExecuteCommand();
+ //}
var taskNo = new Common().GetMaxNo("TK");
var exTask = new LogTask //鍏ュ簱浠诲姟
@@ -889,7 +1339,7 @@
IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
SendDate = DateTime.Now, //鍙戦�佹椂闂�
BackDate = DateTime.Now, //杩斿洖鏃堕棿
- StartRoadway="", // 璧峰宸烽亾
+ StartRoadway = "", // 璧峰宸烽亾
StartLocat = "",//璧峰浣嶇疆
EndLocat = locate.LocatNo,//鐩爣浣嶇疆
EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
@@ -968,7 +1418,7 @@
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
//褰撳墠浠诲姟涓殑鍌ㄤ綅淇℃伅
var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
- if (locate==null)
+ if (locate == null)
{
throw new Exception($"鏈煡璇㈠埌浠诲姟涓殑鍌ㄤ綅淇℃伅");
}
@@ -1011,7 +1461,7 @@
return;
}
//姝ｅ父鍏ュ簱
- var bindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel =="0" && m.TaskNo == taskNo && m.Status =="1").ToList();
+ var bindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.TaskNo == taskNo && m.Status == "1").ToList();
if (bindList.Count == 0)
{
throw new Exception($"{taskNo}璇ヤ换鍔℃病鏈夊搴旂殑娴佹按淇℃伅");
@@ -1136,6 +1586,13 @@
{
throw new Exception("鏈煡璇㈠埌鎵樼洏缁戝畾鐨勫叆搴撳崟鏄庣粏淇℃伅");
}
+ var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo);
+ if (notice == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鎵樼洏缁戝畾鐨勫叆搴撳崟淇℃伅");
+ }
+ string ownerNo = notice.CustomerNo;//璐т富缂栫爜
+ string ownerName = notice.CustomerName;//璐т富鍚嶇О
var sku1 = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == noticeDetail.SkuNo);
string isinspect = "0";
@@ -1180,11 +1637,23 @@
PackagNo = noticeDetail.PackagNo,
IsBale = item.IsBale,
IsBelt = item.IsBelt,
+ Demo = item.Demo,
IsDel = "0",
CreateUser = 0,
CreateTime = comTime
};
+ //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭�
+ if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠ｅ偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+ {
+ sd.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+ sd.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+ }
+ else if (notice.Type == "1" || notice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
+ {
+ sd.SupplierNo= notice.CustomerNo;//渚涘簲鍟嗙紪鐮�
+ sd.SupplierName = notice.CustomerName;//渚涘簲鍟嗗悕绉�
+ }
//if (quality.Count() > 0)
//{
@@ -1273,6 +1742,12 @@
CreateUser = userId,
CreateTime = comTime
};
+ //缁存姢搴撳瓨璐т富淇℃伅
+ if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠ｅ偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+ {
+ stock.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+ stock.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+ }
Db.Insertable(stock).ExecuteCommand();
}
#endregion
@@ -1291,7 +1766,6 @@
.Count(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo && m.Status != "2");
if (asnDetailNum == 0)
{
- var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo);
notice.Status = "2";
notice.CompleteTime = comTime;
Db.Updateable(notice).ExecuteCommand();
@@ -1548,7 +2022,7 @@
skuNo = stockDetail.First().SkuNo;
}
- var sku = Db.Queryable<SysMaterials>().First(m =>m.IsDel =="0" && m.SkuNo == skuNo);
+ var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
if (sku == null)
{
throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒板叆搴撳崟鏄庣粏鍖呭惈鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
@@ -1559,7 +2033,7 @@
throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
}
- var skuCategory = Db.Queryable<SysMaterialCategory>().First(m =>m.IsDel=="0" && m.CategoryNo == sku.CategoryNo);
+ var skuCategory = Db.Queryable<SysMaterialCategory>().First(m => m.IsDel == "0" && m.CategoryNo == sku.CategoryNo);
if (skuCategory == null)
{
throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
@@ -1582,21 +2056,21 @@
//}
//catch (Exception ex)
//{
- // 鏁翠釜浠撳簱閮芥病鏈夋壘鍒版墭鐩�
- if (asnNo != "鍥炴祦鎵樼洏")
- {
- palletBindModel.Status = "0"; // 绛夊緟鎵ц
- palletBindModel.LocatNo = ""; // 鍌ㄤ綅鍦板潃
- Db.Updateable(palletBindModel).ExecuteCommand();
- Db.CommitTran();
- }
+ // 鏁翠釜浠撳簱閮芥病鏈夋壘鍒版墭鐩�
+ if (asnNo != "鍥炴祦鎵樼洏")
+ {
+ palletBindModel.Status = "0"; // 绛夊緟鎵ц
+ palletBindModel.LocatNo = ""; // 鍌ㄤ綅鍦板潃
+ Db.Updateable(palletBindModel).ExecuteCommand();
+ Db.CommitTran();
+ }
- return null;
- //throw ex;
- //}
+ return null;
+ //throw ex;
+ //}
}
-
+
// 鐢熸垚鍏ュ簱浠诲姟
var taskNo = new Common().GetMaxNo("TK"); // 鑾峰彇浠诲姟缂栧彿
@@ -1619,7 +2093,7 @@
Type = "0", //浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "1", //浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "0", //0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = taskModel.EndLocat+">>>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+ Msg = taskModel.EndLocat + ">>>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
};
Db.Insertable(exTask).ExecuteCommand();
locate.Status = "2";
@@ -1679,7 +2153,7 @@
//鎵樼洏缁戝畾淇℃伅
var bind = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.TaskNo == taskNo).ToList();
- if (bind.Count >0)
+ if (bind.Count > 0)
{
foreach (var item in bind)
{
--
Gitblit v1.8.0