From 680743106a8f1f540a4417afdf1947039c52f2f1 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期六, 21 六月 2025 16:17:29 +0800
Subject: [PATCH] 清溪。
---
HH.WCS.QingXiNongfu/原物料方法概述.txt | 48 ++++++++++++
HH.WCS.QingXiNongfu/wms/TaskHelper.cs | 2
HH.WCS.QingXiNongfu/HH.WCS.QingXigongchang.csproj | 1
HH.WCS.QingXiNongfu/core/Monitor.cs | 151 +++++++++++++++++++++++++++++++------
HH.WCS.QingXiNongfu/wms/WCSModel.cs | 16 +++
5 files changed, 190 insertions(+), 28 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/HH.WCS.QingXigongchang.csproj b/HH.WCS.QingXiNongfu/HH.WCS.QingXigongchang.csproj
index ff9f885..1c11713 100644
--- a/HH.WCS.QingXiNongfu/HH.WCS.QingXigongchang.csproj
+++ b/HH.WCS.QingXiNongfu/HH.WCS.QingXigongchang.csproj
@@ -170,6 +170,7 @@
<Compile Include="wms\TaskHelper.cs" />
</ItemGroup>
<ItemGroup>
+ <Content Include="鍘熺墿鏂欐柟娉曟杩�txt" />
<None Include="App.config" />
<None Include="packages.config" />
<Content Include="Static\css\app.d545ec97.css">
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 7a90c6f..d7867b5 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -8,6 +8,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using System.Web.UI.WebControls.WebParts;
namespace HH.WCS.QingXigongchang.core
{
@@ -1308,7 +1309,7 @@
{
try
{
- var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+ var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
if (!yuworders.Any())
{
YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
@@ -1316,7 +1317,7 @@
else
{
LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�");
- // 鏍囩鍑哄簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈�+ // 鏍囩鍑哄簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈� YwlBQ_CreWJOutOrder();
}
@@ -1335,7 +1336,7 @@
try
{
string pline = "T2鎻愬崌鏈�鏍囩";
- var Syuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+ var Syuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
//yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == plc.deviceName && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
@@ -1496,7 +1497,7 @@
//YwlPETKOutOrder("YWLTKMKQ", "", "PE鍙夎繍");// PE灏忓嚭搴� {
LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛�);
- var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+ var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
if (!yuworders.Any())
{
LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛佹病鏈夊嚭搴撳崟銆�);
@@ -2179,6 +2180,7 @@
//LogHelper.Info($"{plc.deviceName}-鏍囩{tagLoc.S_LOC_CODE}//{DeviceProcess.doorStatus[ploc]?.info}-----{(!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")}");
if (tagLoc != null)
{
+ // 杩欓噷閮芥槸1灞傜殑锛屾墍浠ュ繀璧� current_num =1
if (tagLoc.N_LAYER == 1 || tagLoc.N_CURRENT_NUM == 1)
{
// 鐩存帴鍑烘彁鍗囨満浣�@@ -2610,7 +2612,7 @@
}
///绗竴娈碉細鍑哄簱 -鍒版媶鍨涙垨鑰�鎺ラ┏銆�- var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+ var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
//foreach (var order in yuworders)
retuse:
@@ -3556,7 +3558,10 @@
public string area { get; set; }
- public string Row { get; set; }
+ /// <summary>
+ /// 鎺�+ /// </summary>
+ public int Row { get; set; }
}
/// <summary>
@@ -3564,7 +3569,60 @@
/// </summary>
public static void AutoRun13TSJ()
{
- var list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
+
+ Action<YWLWorkOrder> _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ = (od) =>
+ {
+ LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瀵瑰簲宸ュ崟鐨剓od.S_ROW} 鐗╂枡鏁伴噺涓嶈冻銆傝Е鍙戣浆杩愩�");
+ // 鍏堢湅鏄惁鏈夊埌璇ュ簱鍖虹殑杞繍浠诲姟銆�
+ var zxs = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц" && X.S_END_AREA == od.S_ROW);
+ //1.鏌ョ湅鐗╂枡鏄惁鍖归厤銆�+ var itemTRUN = zxs.Any(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME);
+ if (itemTRUN)
+ { //鏈夊埌璇ュ簱鍖虹殑 鐗╂枡杞繍浠诲姟浜嗐� 涓嶉渶瑕佺户缁簡 銆�+
+ LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}宸茬粡瀛樺湪杞繍浜嗘棤闇�Е鍙戣浆杩愩�");
+ return;
+ }
+ //浜哄伐杞繍娌℃寚瀹氱墿鏂欙紝鎴戜細鑷姩鍐欏洖杞繍鍗�鐗╂枡鏁版嵁銆�+
+ //鎵綜D 鍖�鍝噷鏈夎繖涓墿鏂欍�
+ Dictitems TrunStart = null;
+ foreach (var area in CDlist)
+ {
+ if (dsi.TryGetValue(area, out var dictitems1))
+ {
+ var arearowsloc = LocationHelper.GetAreaNormalLocList(area);
+ foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME))
+ {
+ if (arearowsloc.Exists(x => x.N_ROW == d.Row))
+ {
+ TrunStart = d;
+ break;
+ }
+ }
+ }
+ }
+
+ LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瑙﹀彂杞繍銆傝浆杩愭潵婧愭槸{JsonConvert.SerializeObject(TrunStart)}");
+ if (TrunStart != null)
+ WCSHelper.Do(db =>
+ {
+ db.Insertable(new YWLZXtake
+ {
+ S_START_AREA = TrunStart.area,
+ N_START_ROW = TrunStart.Row,
+ S_END_AREA = od.S_ROW,
+ S_ZX_STATE = "鎵ц",
+ S_ITEM_CODE = od.SQL_ItemCode,
+ S_ITEM_NAME = od.SQL_ItemName,
+ S_CJ_NAME = od.S_CJ_NAME,
+ S_ZZ_AREA = (od.S_ROW == "YWLAQWJ" ? "YWLWJJB" : od.S_ROW)
+ }).ExecuteCommand();
+ });
+ };
+
+ //var TaskSiggg = Settings.GetTimeStamp();
+ //var list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
//var WorkOrder = new List<YWLWorkOrder>();
foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
{
@@ -3619,13 +3677,17 @@
foreach (var od in orkOrd.OrderBy(x => x.TagOverTime).ThenBy(x => x.OutNum))
//foreach (var od in od2.ToList())
{
- var l2 = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
+ var l2 = new List<string>() { "YWLAQWJ", "YWLBQWJ" };//, "YWLCQSX", "YWLDQWJ" };
l2.Remove(od.S_ROW);
- var odsr = new List<string> { od.S_ROW }.Concat(l2).Distinct().ToList();
+ l2.Remove(od.TagOver);
+ var odsr = new List<string> { od.TagOver, od.S_ROW }.Concat(l2).Distinct().ToList();
+
///姹囨�浠撳簱閲屾渶澶у眰鏄嚑灞傘�
Dictitems Lart = null;
foreach (var area in odsr)//od.S_ROW.Split('$'))
{
+ if (string.IsNullOrEmpty(area)) continue;
+
if (dsi.TryGetValue(area, out var dictitems1))
{
foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME))
@@ -3638,13 +3700,14 @@
Lart = d;
}
}
-
}
}
-
+ //绛変笅瑕佹娴嬶紝濡傛灉娌℃湁鍙敤鎺掞紝鎴栬�AB搴撳尯鍐呯墿鏂欐暟<5 灏辫浠嶤D 寮�杞繍銆�+ var autoTurn = false;
LogHelper.Info($"AutoRun13TSJ 绛涢�鐗╂枡 搴撳尯鎺掓暟鎹� {od.SQL_PLineNo} >>{od.OutNum}> {JsonConvert.SerializeObject(Lart)}");
// 闇�鏁伴噺 >= 浠撳簱鏈�ぇ鏁伴噺銆�灏卞紑濮嬪嚭搴撱�
if (Lart != null)
+ {
if (od.OutNum >= Lart?.ItemLayer)
{
var v = new List<string>() { Lart.area };
@@ -3661,15 +3724,14 @@
_clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
//鏉垮瀷鐩稿悓
var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
- LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
+ LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
- LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
+ LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
if (_clcntitem != null)
{
- LogHelper.Info("鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName + " od.S_CJ_NAME:" + od.S_CJ_NAME);
+ LogHelper.Info("AutoRun13TSJ" + "鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName + " od.S_CJ_NAME:" + od.S_CJ_NAME + "缁撴灉:" + (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME));
if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME)
{
-
StartBit = rl;
break;
}
@@ -3680,18 +3742,40 @@
}
if (StartBit == null)
{
- LogHelper.Info($"{od.SQL_PLineNo} 鍑哄簱 {Lart.area}鍖哄煙娌℃湁鐗╂枡鍙敤璧风偣");
+ autoTurn = true;
+ LogHelper.Info("AutoRun13TSJ" + $"{od.SQL_PLineNo} 鍑哄簱 {Lart.area}鍖哄煙娌℃湁鐗╂枡鍙敤璧风偣");
continue;
+ }
+ else
+ {
+ //妫�祴鎸囧畾搴撳尯鐨勭墿鏂欐帓鎬绘暟閲�+ if (dsi.TryGetValue(od.S_ROW, out var dictitems1))
+ {
+ var rows = dictitems1.Select(x => x.Row).Distinct();
+ var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW && rows.Contains(x.N_ROW));
+ var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "鏃�).Sum(x => x.N_CURRENT_NUM);
+ LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 鍑哄簱浣欓噺鍒ゆ柇鏄惁闇�杞繍銆�{count}< 5");
+ if (count < 5)
+ {
+ autoTurn = true;
+ _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
+ }
+ }
}
Location Endbit = null;
var loc = LocationHelper.GetLoc(PLC.location[0]);
- if (loc?.N_CURRENT_NUM == 0 && StartBit.N_CURRENT_NUM == 1 && DeviceProcess.doorStatus.ContainsKey(PLC.location[0]))
+ if (StartBit.N_CURRENT_NUM == 1)
{
- if (DeviceProcess.doorStatus[PLC.location[0]].info == "1")
+ if (loc?.N_CURRENT_NUM == 0 && DeviceProcess.doorStatus.ContainsKey(PLC.location[0]))
{
- Endbit = LocationHelper.GetLoc(PLC.location[0]);
+ if (DeviceProcess.doorStatus[PLC.location[0]].info == "1")
+ {
+ Endbit = LocationHelper.GetLoc(PLC.location[0]);
+ }
}
+ if (Endbit == null)
+ break;
}
else
{
@@ -3702,7 +3786,7 @@
{
var crs = _clrel.Select(x => x.S_CNTR_CODE).ToList();
var jbbit = "";
- if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
+ if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ" || Endbit.S_AREA_CODE == "YWLDQWJ" || Endbit.S_AREA_CODE == "YWLCQSX")
{
var locs1 = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == "YWLWJJB" && x.S_LOCK_STATE != "鎶ュ簾" && x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0).ToList();
if (locs1.Count() > 0)
@@ -3717,7 +3801,8 @@
var b = false;
if (!string.IsNullOrEmpty(jbbit))
b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, jbbit, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri, "", Endbit.S_LOC_CODE);
- else b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, Endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri);
+ else
+ b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, Endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri);
if (b)
{
var r = new RowLock { S_LOCK_SRC = od.SQL_ItemCode, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
@@ -3743,7 +3828,8 @@
//}
//else db.Insertable(r).ExecuteCommand();
od.TagOverTime = DateTime.Now;
- db.Updateable(od).UpdateColumns(it => new { it.TagOverTime }).ExecuteCommand();
+ od.TagOver = StartBit.S_AREA_CODE;
+ db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();
//break;
}
}
@@ -3753,6 +3839,11 @@
continue;
}
}
+ }
+ else
+ {
+ _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
+ }
}
}
}
@@ -3804,14 +3895,14 @@
{
if (dsi.TryGetValue(area, out dictitems))
{
- var ill = dictitems.Find(x => x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME && _clcntitem.S_CJ_NAME == x.S_CJ_NAME);
+ var ill = dictitems.Find(x => x.Row == rl.N_ROW && x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME && _clcntitem.S_CJ_NAME == x.S_CJ_NAME);
if (ill != null)
{
if (rl.N_CURRENT_NUM > ill.ItemLayer)
{
ill.ItemLayer = rl.N_CURRENT_NUM;
ill.area = area;
- ill.Row = $"{rl.S_LOC_CODE}";
+ ill.Row = rl.N_ROW;
}
else continue;
}
@@ -3822,7 +3913,7 @@
ItemLayer = rl.N_CURRENT_NUM,
S_CJ_NAME = _clcntitem.S_CJ_NAME,
area = area,
- Row = $"{rl.S_LOC_CODE}"
+ Row = rl.N_ROW
});
dsi[area] = dictitems;
}
@@ -3836,7 +3927,7 @@
ItemLayer = rl.N_CURRENT_NUM,
S_CJ_NAME = _clcntitem.S_CJ_NAME,
area = area,
- Row = $"{rl.S_LOC_CODE}"
+ Row = rl.N_ROW
});
dsi.Add(area, dictitems);
}
@@ -3983,6 +4074,14 @@
//鐢熸垚鎺ラ┏鍖轰换鍔★紝鏍囪涓虹粓鐐瑰簱鍖恒�
var b = TaskProcess.CreateTransport(od.S_ID, lastful.S_LOC_CODE, Endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", crs.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, crs.Count, 50, nextarea == od.S_END_AREA ? "" : od.S_END_AREA);
if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;
+ if (!string.IsNullOrEmpty(od.S_ITEM_CODE))
+ {
+ ///缁欑Щ搴撳崟 鍐欎笂杞繍鐨勭墿鏂欐暟鎹�
+ od.S_ITEM_CODE = cir1.S_ITEM_CODE;
+ od.S_ITEM_NAME = cir1.S_ITEM_NAME;
+ od.S_CJ_NAME = cir1.S_CJ_NAME;
+ WCSHelper.Do(db => db.Updateable(od).UpdateColumns(it => new { it.S_ITEM_NAME, it.S_ITEM_CODE, it.S_CJ_NAME }).ExecuteCommand());
+ }
break;
}
else if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;
diff --git a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
index 76c1125..1c1a779 100644
--- a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
@@ -245,7 +245,7 @@
//plg 2025骞�鏈�3鏃�10:42:24
- if (task.S_END_LAREA == "YWLWJJB" && task.S_START_LAREA != "YWLRGDD")
+ if (task.S_END_LAREA == "YWLWJJB" && task.S_START_LAREA != "YWLRGDD" && !string.IsNullOrEmpty(task.S_TWO_END_LOC))
{
var model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == task.S_TWO_END_LOC).First();
if (model != null)
diff --git a/HH.WCS.QingXiNongfu/wms/WCSModel.cs b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
index 7ab6f7a..2dbd375 100644
--- a/HH.WCS.QingXiNongfu/wms/WCSModel.cs
+++ b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
@@ -271,7 +271,11 @@
/// </summary>
public int WorkType { get; internal set; } = 0;
public string MidArea { get; internal set; }
- public string TagOver { get; internal set; }
+
+ /// <summary>
+ /// 寮冪敤锛�鏀逛负璁板綍涓婃搴撳尯-
+ /// </summary>
+ public string TagOver { get; internal set; } = "";
public DateTime? TagOverTime { get; internal set; }
public string S_BQ_TRAY_TYPE { get; internal set; } = "";
/// <summary>
@@ -505,6 +509,16 @@
public string S_END_AREA { get; set; }
public string S_ZX_STATE { get; set; }
+ /// <summary>
+ /// 缂栫爜 鍚嶇О 鍘傚锛�鏈潵涓嶉渶瑕侊紝 涓轰簡ab鍖轰笉瓒虫椂锛岃Е鍙戣浆杩愩� 闃叉閲嶅鐗╂枡鍗曟嵁
+ /// </summary>
+ public string S_ITEM_CODE { get; set; }
+ public string S_ITEM_NAME { get; set; }
+ /// <summary>
+ /// 鍘傚
+ /// </summary>
+ public string S_CJ_NAME { get; set; }
+
}
[SuGG("绉诲簱宸ュ崟琛�)]
diff --git "a/HH.WCS.QingXiNongfu/\345\216\237\347\211\251\346\226\231\346\226\271\346\263\225\346\246\202\350\277\260.txt" "b/HH.WCS.QingXiNongfu/\345\216\237\347\211\251\346\226\231\346\226\271\346\263\225\346\246\202\350\277\260.txt"
new file mode 100644
index 0000000..17b90d1
--- /dev/null
+++ "b/HH.WCS.QingXiNongfu/\345\216\237\347\211\251\346\226\231\346\226\271\346\263\225\346\246\202\350\277\260.txt"
@@ -0,0 +1,48 @@
+鍘熺墿鏂欑焊绠卞叆搴擄細
+1 Monitor BottTask 鏂规硶锛�+ 鏂规硶璇存槑锛�+ 1.1 浜哄伐鍫嗗彔 涓棿鎺ラ┏鐨勬娴嬭浆杩愪换鍔°�
+ 1.2 鎻愬崌鏈烘墭鐩樻爣璁扮殑閫�簱浠诲姟銆�+ 1.3 閫�簱涓棿搴撳尯鐨勬娴嬭浆杩愪换鍔°�
+ 鍋氭硶鎬濊矾 鍦ㄦ墭鐩樿揣浣嶆爣璁颁腑锛岃褰曠洰鏍囧簱鍖猴紝濡傛灉閫氳繃涓棿搴撳尯闇�杞繍 灏卞湪鏍囪涓褰�涓棿搴撳尯,鐩爣搴撳尯銆�
+ 鎵樼洏鍦ㄦ墽琛屽墠寰�笅涓�簱鍖轰换鍔★紝鍗歌揣鏃舵墦涓婁笅娆″簱鍖烘爣璁般�
+
+2 Monitor AutoRunABD <-闄ゅ師鏉�搴撳尯锛岀墿鏂�鍚嶇О锛屽巶瀹�鐨勬暟鎹�澶栵紝鏂板鎺掓暟鎹紝璁板綍搴撳尯姣忎竴鎺掔殑鐗╂枡鏁版嵁 --2025骞�鏈�1鏃�6:09:06鍙樻洿寮�彂鏂板銆�+ 鏂规硶璇存槑锛�+ 鎸佺画妫�祴ABCD 鍥涗釜搴撳尯涓紝鐗╂枡+鍚嶇О+鍘傚(鏂板鎵�湪鎺掞紝涓轰簡鏂伴渶姹傚嚭搴撳彧浠嶢B鍑猴紝AB鏁伴噺涓嶈冻5鏃跺紑濮嬭浆杩愬埌宸ュ崟鎸囧畾鐨凙鎴朆) 鐨勫眰鏁版暟鎹紙闃叉棰嗘枡鏁�鍗曟鍑哄簱浠诲姟鐨勬墭鐩樻暟閲忥級
+ 璇ユ柟娉曚粎涓轰究鍒╂�缂撳瓨銆傚疄闄呭嚭搴撳彲鐩存帴鏀规垚ABCD杩涜閬嶅巻銆�+ 鏈変釜妫�祴寮�叧ReadCCK锛岃妫�祴寮�叧浣嶄簬 AutoRun13TSJ 鎻愬崌鏈虹焊绠卞嚭搴撳鐞嗘祦绋嬨�绗竴娆℃媶鍨涚┖浜嗗氨浼氬紑濮嬫寔缁�妫�祴鐗╂枡锛岀洿鍒扮▼搴忓仠姝€�
+ ReadCCK = true鏃讹紝寮�鏂规硶娴佺▼銆�+
+3 Monitor AutoRun13TSJ --- < 2025骞�鏈�1鏃�6:10:28 鏂板鍙樻洿绗洓寮�彂銆傛病鏈夎揣锛屾垨鑰呭墿浣欑墿鏂欐暟閲�5 鑷姩CD 杞繍鍒癆B
+ 鏂规硶璇存槑锛�+ {
+ 閬嶅巻鎻愬崌鏈�+ 鑾峰彇褰撳墠鎻愬崌鏈虹殑鎵�湁鍑哄簱宸ュ崟锛圱1鍜孴2绾哥锛夈�
+ 鎻愬崌鏈烘媶鍨涚┖浜嗭紝ReadCCK = true,鍚﹀垯continue鍒颁笅涓�彁鍗囨満銆傘�
+ }
+ 閬嶅巻宸ュ崟锛屼粠缂撳瓨鑾峰彇AB2涓簱鍖轰腑鐗╂枡鏈�珮鍙犲眰锛堢洰鐨勬煡鎵炬槸鍚︽湁2灞傜殑锛屽洜涓轰紭鍏堝嚭搴撴媶鍨涳紝1灞傜殑鍙兘绠楁槸闆跺ご锛�+ 浠庝笂涓�楠や腑鐨勬渶楂樺眰鐗╂枡鎵�湪搴撳尯杩涜鍑哄簱銆�+ 濡傛灉璧风偣搴撳尯鏈夎揣 1灞傛牴鎹俊鍙峰嚭鎻愬崌鏈恒� 2灞備笂鎷嗗灈鍖恒�
+ 濡傛灉娌℃湁璐э紝鎴栬�鍓╀綑鐗╂枡鏁伴噺<5
+ 瑙﹀彂 杞繍鐢熸垚閫昏緫銆�+
+4 DeviceProcess Analysis13 -鎻愬崌鏈轰俊鍙峰鐞嗐� 闈炲繀瑕佹儏鍐碉紝鍩烘湰鏃犻渶鍙樺姩銆�+ 鏂规硶璇存槑:
+ 閫�枡
+ 1.T2绾哥浜哄伐澶勭悊鐨勶紝鍙湁T1鏈夋媶鍨涘湪鐢ㄣ�
+ 2.绾哥閫�簱鏄牴鎹彁鍗囨満宸ュ崟锛岀敓鎴愭爣璁帮紝宸ュ崟MidArea鏄浆杩愪腑闂村簱鍖猴紝S_ROW 閫�簱鐩爣搴撳尯銆�鍚庣敱BottTask 鏂规硶杩涜澶勭悊銆�+ 3.鏍囩锛屾敹缂╄啘 鏈夐浂澶村拰婊℃澘鐨勫鐞嗐�
+ T1涓婃枡
+ 1.鍖呭惈T1,T2淇″彿+10绉掓竻鎵樼洏鍔熻兘銆�+ 2.T1浠庢媶鎷嗗灈涓婃墭鐩樸�
+
+5 Monitor YwlTKPEBQ_Auto 鏂规硶锛�+ 璇存槑锛�杩欓噷鏄彁鎵�鏍囩 PE鑶滅殑鍑哄叆閫�簱銆� 閫�簱鏍囪瘑锛岄兘鏄墭鐩樼墿鏂欒〃鏍囪瘑 BQ_PRA.B(BACK)
+ 閲岄潰鏄洓涓嚎绋�+ task1锛氭棤鑿屾爣绛惧嚭搴撳崟绛涢�銆�杩欓噷鍑哄叆涓嶅悓鏃躲�浠撳簱鏄揣鏋讹紝1灞傛槸闆跺ご1,2灞傛槸闆跺ご2 3灞傛槸婊℃澘銆�+ 鏃犺弻鐨勫嚭搴撳拰閫�簱锛屽凡缁忕暐杩囦簡鎺ラ┏鍖恒� 鎵�互鐩村嚭绾胯竟锛�鐩撮�璐ф灦銆�+ task2: T2鎻愬崌鏈�鏍囩, 浠庢按绾挎爣绛捐揣鏋讹紝鏍规嵁淇″彿锛岀洿鍑虹嚎杈癸紝鐩撮�璐ф灦銆�鏆傛棤绌烘墭閫�簱娴佺▼銆�+ task3: 鎻愭墸 鍜孭E涓按鑶� 鐨勫嚭搴擄紝搴撳唴鐩村嚭绾胯竟 鍜�绾胯竟鐩存帴閫�簱銆�+ task4 鎻愭墸鍜孭E鑶滅殑鍏ュ簱娴佺▼銆�
+ PE鑶滃皬姘�涓奣2鎻愬崌鏈虹殑 淇″彿鍑哄簱鍜岄�搴撱�
--
Gitblit v1.9.1