From f9a9a948cd138ad0877c54319857c327c0c0c402 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期五, 28 二月 2025 16:50:50 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 676 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 387 insertions(+), 289 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 69e37ea..f278409 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1546,7 +1546,368 @@
}
#endregion
- // 鐢宠宸烽亾
+
+ #region 鐢宠鍌ㄤ綅銆佸贩閬� 浠诲姟瀹屾垚銆佸彇娑�
+
+
+ /// <summary>
+ /// 鐢宠宸烽亾(瀵嗛泦搴�)
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="houseNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public OutCommandDto RequestMiJiRoadWay(string palletNo, string houseNo)
+ {
+ try
+ {
+ #region 楠岃瘉鎵樼洏鍚堟硶鎬�
+ //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("璇疯緭鍏ヨ鐢宠鐨勬墭鐩樻潯鐮�");
+ }
+ //楠岃瘉鎵�灞炰粨搴撴槸鍚︿负绌�
+ if (string.IsNullOrEmpty(houseNo))
+ {
+ throw new Exception("璇烽�夋嫨鎵�灞炰粨搴�");
+ }
+ //鑾峰彇浠撳簱绫诲瀷
+ var houseType = Db.Queryable<SysWareHouse>().First(a => a.WareHouseNo == houseNo);
+ //楠岃瘉鏄惁涓哄瘑闆嗗簱
+ if (houseType.Type != "3")
+ {
+ throw new Exception("浠撳簱涓嶆槸瀵嗛泦搴�");
+ }
+
+ var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//鎵樼洏淇℃伅
+ //鍒ゆ柇鎵樼洏鏉＄爜鏄惁鏈夋晥
+ if (stock == null)
+ {
+ throw new Exception("鎵樼洏鏉＄爜涓嶅彈WMS绠＄悊锛屼笉鍙叆搴擄紒");
+ }
+ #endregion
+
+
+ OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
+ #region
+
+ //鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱/姝ｅ湪鎵ц鐨�)
+ var palletBindList = Db.Queryable<BllPalletBind>()
+ .Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
+ var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));
+
+ var skuNo = ""; //鍏ュ簱鐗╂枡
+ var lotNo = ""; //鍏ュ簱鎵规
+
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
+ 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 = beingTask.StartLocat, // 璧峰浣嶇疆
+ EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+ EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
+ TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍏ュ簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ };
+ if (beingTask.IsSuccess == 0)
+ {
+ beingTask.IsSuccess = 1;
+ Db.Updateable(beingTask).ExecuteCommand();
+ }
+ return comDto;
+
+ }
+
+
+ // 楠岃瘉鏄惁鍏宠仈鍗曟嵁锛岃幏鍙栨墭鐩樹笂瀛樻斁鐨勭墿鏂�
+ 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" || notice.Status == "4")
+ {
+ 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;
+ lotNo = noticeDetail.LotNo;
+
+ }
+ else if (palletBindList.First().Type == "1")//绌烘墭鐩�
+ {
+ skuNo = "100099";
+ }
+ }
+ else //鍥炴祦鍏ュ簱
+ {
+ if (stockDetail.Count == 0)
+ {
+ throw new Exception($"{palletNo}鎵樼洏涓嶅瓨鍦ㄥ簱瀛樹俊鎭紝涓嶅彲鍏ュ簱锛�");
+ }
+ if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
+ {
+ throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
+ }
+ skuNo = stockDetail.First().SkuNo;
+ lotNo = stockDetail.First().LotNo;
+
+ #region 鍒ゆ柇浠诲姟鏄惁宸茬粡瀛樺湪锛岃嫢瀛樺湪鐩存帴杩斿洖浠诲姟锛�
+ var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
+ && (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
+ if (beingTask != null)
+ {
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+ StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
+ EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+ EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
+ TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ };
+ if (beingTask.IsSuccess == 0)
+ {
+ beingTask.IsSuccess = 1;
+ beingTask.Status = "1";
+ Db.Updateable(beingTask).ExecuteCommand();
+ }
+
+ return comDto;
+ }
+ #endregion
+
+ #region 鍒ゆ柇璇ユ墭鐩橈紝鏄惁绗﹀悎鍥炲簱鍔熻兘璁惧畾鐨勫洖搴撹鍒�
+ //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
+ var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0"
+ && a.FunSetNo == "Fun041" && a.IsEnable == "NO");
+ if (function != null)
+ {
+ //鎷ｈ揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
+ 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;
+
+ #region 鏍规嵁sku纭鍖哄煙鍒掑垎
+
+ //鐗╂枡淇℃伅
+ var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
+ if (sku == null)
+ {
+ throw new Exception("鐗╂枡缂栫爜涓嶅瓨鍦紝涓嶅彲鍏ュ簱");
+ }
+ //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
+ if (string.IsNullOrWhiteSpace(sku.CategoryNo))
+ {
+ throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈缃被鍒�,涓嶅彲鍏ュ簱");
+ }
+ //鐗╂枡绫诲埆淇℃伅
+ var skuCategory = Db.Queryable<SysMaterialCategory>().First(m => m.IsDel == "0" && 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 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();
+
+
+ #endregion
+
+ var roadNo = allotLocate.GetMiJiSuiTableRoad(houseNo, roadList, areaList,skuNo,lotNo);
+
+ if (string.IsNullOrWhiteSpace(roadNo))
+ {
+ throw new Exception("鏈煡璇㈠埌瀛樺湪绌哄偍浣嶅贩閬�");
+ }
+
+ Db.BeginTran();
+ try
+ {
+ //娣诲姞宸烽亾浣跨敤璁板綍
+ var log = new SysRoadwayUseLog
+ {
+ 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();
+
+ var asnNo = "";
+ // 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 liudl
+ if (palletBindList.Count < 1)
+ {
+ foreach (DataStockDetail stockModel in stockDetail)
+ {
+ var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
+ && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo);
+ if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
+ {
+ bindModel.TaskNo = taskNo;
+ bindModel.WareHouseNo = houseNo;
+ bindModel.RoadwayNo = roadNo;
+ Db.Updateable(bindModel).ExecuteCommand();
+ asnNo = stockModel.ASNNo;
+ }
+
+
+ }
+ }
+ foreach (DataStockDetail stockModel in stockDetail)
+ {
+ //娣诲姞鎵樼洏涓婃灦璁板綍
+ var upShelf = new BllPalletUpShelf()
+ {
+ TaskNo = exTask.TaskNo,
+ TraceNo = asnNo,
+ PalletNo = palletNo,
+ SkuNo = stockModel.SkuNo,
+ SkuName = stockModel.SkuName,
+ LotNo = stockModel.LotNo,
+ Status = "1",
+
+ WareHouseNo = houseNo,
+ RoadwayNo = roadNo,
+ AreaNo = "",
+ LocatNo = "",
+
+ CreateUser = 0,
+ };
+ Db.Insertable(upShelf).ExecuteCommand();
+ }
+
+
+ if (palletBindList.Count >= 1)
+ {
+ foreach (var item in palletBindList)
+ {
+ item.WareHouseNo = houseNo;
+ item.RoadwayNo = roadNo;
+ item.TaskNo = taskNo;
+ }
+ Db.Updateable(palletBindList).ExecuteCommand();
+ }
+ Db.CommitTran();
+
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = "",
+ StartLocate = "", // 璧峰浣嶇疆
+ EndLocate = "", // 鐩爣浣嶇疆
+ EndRoadway = roadNo, // 鐩爣宸烽亾
+ TaskNo = 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);
+ }
+ }
+
+ /// <summary>
+ /// 鐢宠宸烽亾
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="houseNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
public OutCommandDto RequestRoadWay(string palletNo, string houseNo)
{
try
@@ -2022,7 +2383,14 @@
}
}
- //1 鐢宠鍌ㄤ綅 2 鐢宠宸烽亾鍚� 鍐嶇敵璇峰偍浣嶅偍浣�
+ /// <summary>
+ /// 1 鐢宠鍌ㄤ綅 2 鐢宠宸烽亾鍚� 鍐嶇敵璇峰偍浣嶅偍浣�
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="houseNo"></param>
+ /// <param name="roadwayNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
public OutCommandDto RequestLocation(string palletNo, string houseNo, string roadwayNo)
{
try
@@ -2415,292 +2783,13 @@
throw new Exception(e.Message);
}
}
-
- #region 鏃х増鏈敵璇峰偍浣�
-
- //鐢宠鍌ㄤ綅
- //public OutCommandDto RequestLocation(string palletNo, string houseNo, string roadwayNo)
- //{
- // 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;
- // 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");
- // #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;
- // if (isHaveLocateNo) //鎸囧畾鍌ㄤ綅
- // {
- // locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == haveLocate.LocatNo);
- // }
- // else
- // {
- // 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);
- // }
-
- // 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();
- // //}
-
- // 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 = locate.LocatNo,//鐩爣浣嶇疆
- // EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
- // 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 = "鍏ュ簱鍙ｅ埌=>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
-
- // };
- // Db.Insertable(exTask).ExecuteCommand();
- // locate.Status = "2";
- // Db.Updateable(locate).ExecuteCommand();
- // if (palletBindList.Count >= 1)
- // {
- // foreach (var item in palletBindList)
- // {
- // item.Status = "1";
- // item.WareHouseNo = locate.WareHouseNo;
- // item.RoadwayNo = locate.RoadwayNo;
- // item.LocatNo = locate.LocatNo;
- // item.TaskNo = taskNo;
- // }
- // Db.Updateable(palletBindList).ExecuteCommand();
- // }
- // Db.CommitTran();
- // comDto = new OutCommandDto()
- // {
- // PalletNo = palletNo,//鎵樼洏鍙�
- // StartRoadway = "",
- // StartLocate = "", // 璧峰浣嶇疆
- // EndLocate = locate.LocatNo, // 鐩爣浣嶇疆
- // EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
- // TaskNo = exTask.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);
- // }
- //}
-
- #endregion
-
- //鍏ュ簱瀹屾垚(wcs鍙嶉銆亀ms鎵嬪姩瀹屾垚)
+
+ /// <summary>
+ /// 鍏ュ簱瀹屾垚(wcs鍙嶉銆亀ms鎵嬪姩瀹屾垚)
+ /// </summary>
+ /// <param name="taskNo"></param>
+ /// <param name="userId"></param>
+ /// <exception cref="Exception"></exception>
public void ArrivalSuccess(string taskNo, int userId)
{
try
@@ -3408,6 +3497,7 @@
throw new Exception(e.Message);
}
}
+
/// <summary>
/// 婊″叆寮傚父
/// </summary>
@@ -3601,7 +3691,12 @@
}
}
- //鎵嬪姩鍙栨秷鍏ュ簱浠诲姟
+ /// <summary>
+ /// 鎵嬪姩鍙栨秷鍏ュ簱浠诲姟
+ /// </summary>
+ /// <param name="taskNo"></param>
+ /// <param name="userId"></param>
+ /// <exception cref="Exception"></exception>
public void CancelAsnTask(string taskNo, int userId)
{
try
@@ -3664,6 +3759,9 @@
throw new Exception(e.Message);
}
}
+
+ #endregion
+
#region 鏁版嵁褰掓。
public List<PalletBindDto> GetArchivingPalletBindList(PalletBindVm model, out int count)
{
--
Gitblit v1.8.0