From 62f6435ffed439deb76093ec0aceac7f3bbd6549 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 29 四月 2025 14:33:32 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs | 813 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 758 insertions(+), 55 deletions(-)
diff --git a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
index f1f55f3..8856889 100644
--- a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
@@ -1,16 +1,25 @@
锘縰sing Model.InterFaceModel;
+using Model.ModelDto.LogDto;
using Model.ModelDto.SysDto;
+using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Security.Policy;
using System.Text;
+using System.Threading.Tasks;
+using Utility.Tools;
+using WMS.BLL.LogServer;
using WMS.DAL;
+using WMS.Entity.BllAsnEntity;
+using WMS.Entity.BllSoEntity;
using WMS.Entity.Context;
using WMS.Entity.DataEntity;
using WMS.Entity.LogEntity;
using WMS.Entity.SysEntity;
using WMS.IBLL.IBllTransServer;
+using static Model.InterFaceModel.RCSModel;
namespace WMS.BLL.BllTransServer
{
@@ -21,11 +30,16 @@
private readonly object RcsLock = new object();
+ /// <summary>
+ /// 鏍规嵁鐢ㄦ埛瑙掕壊鏉冮檺鑾峰彇褰撳墠瑙掕壊鐨勫尯鍩�
+ /// </summary>
+ /// <param name="userId"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
public List<SysStorageArea> GetAreaListByUser(int userId)
{
try
- {
- //鏍规嵁鐢ㄦ埛瑙掕壊鏉冮檺鑾峰彇褰撳墠瑙掕壊鐨勫尯鍩�
+ {
var user = Db.Queryable<SysUserInfor>().First(m=>m.IsDel == "0" && m.Id == userId);
if (user == null)
{
@@ -56,7 +70,12 @@
throw new Exception(e.Message);
}
}
-
+ /// <summary>
+ /// 鏍规嵁鍖哄煙鑾峰彇鍌ㄤ綅鍦板潃
+ /// </summary>
+ /// <param name="area"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
public List<SysStorageLocat> GetLocatByArea(string area)
{
try
@@ -70,7 +89,12 @@
throw new Exception(e.Message);
}
}
-
+ /// <summary>
+ /// 鏍规嵁鍖哄煙鎴栬�呮《鐘舵��
+ /// </summary>
+ /// <param name="area"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
public List<DicModel> GetPlnStatusByArea(string area)
{
try
@@ -129,7 +153,12 @@
throw new Exception(e.Message);
}
}
-
+ /// <summary>
+ /// 鏍规嵁妗剁姸鎬佽幏鍙栫墿鏂欑紪鐮�
+ /// </summary>
+ /// <param name="palletStatus"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
public List<string> GetSkuByStatus(string palletStatus)
{
try
@@ -143,7 +172,12 @@
throw new Exception(e.Message);
}
}
-
+ /// <summary>
+ /// 鏍规嵁鐗╂枡缂栫爜鑾峰彇鎵规鍙�
+ /// </summary>
+ /// <param name="skuNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
public List<string> GetLotNoBySku(string skuNo)
{
try
@@ -178,12 +212,12 @@
/// <param name="areaNo">鍖哄煙</param>
/// <param name="endLocate">璧峰浣嶇疆</param>
/// <param name="plnStatus">妗剁被鍨� 0鍑�妗� 2婊℃《 3鑴忔《 </param>
- /// <param name="standard">瑙勬牸</param>
+ /// <param name="standard">妗惰鏍�</param>
/// <param name="skuNo">鐗╂枡鍙�</param>
/// <param name="lotNo">鎵规</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <exception cref="Exception"></exception>
- public void jiaoLiaoHopper(string areaNo,string endLocate,string plnStatus,string standard,string skuNo,string lotNo,int userId)
+ public void jiaoLiaoHopper(string areaNo,string endLocate,string plnStatus,string standard,string skuNo,string lotNo,string url,int userId)
{
try
{
@@ -213,7 +247,7 @@
{
throw new Exception("鐩爣鍌ㄤ綅鏍囪瘑涓嶆槸姝ｅ父鍙敤鐨�");
}
- if (endLocateInfo.Status!="0")
+ if (endLocateInfo.Status != "0")
{
throw new Exception("鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅");
}
@@ -223,7 +257,7 @@
//鐩爣妤煎眰
var layer = endLocateInfo.Layer;
var houseStr = layer == 3 ? "3妤间腑闂寸珯" : layer == 4 ? "4妤间腑闂寸珯" : "";
-
+ //閫氳繃浠撳簱鍚嶇О鏌ヨ浠撳簱淇℃伅
var house = Db.Queryable<SysWareHouse>().First(m => m.IsDel == "0" && m.WareHouseName == houseStr);
if (house == null)
{
@@ -232,10 +266,12 @@
//鏌ユ壘鐘舵�佹槸鏈垎閰嶄笖鍌ㄤ綅涓嶄负绌虹殑搴撳瓨淇℃伅
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.Status == "0" && m.WareHouseNo == house.WareHouseNo && !string.IsNullOrWhiteSpace(m.LocatNo)).ToList();
+ //鍑�妗�
if (plnStatus == "0")
{
- stockDetail = stockDetail.Where(m => m.PalletStatus == "0" && m.Standard == standard).OrderBy(m=>m.LocatNo).ToList();
+ stockDetail = stockDetail.Where(m => m.PalletStatus == "0" && m.Standard == standard).OrderBy(m => m.LocatNo).ToList();
}
+ //婊℃《
else if (plnStatus == "2")
{
stockDetail = stockDetail.Where(m => m.PalletStatus == "2" && m.SkuNo == skuNo && m.LotNo == lotNo).OrderBy(m => m.LocatNo).ToList();
@@ -244,24 +280,52 @@
{
throw new Exception("妗剁被鍨嬮敊璇�");
}
- if (stockDetail == null)
+ if (stockDetail == null || stockDetail.Count <= 0)
{
throw new Exception("娌℃湁鏌ヨ鍒板彨鏂欑殑搴撳瓨淇℃伅");
}
- //鏌ユ壘鍚堥�傜殑 妗跺彿 鍌ㄤ綅
- foreach (var item in stockDetail)
- {
-
- }
-
-
+ //寮�鍚簨鍔�
+ Db.BeginTran();
+ //鐢熶骇浠诲姟鍙�
var taskNo = new Common().GetMaxNo("TK");
+
+ bool resultYi = false;
+ #region#鏌ユ壘鍚堥�傜殑 妗跺彿 鍌ㄤ綅
+ //鐩爣浠撳簱鎵�鏈夊偍浣�
+ var locatList = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.WareHouseNo == house.WareHouseNo).ToList();
+ //鐩爣浠撳簱鎵�鏈変笉闇�瑕佺Щ搴撶殑鍌ㄤ綅
+ var locatListWai = locatList.Where(w => string.IsNullOrEmpty(w.AisleOne)).Select(s => s.LocatNo);
+
+ //鍏堟壘涓嶉渶瑕佺Щ搴撶殑妗�
+ var palletModel = stockDetail.Where(w => locatListWai.Contains(w.LocatNo)).OrderBy(o => o.UpdateTime).FirstOrDefault();
+ if (palletModel == null)
+ {
+ //鎵鹃渶瑕佺Щ搴撶殑妗�
+ palletModel= stockDetail.Where(w => !locatListWai.Contains(w.LocatNo)).OrderBy(o => o.UpdateTime).FirstOrDefault();
+ if (palletModel == null)
+ {
+ throw new Exception("鏈壘鍒板搴旀《淇℃伅");
+ }
+ resultYi = YikuTask(palletModel.PalletNo, taskNo, url);
+ }
+ #endregion
+ //璧峰鍌ㄤ綅鍦板潃淇℃伅
+ var startLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.Status == "1" && w.LocatNo == palletModel.LocatNo);
+ if (startLoction == null)
+ {
+ throw new Exception($"璧峰鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦紝妗跺彿锛歿palletModel.LocatNo}");
+ }
+ //浜х敓绉诲簱浠诲姟
+ if (resultYi)
+ {
+ taskNo = taskNo + "-1";
+ }
//娣诲姞浠诲姟
- var task = new LogTask
+ var logTaskEntry = new LogTask
{
TaskNo = taskNo,
Sender = "WMS",
- Receiver = "WCS",
+ Receiver = "RCS",
IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
StartLocat = "",//璧峰浣嶇疆
@@ -270,18 +334,61 @@
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
- Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
CreateTime = DateTime.Now
};
- Db.Insertable(task).ExecuteCommand();
- //璋冪敤AGV鎺ュ彛涓嬪彂浠诲姟
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+
+ //娌℃湁浜х敓绉诲簱浠诲姟灏辩洿鎺ョ粰灏忚溅涓嬪彂鍑哄簱浠诲姟锛岃嫢浜х敓绉诲簱浠诲姟绛夊皬杞︽妸绉诲簱鐨勬《鎶捣鏃跺啀涓嬪彂鍑哄簱浠诲姟
+ if (!resultYi)
+ {
+ //缁勭粐涓嬪彂灏忚溅浠诲姟淇℃伅
+ var task = new TaskDetial
+ {
+ Taskno = taskNo,//浠诲姟鍙�
+ Startport = palletModel.LocatNo,//璧峰浣嶇疆
+ Endport = endLocate,//鐩爣浣嶇疆
+ Pallno = palletModel.PalletNo,//妗跺彿
+ Crtype = "1",//鍙《
+ };
+ string agvMsg = string.Empty;
+ //缁欎笅杞︿笅鍙戜换鍔�
+ logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
+ var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg);
+ if (agvResult)//鎴愬姛
+ {
+ //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
+ logTaskEntry.IsSuccess = 1;
+ logTaskEntry.IsSend = 0;
+ //logTaskEntry.IsCancel = 0;
+ logTaskEntry.BackDate = DateTime.Now;
+ logTaskEntry.Status = "1";//姝ｅ湪鎵ц
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+
+ startLoction.Status = "3";//鍑哄簱涓�
+ Db.Updateable(startLoction).ExecuteCommand();
+
+ endLocateInfo.Status = "2";//鍏ュ簱涓�
+ Db.Updateable(endLocateInfo).ExecuteCommand();
+ }
+ else//澶辫触
+ {
+ logTaskEntry.IsSuccess = 0;
+ logTaskEntry.Information = agvMsg;
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+ }
+ }
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
}
catch (Exception e)
{
+ //鍥炴粴浜嬪姟
+ Db.RollbackTran();
throw new Exception(e.Message);
}
}
@@ -298,7 +405,7 @@
/// <param name="lotNo">鎵规</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <exception cref="Exception"></exception>
- public void jiaoCheHopper(string areaNo, string StartLocate, string plnNo, string plnStatus, decimal weight, string skuNo, string lotNo, int userId)
+ public void jiaoCheHopper(string areaNo, string StartLocate, string plnNo, string plnStatus, decimal weight, string skuNo, string lotNo, string url,int userId)
{
try
{
@@ -306,7 +413,7 @@
if (string.IsNullOrWhiteSpace(areaNo) || string.IsNullOrWhiteSpace(StartLocate) || string.IsNullOrWhiteSpace(plnStatus))
{
- throw new Exception("鍖哄煙/鐩爣浣�/妗剁被鍨嬩笉鑳戒负绌�");
+ throw new Exception("鍖哄煙/璧峰浣�/妗剁被鍨嬩笉鑳戒负绌�");
}
//if (plnStatus == "0" && string.IsNullOrWhiteSpace(standard))
@@ -318,29 +425,24 @@
{
throw new Exception("婊℃《璇烽�夋嫨鐗╂枡涓庢壒娆�");
}
- //鍒ゆ柇鐩爣鍙枡鍌ㄤ綅鐘舵��
- var endLocateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == StartLocate && m.AreaNo == areaNo);
- if (endLocateInfo == null)
- {
- throw new Exception("娌℃湁鏌ヨ鍒扮洰鏍囧偍浣嶄俊鎭�");
- }
- if (endLocateInfo.Flag != "0")
- {
- throw new Exception("鐩爣鍌ㄤ綅鏍囪瘑涓嶆槸姝ｅ父鍙敤鐨�");
- }
- if (endLocateInfo.Status != "0")
- {
- throw new Exception("鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅");
- }
-
#endregion
+ //寮�鍚簨鍔�
+ Db.BeginTran();
- var pln = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == plnNo);
- var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.AreaNo == areaNo && m.LocatNo == StartLocate);
- var skuName = "";
- var packagNo = "";
- if (plnStatus == "2")
+ //妗朵俊鎭�
+ var pln = Db.Queryable<SysPallets>().First(w => w.IsDel == "0" && w.PalletNo == plnNo);
+ if (pln == null)
{
+ throw new Exception("鏈煡璇㈠埌妗朵俊鎭�");
+ }
+
+ //璧峰鍌ㄤ綅淇℃伅
+ var startLoction = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.AreaNo == areaNo && m.LocatNo == StartLocate);
+ var skuName = "";//鐗╂枡鍚嶇О
+ var packagNo = "";
+ if (plnStatus == "2")//婊℃《
+ {
+ //鐗╂枡淇℃伅
var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
if (sku == null)
{
@@ -352,7 +454,17 @@
{
}
+ //鐩爣妤煎眰
+ var layer = startLoction.Layer;
+ var houseStr = layer == 3 ? "3妤间腑闂寸珯" : layer == 4 ? "4妤间腑闂寸珯" : "";
+ //閫氳繃浠撳簱鍚嶇О鏌ヨ浠撳簱淇℃伅
+ var house = Db.Queryable<SysWareHouse>().First(m => m.IsDel == "0" && m.WareHouseName == houseStr);
+ if (house == null)
+ {
+ throw new Exception("娌℃湁鏌ヨ鍒颁粨搴撲俊鎭�");
+ }
+ //妗跺簱瀛樻槑缁�
var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.PalletNo == plnNo);
if (stockDetail == null)
{
@@ -368,7 +480,7 @@
FrozenQty = 0,
InspectQty = 0,
- WareHouseNo = locate.WareHouseNo,
+ WareHouseNo = startLoction.WareHouseNo,
AreaNo = areaNo,
LocatNo = StartLocate,
PalletNo = plnNo,
@@ -394,20 +506,26 @@
Db.Updateable(stockDetail).ExecuteCommand();
}
- //鑾峰彇鍌ㄤ綅鍦板潃
+ //鍒嗛厤鍌ㄤ綅
+ var endLocatInfo = GetLocatModel(house.WareHouseNo, plnStatus, skuNo, pln.Standard);//鐩爣鍌ㄤ綅
+ //娌℃湁鍙敤绌哄偍浣�
+ if (endLocatInfo == null)
+ {
+ throw new Exception("娌℃湁鎵惧埌鍚堥�傜殑鐩爣鍌ㄤ綅");
+ }
var taskNo = new Common().GetMaxNo("TK");
//娣诲姞浠诲姟
- var task = new LogTask
+ var logTaskEntry = new LogTask
{
TaskNo = taskNo,
Sender = "WMS",
Receiver = "WCS",
IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
- StartLocat = "",//璧峰浣嶇疆
- EndLocat = StartLocate,//鐩爣浣嶇疆
- PalletNo = "",//鎵樼洏鐮�
+ StartLocat = StartLocate,//璧峰浣嶇疆
+ EndLocat = endLocatInfo.LocatNo,//鐩爣浣嶇疆
+ PalletNo = plnNo,//鎵樼洏鐮�
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
@@ -417,20 +535,605 @@
CreateTime = DateTime.Now
};
- Db.Insertable(task).ExecuteCommand();
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+
+ //缁勭粐涓嬪彂灏忚溅浠诲姟淇℃伅
+ var task = new TaskDetial
+ {
+ Taskno = taskNo,//浠诲姟鍙�
+ Startport = StartLocate,//璧峰浣嶇疆
+ Endport = endLocatInfo.LocatNo,//鐩爣浣嶇疆
+ Pallno = plnNo,//妗跺彿
+ Crtype = "1",//鍙《
+ };
//璋冪敤AGV鎺ュ彛涓嬪彂浠诲姟
+ string agvMsg = string.Empty;
+ //缁欎笅杞︿笅鍙戜换鍔�
+ logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
+ var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg);
+ if (agvResult)//鎴愬姛
+ {
+ //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
+ logTaskEntry.IsSuccess = 1;
+ logTaskEntry.IsSend = 0;
+ //logTaskEntry.IsCancel = 0;
+ logTaskEntry.BackDate = DateTime.Now;
+ logTaskEntry.Status = "1";//姝ｅ湪鎵ц
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+
+ startLoction.Status = "3";//鍑哄簱涓�
+ Db.Updateable(startLoction).ExecuteCommand();
+
+ endLocatInfo.Status = "2";//鍏ュ簱涓�
+ Db.Updateable(endLocatInfo).ExecuteCommand();
+ }
+ else//澶辫触
+ {
+ logTaskEntry.IsSuccess = 0;
+ logTaskEntry.Information = agvMsg;
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+ }
+
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
+ }
+ catch (Exception e)
+ {
+ //鍥炴粴浜嬪姟
+ Db.RollbackTran();
+ throw new Exception(e.Message);
+ }
+ }
+
+ /// <summary>
+ /// 灏忚溅鍙嶉浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNo"></param>
+ /// <param name="status"></param>
+ /// <param name="comeFrom"></param>
+ /// <param name="userId"></param>
+ /// <exception cref="Exception"></exception>
+ public void RCSFinishTask(string taskNo, string status, string comeFrom, int userId = 0)
+ {
+ try
+ {
+ #region 鏉′欢鍒ゆ柇
+ var resultModel = new ErpModel() { Success = -1, Message = "" };
+ if (string.IsNullOrEmpty(taskNo))
+ {
+ throw new Exception("浠诲姟鍙蜂笉鍙负绌�");
+ }
+ //浠诲姟淇℃伅
+ var taskInfo = Db.Queryable<LogTask>().First(w => w.TaskNo == taskNo);
+ if (taskInfo == null)
+ {
+ throw new Exception($"浠诲姟鍙蜂负:{taskNo}鐨勪换鍔′笉瀛樺湪!");
+ }
+ if (taskInfo.Status != "1" && comeFrom != "WMS")
+ {
+ throw new Exception($"浠诲姟鍙蜂负:{taskNo}鐨勪换鍔＄姸鎬佸紓甯�");
+ }
+ #endregion
+ //寮�鍚簨鍔�
+ Db.BeginTran();
+ var comTime = DateTime.Now;
+
+ if (status == "0")
+ {
+ taskInfo.Status = "3";//寮傚父缁撴潫
+ //淇敼浠诲姟鐘舵��
+ Db.Updateable(taskInfo).ExecuteCommand();
+
+ resultModel.Success = 0;
+ resultModel.Message = "鎴愬姛";
+
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
+
+ return;
+ }
+ //搴撳瓨鏄庣粏
+ var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == taskInfo.PalletNo);
+ if (stockDetail == null)
+ {
+ throw new Exception($"妗跺簱瀛樹俊鎭笉瀛樺湪");
+ }
+ //璧峰鍌ㄤ綅淇℃伅
+ var startLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.StartLocat && w.IsDel == "0");
+ if (startLocatInfo == null)
+ {
+ throw new Exception($"璧峰鍌ㄤ綅淇℃伅涓嶅瓨鍦�");
+ }
+ startLocatInfo.Status = "0";//绌哄偍浣�
+ //淇敼璧峰鍌ㄤ綅鐘舵��
+ Db.Updateable(startLocatInfo).ExecuteCommand();
+
+ //鐩爣鍌ㄤ綅淇℃伅
+ var endLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.EndLocat && w.IsDel == "0");
+ if (endLocatInfo == null)
+ {
+ throw new Exception($"鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�");
+ }
+ endLocatInfo.Status = "1";//鏈夌墿鍝�
+ //淇敼鐩爣鍌ㄤ綅鐘舵��
+ Db.Updateable(endLocatInfo).ExecuteCommand();
+
+ //鐩爣鍌ㄤ綅鎵�灞炲尯鍩�
+ var endAreaInfo = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.WareHouseNo == endLocatInfo.WareHouseNo && w.AreaNo == endLocatInfo.AreaNo);
+ if (endAreaInfo == null)
+ {
+ throw new Exception($"鐩爣鍌ㄤ綅鎵�灞炲尯鍩熶俊鎭笉瀛樺湪");
+ }
+
+ stockDetail.WareHouseNo = endLocatInfo.WareHouseNo;//鎵�灞炰粨搴�
+ stockDetail.RoadwayNo = endLocatInfo.RoadwayNo;//鎵�灞炲贩閬�
+ stockDetail.AreaNo = endLocatInfo.AreaNo;//鎵�灞炲尯鍩�
+ stockDetail.LocatNo = endLocatInfo.LocatNo;//鍌ㄤ綅鍦板潃
+ stockDetail.UpdateTime = DateTime.Now;//鏇存柊鏃堕棿
+ if (endAreaInfo.Type == "0")//鍑�妗跺尯
+ {
+ stockDetail.PalletStatus = "0";
+ stockDetail.Status = "0";//寰呭垎閰�
+ }
+ else if (endAreaInfo.Type == "1")//婊℃《鍖�
+ {
+ stockDetail.PalletStatus = "1";
+ stockDetail.Status = "0";//寰呭垎閰�
+ }
+ else if (endAreaInfo.Type == "2")//鑴忔《鍖�
+ {
+ stockDetail.PalletStatus = "3";
+ stockDetail.LotNo = "";//鎵规
+ stockDetail.SkuNo = "";
+ stockDetail.SkuName = "";
+ stockDetail.Status = "0";//寰呭垎閰�
+ stockDetail.InspectStatus = "0";//寰呮楠�
+ }
+ //淇敼搴撳瓨鏄庣粏
+ Db.Updateable(stockDetail).ExecuteCommand();
+
+ taskInfo.Status = "2";//鎵ц瀹屾垚
+ taskInfo.IsSend = 0;
+ taskInfo.IsCancel = 0;
+ taskInfo.IsFinish = 0;
+ taskInfo.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
+ //淇敼浠诲姟鐘舵��
+ Db.Updateable(taskInfo).ExecuteCommand();
+
+ if (comeFrom == "WMS")
+ {
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskInfo.TaskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佷换鍔″彿涓猴細{taskInfo.TaskNo}鐨勪换鍔�", userId);
+ }
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ //鍥炴粴浜嬪姟
+ Db.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+ }
+ private bool YikuTask(string palletNo, string taskNo, string url)
+ {
+ try
+ {
+ //鍒嗛厤妗剁殑搴撳瓨淇℃伅
+ var palletInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
+ if (palletInfo == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鍒嗛厤妗剁殑搴撳瓨淇℃伅");
+ }
+ //鍒ゆ柇鍒嗛厤鐨勬《鏈夋病鏈夋鍦ㄦ墽琛岀殑浠诲姟锛堢Щ搴撲腑锛�
+ var taskIng = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && (w.Status == "0" || w.Status == "1") && w.PalletNo == palletNo);
+ if (taskIng != null)
+ {
+ throw new Exception("鍒嗛厤鐨勬《鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岃绋嶅悗鍐嶈瘯");
+ }
+ //鍒嗛厤妗剁殑鍌ㄤ綅淇℃伅
+ var locatInfo = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletInfo.LocatNo);
+ if (locatInfo == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鍒嗛厤妗舵墍鍦ㄧ殑鍌ㄤ綅淇℃伅");
+ }
+ string WareHouseNo = locatInfo.WareHouseNo;//鎵�灞炰粨搴撶紪鍙�
+ //鍒ゆ柇璇ュ偍浣嶆槸鍚︽槸鍐呬晶鍌ㄤ綅
+ if (!string.IsNullOrEmpty(locatInfo.AisleOne))
+ {
+ //鍒ゆ柇澶栦晶鍌ㄤ綅鏄惁鏈夋《
+ var palletInfoYi = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == locatInfo.AisleOne);
+ if (palletInfoYi != null)
+ {
+ //鍒ゆ柇瑕佺Щ搴撶殑妗舵槸鍚﹁鍒嗛厤
+ if (palletInfoYi.Status != "0")
+ {
+ throw new Exception("瑕佺Щ搴撶殑妗跺凡琚垎閰嶏紝璇风◢鍚庡啀璇�");
+ }
+ //鍒ゆ柇瑕佺Щ搴撶殑妗舵槸鍚︽湁姝ｅ湪鎵ц鐨勪换鍔�
+ var taskInfo = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && (w.Status == "0" || w.Status == "1") && w.PalletNo == palletInfoYi.PalletNo);
+ if (taskInfo != null)
+ {
+ throw new Exception("瑕佺Щ搴撶殑妗舵湁姝ｅ湪鎵ц鐨勪换鍔★紝璇风◢鍚庡啀璇�");
+ }
+ #region#缁欒绉诲簱鐨勬《鍏堢Щ鍒颁腑杞偍浣�
+ //鎵惧埌涓浆鍌ㄤ綅鎵�鍦ㄥ尯鍩�
+ var transfeArea = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.WareHouseNo == WareHouseNo && w.AreaName.Contains("杞繍鍖�"));
+ if (transfeArea == null)
+ {
+ throw new Exception("鏈壘鍒拌浆杩愬尯鍩�");
+ }
+ //鎵惧埌涓浆鍌ㄤ綅
+ var transferLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == WareHouseNo && w.AreaNo == transfeArea.AreaNo);
+ if (transferLocat == null)
+ {
+ throw new Exception("娌℃湁绌洪棽涓浆鍌ㄤ綅锛岃绋嶅悗鍐嶈瘯");
+ }
+ #endregion
+ //浠诲姟淇℃伅
+ var logTaskEntry = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "RCS",
+ //IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ SendDate = DateTime.Now, //鍙戦�佹椂闂�
+ //BackDate = DateTime.Now, //杩斿洖鏃堕棿
+ StartLocat = palletInfoYi.LocatNo,//璧峰浣嶇疆
+ EndLocat = transferLocat.LocatNo,//鐩爣浣嶇疆
+ PalletNo = palletInfoYi.PalletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ OrderType = "3",//鍗曟嵁绫诲瀷 0 鍏ュ簱 1 鍑哄簱 3绉诲簱
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ NoticeDetailNo = 0,
+ Msg = $"灏嗘《{palletInfoYi.PalletNo}浠巤palletInfoYi.LocatNo}绉诲埌{transferLocat.LocatNo}", //鍏抽敭淇℃伅
+ LotNo = ""//鎵规鍙�
+ };
+
+ //缁勭粐涓嬪彂灏忚溅浠诲姟淇℃伅
+ var task = new TaskDetial
+ {
+ Taskno = taskNo,//浠诲姟鍙�
+ Startport = palletInfoYi.LocatNo,//璧峰浣嶇疆
+ Endport = transferLocat.LocatNo,//鐩爣浣嶇疆
+ Pallno = palletInfoYi.PalletNo,//妗跺彿
+ Crtype = "1",//鍙《
+ WareHouseNo = palletInfoYi.WareHouseNo//杞﹂棿缂栫爜
+ };
+ string agvMsg = string.Empty;
+ //缁欎笅杞︿笅鍙戜换鍔�
+ logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
+ var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg, "70");
+ if (agvResult)//鎴愬姛
+ {
+ //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
+ logTaskEntry.IsSuccess = 1;
+ logTaskEntry.IsSend = 0;
+ //logTaskEntry.IsCancel = 0;
+ logTaskEntry.BackDate = DateTime.Now;
+ logTaskEntry.Status = "1";//姝ｅ湪鎵ц
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+
+ //淇敼绉诲嚭鍌ㄤ綅鐘舵��
+ locatInfo.Status = "5";//绉诲嚭涓�
+ Db.Updateable(locatInfo).ExecuteCommand();
+
+ //淇敼绉诲叆鍌ㄤ綅鐘舵��
+ transferLocat.Status = "4";//绉诲叆涓�
+ Db.Updateable(transferLocat).ExecuteCommand();
+ }
+ else//澶辫触
+ {
+ logTaskEntry.IsSuccess = 0;
+ logTaskEntry.Information = agvMsg;
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+
+ throw new Exception($"缁欏皬杞︿笅鍙戠Щ搴撲换鍔″け璐ワ紝妗跺彿锛歿palletInfoYi.PalletNo}");
+ }
+ }
+ }
+ return true;
}
catch (Exception e)
{
throw new Exception(e.Message);
}
}
-
+ /// <summary>
+ /// 灏忚溅璧板嚭鍌ㄤ綅鍥炰紶浜嬩欢
+ /// </summary>
+ /// <param name="taskNo"></param>
+ /// <param name="url"></param>
+ /// <exception cref="Exception"></exception>
+ public void OutBinAgv(string taskNo,string url)
+ {
+ try
+ {
+ //寮�鍚簨鍔�
+ Db.BeginTran();
+
+ //鏌ユ壘浠诲姟淇℃伅
+ var logTaskInfo = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.Status == "1" && w.TaskNo == taskNo);
+ if (logTaskInfo == null)
+ {
+ throw new Exception("鏈煡璇㈠埌璇ヤ换鍔�");
+ }
+ //璧峰鍌ㄤ綅鍦板潃
+ var startLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == logTaskInfo.StartLocat);
+ if (startLocatInfo == null)
+ {
+ throw new Exception("鏈煡璇㈠埌璧峰鍌ㄤ綅鍦板潃淇℃伅");
+ }
+ startLocatInfo.Status = "0";//绌哄偍浣�
+ //淇敼璧峰鍌ㄤ綅鐘舵�佷负绌哄偍浣�
+ Db.Updateable(startLocatInfo).ExecuteCommand();
+
+ //鍒ゆ柇鏈夋棤瀛愪换鍔�
+ string taskNoZ = logTaskInfo.TaskNo + "-1";
+ var logTaskInfoZ = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.Status == "0" && w.TaskNo == taskNoZ);
+ if (logTaskInfoZ != null)
+ {
+ //瀛愪换鍔¤捣濮嬪偍浣嶄俊鎭�
+ var startLocatInfoZ= Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == logTaskInfoZ.StartLocat);
+ if (startLocatInfoZ == null)
+ {
+ throw new Exception("鏈煡璇㈠埌瀛愪换鍔¤捣濮嬪偍浣嶅湴鍧�淇℃伅");
+ }
+ //瀛愪换鍔＄洰鏍囧偍浣嶄俊鎭�
+ var endLocatInfoZ = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == logTaskInfoZ.EndLocat);
+ if (endLocatInfoZ == null)
+ {
+ throw new Exception("鏈煡璇㈠埌瀛愪换鍔＄洰鏍囧偍浣嶅湴鍧�淇℃伅");
+ }
+
+ //缁勭粐涓嬪彂灏忚溅浠诲姟淇℃伅
+ var task = new TaskDetial
+ {
+ Taskno = taskNo,//浠诲姟鍙�
+ Startport = logTaskInfoZ.StartLocat,//璧峰浣嶇疆
+ Endport = logTaskInfoZ.EndLocat,//鐩爣浣嶇疆
+ Pallno = logTaskInfoZ.PalletNo,//妗跺彿
+ Crtype = "1",//鍙《
+ };
+ string agvMsg = string.Empty;
+ //缁欎笅杞︿笅鍙戜换鍔�
+ logTaskInfoZ.SendDate = DateTime.Now;//鍙戦�佹椂闂�
+ var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg, "70");
+ if (agvResult)//鎴愬姛
+ {
+ //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
+ logTaskInfoZ.IsSuccess = 1;
+ logTaskInfoZ.IsSend = 0;
+ //logTaskEntry.IsCancel = 0;
+ logTaskInfoZ.BackDate = DateTime.Now;
+ logTaskInfoZ.Status = "1";//姝ｅ湪鎵ц
+ Db.Insertable(logTaskInfoZ).ExecuteCommand();
+
+ //淇敼绉诲嚭鍌ㄤ綅鐘舵��
+ startLocatInfoZ.Status = "5";//绉诲嚭涓�
+ Db.Updateable(startLocatInfoZ).ExecuteCommand();
+
+ //淇敼绉诲叆鍌ㄤ綅鐘舵��
+ endLocatInfoZ.Status = "4";//绉诲叆涓�
+ Db.Updateable(endLocatInfoZ).ExecuteCommand();
+ }
+ else//澶辫触
+ {
+ logTaskInfoZ.IsSuccess = 0;
+ logTaskInfoZ.Information = agvMsg;
+ Db.Insertable(logTaskInfoZ).ExecuteCommand();
+
+ throw new Exception($"缁欏皬杞︿笅鍙戠Щ搴撲换鍔″け璐ワ紝妗跺彿锛歿logTaskInfoZ.PalletNo}");
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ //鍥炴粴浜嬪姟
+ Db.RollbackTran();
+ throw new Exception(e.Message);
+ }
+ }
+
+ /// <summary>
+ /// 瀹氭椂灏嗕腑杞偍浣嶄笂鐨勬《绉昏蛋
+ /// </summary>
+ /// <param name="url"></param>
+ /// <exception cref="Exception"></exception>
+ public void TransferBackTimer(string url)
+ {
+ try
+ {
+ //寮�鍚簨鍔�
+ Db.BeginTran();
+
+ //涓棿绔欎粨搴�
+ var transferWareHouseList = new List<string>() { "M01", "M16" };
+ foreach (var itemHouseNo in transferWareHouseList)
+ {
+ //鎵惧埌涓浆鍌ㄤ綅鎵�鍦ㄥ尯鍩�
+ var transfeArea = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.WareHouseNo == itemHouseNo && w.AreaName.Contains("杞繍鍖�"));
+ if (transfeArea == null)
+ {
+ throw new Exception("鏈壘鍒拌浆杩愬尯鍩�");
+ }
+ //鎵惧埌涓浆鍌ㄤ綅
+ var transferLocatList = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.WareHouseNo == itemHouseNo && w.AreaNo == transfeArea.AreaNo).ToList();
+ foreach (var locatModel in transferLocatList)
+ {
+ //鍌ㄤ綅淇℃伅
+ if (locatModel.Status != "1")
+ {
+ continue;
+ }
+ //鍌ㄤ綅涓婂簱瀛樹俊鎭�
+ var detailInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == locatModel.LocatNo);
+ if (detailInfo == null)
+ {
+ continue;
+ }
+ //鍒嗛厤鍌ㄤ綅
+ var endLocatInfo = GetLocatModel(itemHouseNo,detailInfo.PalletStatus,detailInfo.SkuNo,detailInfo.Standard);//鐩爣鍌ㄤ綅
+ //娌℃湁鍙敤绌哄偍浣�
+ if (endLocatInfo == null)
+ {
+ continue;
+ }
+ var taskNo = new Common().GetMaxNo("TK");
+ //浠诲姟淇℃伅
+ var logTaskEntry = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "RCS",
+ //IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ SendDate = DateTime.Now, //鍙戦�佹椂闂�
+ //BackDate = DateTime.Now, //杩斿洖鏃堕棿
+ StartLocat = detailInfo.LocatNo,//璧峰浣嶇疆
+ EndLocat = endLocatInfo.LocatNo,//鐩爣浣嶇疆
+ PalletNo = detailInfo.PalletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ OrderType = "3",//鍗曟嵁绫诲瀷 0 鍏ュ簱 1 鍑哄簱 3绉诲簱
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ NoticeDetailNo = 0,
+ Msg = $"灏嗘《{detailInfo.PalletNo}浠巤detailInfo.LocatNo}绉诲埌{endLocatInfo.LocatNo}", //鍏抽敭淇℃伅
+ LotNo = ""//鎵规鍙�
+ };
+
+ //缁勭粐涓嬪彂灏忚溅浠诲姟淇℃伅
+ var task = new TaskDetial
+ {
+ Taskno = taskNo,//浠诲姟鍙�
+ Startport = detailInfo.LocatNo,//璧峰浣嶇疆
+ Endport = endLocatInfo.LocatNo,//鐩爣浣嶇疆
+ Pallno = detailInfo.PalletNo,//妗跺彿
+ Crtype = "2"//鍙《
+ };
+ string agvMsg = string.Empty;
+ //缁欎笅杞︿笅鍙戜换鍔�
+ logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
+ var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg);
+ if (agvResult)//鎴愬姛
+ {
+ //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
+ logTaskEntry.IsSuccess = 1;
+ logTaskEntry.IsSend = 0;
+ //logTaskEntry.IsCancel = 0;
+ logTaskEntry.BackDate = DateTime.Now;
+ logTaskEntry.Status = "1";//姝ｅ湪鎵ц
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+
+ //淇敼绉诲嚭鍌ㄤ綅鐘舵��
+ locatModel.Status = "5";//绉诲嚭涓�
+ Db.Updateable(locatModel).ExecuteCommand();
+
+ //淇敼绉诲叆鍌ㄤ綅鐘舵��
+ endLocatInfo.Status = "4";//绉诲叆涓�
+ Db.Updateable(endLocatInfo).ExecuteCommand();
+ }
+ else//澶辫触
+ {
+ logTaskEntry.IsSuccess = 0;
+ logTaskEntry.Information = agvMsg;
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+
+ throw new Exception($"缁欏皬杞︿笅鍙戠Щ搴撲换鍔″け璐ワ紝妗跺彿锛歿detailInfo.PalletNo}");
+ }
+
+ }
+ }
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
+ }
+ catch (Exception e)
+ {
+ //鍥炴粴浜嬪姟
+ Db.RollbackTran();
+ throw new Exception(e.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鍒嗛厤鍌ㄤ綅
+ /// </summary>
+ /// <param name="houseNo">浠撳簱缂栧彿</param>
+ /// <param name="palletStatus">妗剁姸鎬�</param>
+ /// <param name="skuNo">鐗╂枡缂栫爜</param>
+ /// <param name="standard">妗惰鏍�</param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ private SysStorageLocat GetLocatModel(string houseNo, string palletStatus,string skuNo="",string standard="")
+ {
+ try
+ {
+ var endLocatInfo = new SysStorageLocat();//鐩爣鍌ㄤ綅
+ string areaNo = string.Empty;
+ switch (palletStatus)
+ {
+ case "0"://鍑�妗�
+ //鏌ュ埌鍒板噣妗跺尯鍩熺紪鍙�
+ areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.Type == "0").Select(s => s.AreaNo).First();
+ //鍒嗛厤鍌ㄤ綅
+ endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
+ && w.WareHouseNo == houseNo && w.AreaNo == areaNo)
+ .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
+ break;
+ case "2"://婊℃《
+ //鏌ュ埌鍒版弧妗跺尯鍩熺紪鍙�
+ areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.Type == "1").Select(s => s.AreaNo).First();
+ //鍒嗛厤鍌ㄤ綅
+ //鍏堟煡鍒板悓鐗╂枡鐨勭粍
+ string sql = $@"select Row from SysStorageLocat where WareHouseNo='{houseNo}' and AreaNo='{areaNo}' and LocatNo in(
+ select LocatNo from DataStockDetail where SkuNo='{skuNo}' and Standard='{standard}' and WareHouseNo='{houseNo}' and AreaNo='{areaNo}'
+ ) group by Row";
+
+ List<int> RowList = Db.Ado.SqlQuery<int>(sql).ToList();
+ foreach (var rowItem in RowList)
+ {
+ endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
+ && w.WareHouseNo == houseNo && w.AreaNo == areaNo && w.Row == rowItem)
+ .OrderByDescending(o => o.Column).First();
+
+ if (endLocatInfo != null)
+ {
+ break;
+ }
+ }
+ //娌℃湁鎵惧埌鐩稿悓鐗╂枡鍚岀粍鐨勭┖鍌ㄤ綅
+ if (endLocatInfo == null)
+ {
+ endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
+ && w.WareHouseNo == houseNo && w.AreaNo == areaNo)
+ .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
+ }
+
+ break;
+ case "3"://鑴忔《
+ //鏌ュ埌鍒拌剰妗跺尯鍩熺紪鍙�
+ areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.Type == "2").Select(s => s.AreaNo).First();
+ //鍒嗛厤鍌ㄤ綅
+ endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
+ && w.WareHouseNo == houseNo && w.AreaNo == areaNo)
+ .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
-
+ break;
+ }
+ return endLocatInfo;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
}
}
--
Gitblit v1.8.0