From 95c865c03a9cb128af51ac4b7d7f9d7149441efd Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期一, 07 七月 2025 17:30:35 +0800
Subject: [PATCH] agv效率开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
index 9ea6922..0f89ebf 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -582,6 +582,15 @@
AddErrorInfo("搴撳尯鏌ユ壘澶辫触", result.msg);
return result;
}
+ int pri = 1;
+ var area = Settings.wareLoc.Where(a => a.AreaCode == endloc.S_WH_CODE).First();
+ if (area != null)
+ {
+ if (area.XbAreaCodes.Contains(endloc.S_AREA_CODE))
+ {
+ pri = 2;
+ }
+ }
//鍒涘缓wcs浠诲姟
var wcsTask = new WCSTask
{
@@ -596,7 +605,7 @@
S_END_AREA = endloc.S_AREA_CODE,
N_SCHEDULE_TYPE = 1,
S_CNTR_CODE = CntrCode,
- N_PRIORITY = taskData.priority,
+ N_PRIORITY = pri,
Z_TYPE = n_type,
N_START_LAYER = 1,
N_END_LAYER = 1,
@@ -954,6 +963,7 @@
S_CNTR_CODE = model.Rfid,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
Z_TYPE = n_type
};
LogHelper.Info("鍒涘缓鍏ュ钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
@@ -1152,6 +1162,7 @@
S_CNTR_CODE = CntrCode,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
Z_TYPE = n_type
};
@@ -1411,6 +1422,8 @@
S_CNTR_CODE = model.Rfid,
N_START_LAYER = 1,
N_END_LAYER = endlayer,
+ N_PRIORITY = 1,
+ S_B_STATE="绛夊緟鎺ㄩ�",
Z_TYPE = 5
};
LogHelper.Info("鍒涘缓绌烘墭鍥炲簱浠诲姟锛� + JsonConvert.SerializeObject(wcsTask));
@@ -1590,6 +1603,7 @@
N_START_LAYER = 1,
N_END_LAYER = 1,
Z_TYPE = 5,
+ N_PRIORITY = 1,
S_NOTE = "绮夋枡"
};
LogHelper.Info("鍒涘缓鍛煎彨绌烘墭浠诲姟锛� + JsonConvert.SerializeObject(wcsTask));
@@ -1814,6 +1828,7 @@
S_CNTR_CODE = model.Rfid,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
Z_TYPE = 5
};
@@ -2065,6 +2080,7 @@
S_CNTR_CODE = CntrCode,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
// N_TYPE = n_type
@@ -2201,6 +2217,7 @@
S_CNTR_CODE = cntr.S_CNTR_CODE,
N_END_LAYER = 1,
Z_TYPE = 6,
+ N_PRIORITY = 1,
S_B_STATE = "鐢垫鎺ㄩ�"
};
@@ -2471,10 +2488,9 @@
var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
if (location != null)
{
- var loccntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
+ var loccntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc.Trim()).ToList();
if (loccntr.Count > 0)
{
-
var cntrcodes = loccntr.Select(a => a.S_CNTR_CODE.Trim()).ToList();
if (LocationHelper.Clear(loc, cntrcodes))
{
--
Gitblit v1.9.1