From 5321419f5fddb4e877fe90ccd90ebdc1a115af64 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 18 七月 2025 17:29:26 +0800
Subject: [PATCH] 出库修改
---
wms/LocationHelper.cs | 251 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 236 insertions(+), 15 deletions(-)
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 9c7c0df..8e4ee1b 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -4,7 +4,9 @@
using HH.WCS.ZhongCeJinTan.wms;
using Microsoft.Owin;
using Newtonsoft.Json;
+using Org.BouncyCastle.Utilities;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
@@ -113,9 +115,22 @@
List<string> result = new List<string>();
foreach (var item in ConnectionList)
{
- result.Add(item.S_CODE);
+ var ConnectionY = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y" && s.CONNEC_ROADWAY== item.CONNEC_ROADWAY).First();
+ if (ConnectionY==null)
+ {
+ result.Add(item.S_CODE);
+ }
+
}
return result;
+ }
+
+
+ internal static Location GetConnectionByEnd(string S_AREA_CODE,int rodway)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ return db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y" &&s.CONNEC_ROADWAY==rodway).First();
+
}
/// <summary>
@@ -138,6 +153,17 @@
result.Add(re);
}
return result.OrderBy(a => a.taskCount).ToList();
+ }
+
+ /// <summary>
+ /// 杩斿洖鍑哄簱agv浠诲姟
+ /// </summary>
+ internal static WMSTask GetConnectionTask(string jbLoc,string type)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+
+ return db.Queryable<WMSTask>().Where(a => ( a.S_START_LOC.Contains(jbLoc)&& a.S_SCHEDULE_TYPE.Contains(type) && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� && a.S_B_STATE != "鏈墽琛�)).OrderBy(b=>b.T_CREATE).First();
+
}
/// <summary>
@@ -282,7 +308,7 @@
/// </summary>
/// <param name="locations"></param>
/// <returns></returns>
- internal static Location FindBalanceEndcolByLocList(List<Location> locations, string endArea, string rodway = "")
+ internal static Location FindBalanceEndcolByLocList(List<Location> locations, string endArea, string rodway = "",string CONNECTION = "",string taskNo="")
{
try
{
@@ -293,6 +319,41 @@
//浣滀笟娴佺▼鐨勫贩閬� var xd = new List<string>();
+
+
+
+ //鑾峰彇string鎺ラ┏浣嶉泦鍚�+ var connectionList = LocationHelper.GetConnectionList(CONNECTION);
+
+ //涓嶅彲鐢ㄦ帴椹充綅闆嗗悎
+ var flaseConnectionList = LocationHelper.GetConnectionListByst(connectionList);
+
+ List<Location> jblist = new List<Location>();
+
+ //璇㈤棶绔嬪簱鍙敤鎺ラ┏浣�+ var usableConnectionList = WcsTask.WcsPositionAvailable(taskNo,connectionList);
+ if (usableConnectionList != null && usableConnectionList.code == "0")
+ {
+
+ var balanceConnectionList = LocationHelper.GetConnectionListByst(usableConnectionList.available);
+
+
+ List<Location> difference = flaseConnectionList
+ .Where(loc1 => !balanceConnectionList.Any(loc2 => loc2.S_CODE == loc1.S_CODE))
+ .ToList();
+
+ jblist = difference;
+
+
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂涓嶅彲鐢ㄦ帴椹充綅" + JsonConvert.SerializeObject(jblist), "Mes浠诲姟涓嬪彂");
+ }
+ else
+ {
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟{taskNo}涓嬪彂澶辫触锛屾帴椹充綅杩斿洖澶辫触", "Mes浠诲姟涓嬪彂");
+ throw new Exception($"{taskNo}涓嬪彂澶辫触,鎺ラ┏浣嶈繑鍥炲け璐�);
+ }
+
+
List<RoadWayEnable> rowdwa = null;
@@ -316,6 +377,7 @@
var flag = false;
var flag1 = false;
+ var flag2 = false;
foreach (var item in rowdwa)
{
@@ -337,7 +399,17 @@
}
}
- if (flag1 || flag)
+
+ foreach (var item2 in jblist)
+ {
+ if (rowList.Count(a => a.N_ROADWAY == item2.CONNEC_ROADWAY) > 0)
+ {
+ flag2 = true;
+ break;
+ }
+ }
+
+ if (flag1 || flag || flag2)
{
locations.RemoveAll(a => a.N_ROW == rows[i]);
}
@@ -353,6 +425,143 @@
foreach (var item in balanceLocList)
{
if (item.S_LOCK_STATE=="鏃� && item.N_CURRENT_NUM==0)
+ {
+ end = item;
+ break;
+ }
+ }
+ return end;
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+
+ }
+
+
+ /// <summary>
+ /// 鎵剧粓鐐瑰贩閬撳彲鐢ㄧ┖璐т綅 宸烽亾鍧囪 鐗╂枡鍧囪
+ /// </summary>
+ /// <param name="locations"></param>
+ /// <returns></returns>
+ internal static Location FindBalanceEndcolByLocListItem(List<Location> locations, string endArea, string rodway = "", string CONNECTION = "", string taskNo = "",string itemCode="")
+ {
+ try
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ Location end = null;
+ //鏍规嵁缁堢偣璐т綅鎵剧┖闂茶揣浣�+ var rows = locations.Select(a => a.N_ROW).Distinct().ToList();
+
+ //浣滀笟娴佺▼鐨勫贩閬�+ var xd = new List<string>();
+
+
+
+ //鑾峰彇string鎺ラ┏浣嶉泦鍚�+ var connectionList = LocationHelper.GetConnectionList(CONNECTION);
+
+ //涓嶅彲鐢ㄦ帴椹充綅闆嗗悎
+ var flaseConnectionList = LocationHelper.GetConnectionListByst(connectionList);
+
+ List<Location> jblist = new List<Location>();
+
+ //璇㈤棶绔嬪簱鍙敤鎺ラ┏浣�+ var usableConnectionList = WcsTask.WcsPositionAvailable(taskNo, connectionList);
+ if (usableConnectionList != null && usableConnectionList.code == "0")
+ {
+ var balanceConnectionList = LocationHelper.GetConnectionListByst(usableConnectionList.available);
+
+
+ List<Location> difference = flaseConnectionList
+ .Where(loc1 => !balanceConnectionList.Any(loc2 => loc2.S_CODE == loc1.S_CODE))
+ .ToList();
+
+ jblist = difference;
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂涓嶅彲鐢ㄦ帴椹充綅" + JsonConvert.SerializeObject(jblist), "Mes浠诲姟涓嬪彂");
+ }
+ else
+ {
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟{taskNo}涓嬪彂澶辫触锛屾帴椹充綅杩斿洖澶辫触", "Mes浠诲姟涓嬪彂");
+ throw new Exception($"{taskNo}涓嬪彂澶辫触,鎺ラ┏浣嶈繑鍥炲け璐�);
+ }
+
+
+
+ List<RoadWayEnable> rowdwa = null;
+
+ if (!string.IsNullOrEmpty(rodway))
+ {
+ xd = rodway.Split('-').ToList();
+ rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == endArea && x.status == "0" && xd.Contains(x.roadWay)).ToList();
+ }
+ else
+ {
+ //鏌ユ壘鍙敤宸烽亾
+ rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == endArea && x.status == "0").ToList();
+ }
+
+
+
+
+ for (int i = 0; i < rows.Count; i++)
+ {
+ var rowList = locations.Where(r => r.N_ROW == rows[i]).ToList();
+
+ var flag = false;
+ var flag1 = false;
+ var flag2 = false;
+
+ foreach (var item in rowdwa)
+ {
+ if (rowList.Count(a => a.N_ROADWAY.ToString() == item.roadWay) > 0)
+ {
+ flag = true;
+ break;
+ }
+
+
+ }
+
+ foreach (var item1 in xd)
+ {
+ if (rowList.Count(a => a.N_ROADWAY.ToString() != item1) > 0)
+ {
+ flag1 = true;
+ break;
+ }
+ }
+
+
+ foreach (var item2 in jblist)
+ {
+ if (rowList.Count(a => a.N_ROADWAY == item2.CONNEC_ROADWAY) > 0)
+ {
+ flag2 = true;
+ break;
+ }
+ }
+
+ if (flag1 || flag || flag2)
+ {
+ locations.RemoveAll(a => a.N_ROW == rows[i]);
+ }
+
+ if (rowList.Count(a => a.N_CURRENT_NUM == 0) == 0)
+ {
+ locations.RemoveAll(a => a.N_ROW == rows[i]);
+ }
+ }
+
+ var balanceLocList = RoadWayBalance(locations);
+
+ balanceLocList = LocationHelper.RoadWayBalance1ByItem(balanceLocList, itemCode);
+
+ foreach (var item in balanceLocList)
+ {
+ if (item.S_LOCK_STATE == "鏃�)
{
end = item;
break;
@@ -473,7 +682,7 @@
foreach (var item in v)
{
//鍙栧緱宸烽亾鍒楄〃涓彲鐢ㄨ揣浣嶆渶澶氱殑宸烽亾 骞惰幏鍙栧贩閬撲腑鎵�湁璐т綅
- location_roadray = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).ToList();
+ location_roadray = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).OrderBy(b => b.N_ROW).OrderBy(b=>b.N_COL).OrderBy(b => b.N_LAYER).ToList();
if (location_roadray != null && location_roadray.Count > 0)
{
@@ -505,7 +714,7 @@
foreach (var item in v)
{
//鍙栧緱宸烽亾鍒楄〃涓彲鐢ㄨ揣浣嶆渶澶氱殑宸烽亾 骞惰幏鍙栧贩閬撲腑鎵�湁璐т綅
- var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).OrderBy(b => b.N_ROW).OrderBy(b=>b.N_COL).ToList();
+ var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).OrderBy(b => b.N_ROW).OrderBy(b=>b.N_COL).OrderBy(b => b.N_LAYER).ToList();
foreach (var item1 in loclist)
{
@@ -540,7 +749,7 @@
{
var ConnectionList = 0;
- var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.N_ROADWAY && o.N_CURRENT_NUM>0).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).ToList();
+ var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.N_ROADWAY && o.N_CURRENT_NUM>0).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).OrderBy(b => b.N_LAYER).ToList();
foreach (var item1 in loclist)
{
var tp = db.Queryable<LocCntrRel>().Where(s => s.S_LOC_CODE == item1.S_CODE).First();
@@ -566,13 +775,15 @@
result.Add(re);
}
-
-
result = result.OrderBy(a=>a.taskCount).ToList();
foreach (var item in result)
{
- location_roadray.Add(item.loc);
+ var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.loc.N_ROADWAY && o.N_CURRENT_NUM==0 ).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).OrderBy(b => b.N_LAYER).ToList();
+ foreach (var item1 in loclist)
+ {
+ location_roadray.Add(item1);
+ }
}
@@ -788,10 +999,8 @@
var db = new SqlHelper<object>().GetInstance();
try
{
-
- var connectionList = LocationHelper.GetConnectionList(CONNECTION);
-
+ var connectionList = LocationHelper.GetConnectionListByN(CONNECTION);
var balanceConnectionList = LocationHelper.GetConnectionListByst(connectionList);
@@ -800,7 +1009,7 @@
//鏌ユ壘涓嶅彲鐢ㄥ贩閬� var rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == startArea && x.status == "0").ToList();
-
+ LogHelper.Info($"绌烘墭鑷姩鍑哄簱鎺掗櫎涓嶅彲鐢ㄨ揣浣嶅紑濮嬶細{locations.Count}", "绌烘墭鍑哄簱");
for (int i = 0; i < rowsStart.Count; i++)
{
var rowList = locations.Where(r => r.N_ROW == rowsStart[i]).ToList().OrderByDescending(a => a.N_COL);
@@ -821,7 +1030,7 @@
foreach (var item2 in balanceConnectionList)
{
- if (rowList.Count(a => a.N_ROADWAY != item2.CONNEC_ROADWAY) > 0)
+ if (rowList.Count(a => a.N_ROADWAY == item2.CONNEC_ROADWAY) > 0)
{
flag2 = true;
break;
@@ -831,7 +1040,7 @@
if (flag || flag2)
{
- continue;
+ locations.RemoveAll(a => a.N_ROW == rowsStart[i]);
}
//褰撳墠鎺掓湁閿佸苟涓旀病鏈夋弧璐т綅锛屾帓闄�@@ -840,6 +1049,8 @@
locations.RemoveAll(a => a.N_ROW == rowsStart[i]);
}
}
+ LogHelper.Info($"绌烘墭鑷姩鍑哄簱鎺掗櫎涓嶅彲鐢ㄨ揣浣嶇粨鏉燂細{locations.Count}", "绌烘墭鍑哄簱");
+
foreach (var item in locations)
{
if (item.N_CURRENT_NUM == 0)
@@ -847,11 +1058,13 @@
continue;
}
var tp = db.Queryable<LocCntrRel>().Where(s => s.S_LOC_CODE == item.S_CODE).First();
+ LogHelper.Info($"绌烘墭鑷姩鍑哄簱itemCode:{item.S_CODE},itemLock:{item.S_LOCK_STATE} ,tp淇℃伅" + JsonConvert.SerializeObject(tp), "绌烘墭鍑哄簱");
if (tp != null && item.S_LOCK_STATE == "鏃�)
{
var tp1 = db.Queryable<Container>().Where(s => s.S_CODE == tp.S_CNTR_CODE).First();
+ LogHelper.Info($"绌烘墭鑷姩鍑哄簱tp1淇℃伅"+JsonConvert.SerializeObject(tp1), "绌烘墭鍑哄簱");
if (tp1 != null && tp1.N_DETAIL_COUNT==0)
{
start = item;
@@ -1053,6 +1266,9 @@
var balanceConnectionList = LocationHelper.GetConnectionListByst(connectionList);
+
+
+
LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟鎺掗櫎涓嶅彲鐢ㄥ贩閬撳紑濮�, "Mes浠诲姟涓嬪彂");
//浣滀笟娴佺▼鐨勫贩閬�@@ -1155,6 +1371,11 @@
}
}
+
+ //var queryable = db.Queryable<Location>().LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
+ // .LeftJoin<CntrItemRel>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
+ // .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == endArea);
+
LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣鍚堟牸鐗╂枡鏁伴噺{startList.Count}", "Mes浠诲姟涓嬪彂");
var startItem = startList.OrderBy(a => a.PRODUCTIONDATE).FirstOrDefault();
--
Gitblit v1.9.1