From d75d3b7cf6ba68c9e9e69bced4552a554ca76e93 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 21 六月 2025 15:12:29 +0800
Subject: [PATCH] 出库口问题修改；标签打印优化
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 1563 +++++++++++++++++++++++++++++----------------------------
1 files changed, 791 insertions(+), 772 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index f3f3ab6..54de8b1 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1435,6 +1435,7 @@
var skuNo = ""; //鍏ュ簱鐗╂枡
var isAddTask = true; //鏄惁娣诲姞鏂颁换鍔�
var oldTaskNo = ""; //鏃т换鍔″彿
+ var starLocate = ""; // 璧峰鍌ㄤ綅
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
//楠岃瘉鐗╂枡鏄惁鏈夋垚鍝�
foreach (var item in stockDetail)
@@ -1461,7 +1462,7 @@
{
PalletNo = palletNo,//鎵樼洏鍙�
StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
- StartLocate = "", // 璧峰浣嶇疆
+ StartLocate = starLocate, // 璧峰浣嶇疆
EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
@@ -1529,9 +1530,21 @@
{
throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
}
- if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
+ if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) == 0)
{
- throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
+ throw new Exception("褰撳墠鎵樼洏娌℃湁鍦ㄥ钩搴撳偍浣嶄笂锛岃鏍稿疄");
+ }
+ starLocate = stockDetail.First().LocatNo;
+
+ var pingAreaStr = Db.Queryable<SysStorageArea>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W04" && m.AreaNo != "B06" && m.AreaNo != "B07").Select(m=>m.AreaNo).ToList();
+ var pingLocateInfo = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == starLocate && pingAreaStr.Contains(m.AreaNo) && m.IsDel == "0");
+ if (pingLocateInfo == null )
+ {
+ throw new Exception("褰撳墠鎵樼洏鎵�鍦ㄧ殑鍌ㄤ綅娌℃湁鍦ㄧ郴缁熶腑鎵惧埌淇℃伅");
+ }
+ if (pingLocateInfo.Status != "1")
+ {
+ throw new Exception("褰撳墠鎵樼洏鎵�鍦ㄧ殑鍌ㄤ綅鐘舵�侀敊璇紝涓嶆槸绌哄偍浣�");
}
skuNo = stockDetail.First().SkuNo;
@@ -1545,13 +1558,14 @@
{
PalletNo = palletNo,//鎵樼洏鍙�
StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
- StartLocate = "", // 璧峰浣嶇疆
+ StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
OutMode = "", //鐩爣鍦板潃
- Order = 1
+ Order = 1,
+ Type = PLCTypeEnum.AGV
};
if (beingTask.IsSuccess == 0)
{
@@ -1653,6 +1667,759 @@
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 = starLocate,//璧峰浣嶇疆
+ 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();
+ var asnNo = "";
+ // 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 liudl
+ 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 = locate.WareHouseNo;
+ bindModel.RoadwayNo = locate.RoadwayNo;
+ bindModel.LocatNo = locate.LocatNo;
+ 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 = locate.RoadwayNo,
+ AreaNo = locate.AreaNo,
+ LocatNo = locate.LocatNo,
+
+ CreateUser = 0,
+ };
+ Db.Insertable(upShelf).ExecuteCommand();
+ }
+
+ oldTaskNo = taskNo;
+ }
+ else
+ {
+ var oldTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == oldTaskNo);
+ oldTask.EndLocat = locate.LocatNo;
+ oldTask.EndRoadway = locate.RoadwayNo;
+ if (oldTask.IsSuccess == 0)
+ {
+ oldTask.IsSuccess = 1;
+ oldTask.Status = "1";
+ }
+ Db.Updateable(oldTask).ExecuteCommand();
+
+
+ var bindModelList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
+ && m.PalletNo == oldTask.PalletNo && m.TaskNo == oldTaskNo).ToList();
+ foreach (var bindModel in bindModelList)
+ {
+ if (string.IsNullOrWhiteSpace(bindModel.LocatNo))
+ {
+ bindModel.TaskNo = oldTask.TaskNo;
+ bindModel.WareHouseNo = locate.WareHouseNo;
+ bindModel.RoadwayNo = locate.RoadwayNo;
+ bindModel.LocatNo = locate.LocatNo;
+ Db.Updateable(bindModel).ExecuteCommand();
+
+ }
+ }
+ //鏇存敼涓婃灦淇℃伅
+ var upShelfList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.TaskNo == oldTask.TaskNo && m.PalletNo == palletNo).ToList();
+ foreach (var upShelf in upShelfList)
+ {
+ upShelf.WareHouseNo = locate.WareHouseNo;
+ upShelf.RoadwayNo = locate.RoadwayNo;
+ upShelf.LocatNo = locate.LocatNo;
+ upShelf.Status = "1";
+ Db.Updateable(upShelf).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 = oldTaskNo;
+ }
+ Db.Updateable(palletBindList).ExecuteCommand();
+ }
+ Db.CommitTran();
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = "",
+ StartLocate = starLocate, // 璧峰浣嶇疆
+ EndLocate = locate.LocatNo, // 鐩爣浣嶇疆
+ EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
+ TaskNo = oldTaskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1,
+ Type = PLCTypeEnum.AGV
+ };
+
+ }
+ 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 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>
+ /// 1 鐢宠鍌ㄤ綅 2 鐢宠宸烽亾鍚� 鍐嶇敵璇峰偍浣嶅偍浣�
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="houseNo"></param>
+ /// <param name="roadwayNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public OutCommandDto RequestMiJiLocation(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 == "0" || m.Status == "1")).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 = ""; //鍏ュ簱鐗╂枡
+ var isAddTask = true; //鏄惁娣诲姞鏂颁换鍔�
+ var oldTaskNo = ""; //鏃т换鍔″彿
+ 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("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
+ }
+ if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
+ {
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+ StartLocate = "", // 璧峰浣嶇疆
+ 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;
+ }
+ else
+ {
+ if (string.IsNullOrWhiteSpace(roadwayNo))
+ {
+ roadwayNo = beingTask.EndRoadway;
+ }
+ isAddTask = false;
+ oldTaskNo = beingTask.TaskNo;
+ }
+ }
+ 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 //鍥炴祦鍏ュ簱
+ {
+ if (stockDetail.Count == 0)
+ {
+ throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
+ }
+ if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
+ {
+ throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
+ }
+ skuNo = stockDetail.First().SkuNo;
+
+ 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)
+ {
+ if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
+ {
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+ StartLocate = "", // 璧峰浣嶇疆
+ 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;
+ }
+ else
+ {
+ if (string.IsNullOrWhiteSpace(roadwayNo))
+ {
+ roadwayNo = beingTask.EndRoadway;
+ }
+ isAddTask = false;
+ oldTaskNo = beingTask.TaskNo;
+ }
+ }
+
+ //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
+ 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();
+
+ #region 鐢宠鍌ㄤ綅
+
+ 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.GetMiJiSuiTableLocate(roadwayNo, areaList);
+ }
+
+ #endregion
+
+ Db.BeginTran();
+ try
+ {
+
+ if (isAddTask) // 姝ｅ父鍏ュ簱
+ {
var taskNo = new Common().GetMaxNo("TK");
var exTask = new LogTask //鍏ュ簱浠诲姟
{
@@ -1806,7 +2573,7 @@
}
/// <summary>
- /// 涓嬪彂鍏ュ簱鐢宠鍌ㄤ綅浠诲姟锛堜笅鍙�==銆婣GV灏忚溅锛�
+ /// 涓嬪彂鍏ュ簱鐢宠鍌ㄤ綅浠诲姟锛堜笅鍙�==銆媁CS锛�
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -1822,22 +2589,21 @@
try
{
var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- //response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV鍙枡鍑哄簱鍛戒护", "AGV");
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍏ュ簱鍛戒护", "WCS");
var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
-
- ////瑙ｆ瀽杩斿洖鏁版嵁
- //var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- //if (wcsModel.StatusCode == 0)
- //{
- // //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
- //new TaskServer().EditTaskIssueOk(list2, time1, time2);
-
- //}
- //if (wcsModel.StatusCode == -1)
- //{
- // new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
- // throw new Exception(wcsModel.Msg);
- //}
+ var list = new List<string>() { model.TaskNo };
+ //瑙ｆ瀽杩斿洖鏁版嵁
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
+ if (wcsModel.code == 200)
+ {
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list, time1, time2);
+ }
+ else
+ {
+ new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.message);
+ throw new Exception("WCS鍙嶉锛�" + wcsModel.message);
+ }
}
catch (Exception ex)
{
@@ -1849,6 +2615,8 @@
throw;
}
}
+
+
#endregion
@@ -2048,356 +2816,6 @@
#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>
/// 鐢宠宸烽亾 锛堢珛浣撳簱锛�
@@ -2880,406 +3298,6 @@
}
}
- /// <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
- {
- //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
- 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 == "0" || m.Status == "1")).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 = ""; //鍏ュ簱鐗╂枡
- var isAddTask = true; //鏄惁娣诲姞鏂颁换鍔�
- var oldTaskNo = ""; //鏃т换鍔″彿
- 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("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
- }
- if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
- {
- comDto = new OutCommandDto()
- {
- PalletNo = palletNo,//鎵樼洏鍙�
- StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
- StartLocate = "", // 璧峰浣嶇疆
- 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;
- }
- else
- {
- if (string.IsNullOrWhiteSpace(roadwayNo))
- {
- roadwayNo = beingTask.EndRoadway;
- }
- isAddTask = false;
- oldTaskNo = beingTask.TaskNo;
- }
- }
- 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 //鍥炴祦鍏ュ簱
- {
- if (stockDetail.Count == 0)
- {
- throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
- }
- if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
- {
- throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
- }
- skuNo = stockDetail.First().SkuNo;
-
- 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)
- {
- if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
- {
- comDto = new OutCommandDto()
- {
- PalletNo = palletNo,//鎵樼洏鍙�
- StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
- StartLocate = "", // 璧峰浣嶇疆
- 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;
- }
- else
- {
- if (string.IsNullOrWhiteSpace(roadwayNo))
- {
- roadwayNo = beingTask.EndRoadway;
- }
- isAddTask = false;
- oldTaskNo = beingTask.TaskNo;
- }
- }
-
- //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
- 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();
-
- #region 鐢宠鍌ㄤ綅
-
- 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);
- }
-
- #endregion
-
- Db.BeginTran();
- try
- {
-
- if (isAddTask) // 姝ｅ父鍏ュ簱
- {
- 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();
- var asnNo = "";
- // 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 liudl
- 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 = locate.WareHouseNo;
- bindModel.RoadwayNo = locate.RoadwayNo;
- bindModel.LocatNo = locate.LocatNo;
- 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 = locate.RoadwayNo,
- AreaNo = locate.AreaNo,
- LocatNo = locate.LocatNo,
-
- CreateUser = 0,
- };
- Db.Insertable(upShelf).ExecuteCommand();
- }
-
- oldTaskNo = taskNo;
- }
- else
- {
- var oldTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == oldTaskNo);
- oldTask.EndLocat = locate.LocatNo;
- oldTask.EndRoadway = locate.RoadwayNo;
- if (oldTask.IsSuccess == 0)
- {
- oldTask.IsSuccess = 1;
- oldTask.Status = "1";
- }
- Db.Updateable(oldTask).ExecuteCommand();
-
-
- var bindModelList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
- && m.PalletNo == oldTask.PalletNo && m.TaskNo == oldTaskNo).ToList();
- foreach (var bindModel in bindModelList)
- {
- if (string.IsNullOrWhiteSpace(bindModel.LocatNo))
- {
- bindModel.TaskNo = oldTask.TaskNo;
- bindModel.WareHouseNo = locate.WareHouseNo;
- bindModel.RoadwayNo = locate.RoadwayNo;
- bindModel.LocatNo = locate.LocatNo;
- Db.Updateable(bindModel).ExecuteCommand();
-
- }
- }
- //鏇存敼涓婃灦淇℃伅
- var upShelfList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.TaskNo == oldTask.TaskNo && m.PalletNo == palletNo).ToList();
- foreach (var upShelf in upShelfList)
- {
- upShelf.WareHouseNo = locate.WareHouseNo;
- upShelf.RoadwayNo = locate.RoadwayNo;
- upShelf.LocatNo = locate.LocatNo;
- upShelf.Status = "1";
- Db.Updateable(upShelf).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 = oldTaskNo;
- }
- Db.Updateable(palletBindList).ExecuteCommand();
- }
- Db.CommitTran();
- comDto = new OutCommandDto()
- {
- PalletNo = palletNo,//鎵樼洏鍙�
- StartRoadway = "",
- StartLocate = "", // 璧峰浣嶇疆
- EndLocate = locate.LocatNo, // 鐩爣浣嶇疆
- EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
- TaskNo = oldTaskNo, // 浠诲姟鍙�
- 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>
/// 鍏ュ簱瀹屾垚(wcs鍙嶉銆亀ms鎵嬪姩瀹屾垚)
@@ -4234,7 +4252,8 @@
var upShelfList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.TaskNo == taskNo && m.PalletNo == task.PalletNo).ToList();
foreach (var upShelf in upShelfList)
{
- upShelf.IsDel = "1";
+ //upShelf.IsDel = "1";
+ upShelf.Status = "4";
Db.Updateable(upShelf).ExecuteCommand();
}
--
Gitblit v1.8.0