From 75ca84b7570d7a6a805c27164c3f17c1f2158423 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 13 12月 2024 08:34:26 +0800
Subject: [PATCH] 111
---
CC/iWareCC_ASRS/ThreadService/01_BZ01工位（清灰，洗板后工位）/DataProcess_BZ01.cs | 127 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 121 insertions(+), 6 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs" "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
index af1ebef..0697162 100644
--- "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
@@ -31,6 +31,7 @@
{
var alertMsg = "";
LogType logType = LogType.DataProcess_BZ01;
+ string lastUpi = "";//鏈�鍚庤褰曠殑UPI鏁版嵁
while (true)
{
Thread.Sleep(1000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
@@ -64,13 +65,23 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}-璇锋眰浜嗚В鐮侊紝浣嗘槸缁撴灉鏄┖鐨�,姝ゆ寰幆缁撴潫";
continue;
}
+ if (lastUpi == result)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}-閲嶅鐨刄PI{result}";
+ continue;
+ }
var upiCode = result;
- var qitaoReault = false;
+ lastUpi = upiCode;
+
+ var qitaoReault = false;//榻愬寘缁撴灉
using (WmsDBModel wmsDB = new WmsDBModel())
{
var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
if (upiObj == null)
{
+ //鍐欏叆鎶ヨ淇℃伅
+ await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ01_1);
+
SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
continue;
}
@@ -89,8 +100,6 @@
x.AreaCode == (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�
||
x.AreaCode == (int)AreaCodeEnum.鐮佸灈鍖哄煙
- ||
- x.AreaCode == (int)AreaCodeEnum.鏈哄櫒浜哄矝缂撳瓨鍖哄煙
).ToList();
if (isQiTaoList.Count() != allList.Count())
{//涓嶉綈鍖�
@@ -99,9 +108,113 @@
}
else
{//榻愬寘
- qitaoReault = true;
- upiObj.AreaCode = (int)AreaCodeEnum.鐮佸灈鍖哄煙;
+ //杩欓噷鍐嶅鍔犱釜閫昏緫锛屽繀椤绘槸鎸夌収娆″簭杩涘叆鐨勬墠鐪熸鐨勭畻榻愬寘 [Editby shaocx,2024-12-06]
+ //瀵绘壘鏈寘鍐呯殑鍓嶄竴鍧楁澘鐨勪綅缃�
+ int queryAreaCode = (int)AreaCodeEnum.寰呯紦瀛樺垎鎷ｅ尯;
+ var lastUpiLineQueue = wmsDB.mes_upi_linequeue.Where(x => x.PackageCode == upiObj.PackageCode && x.AreaCode == queryAreaCode)
+ .OrderBy(x => x.Id).FirstOrDefault();//鏌ヨ璇ュ寘闃熷垪鐨勭涓�鍧楁澘
+ if (lastUpiLineQueue == null)
+ {//璇存槑 闃熷垪涓病鏈夎鍖呯殑鏁版嵁
+ qitaoReault = false;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ }
+ else
+ {
+ if (lastUpiLineQueue.Shelf != upiObj.Shelf)
+ {
+ qitaoReault = false;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ }
+ else
+ {
+ var isJiXuValidate = true;
+ if (upiObj.Shelf != 1)
+ {
+ var qianmianList = allList.Where(x => x.Shelf < upiObj.Shelf).ToList();
+ //鐪嬩互鍓嶇殑鏉垮湪鍝噷锛屽繀椤婚兘鍦� 鐮佸灈鍖哄煙
+ var yiqianQuyu = AreaCodeEnum.鐮佸灈鍖哄煙;
+ var count_MD = qianmianList.Where(x => x.AreaCode == (int)yiqianQuyu).Count();
+ if (count_MD != qianmianList.Count())
+ {
+ isJiXuValidate = false;
+ qitaoReault = false;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ }
+ }
+
+ if (isJiXuValidate)
+ {//鏄惁缁х画楠岃瘉
+ //杩橀渶瑕侀獙璇佸湪杩欎簺鍖哄煙涓紝鏄惁姝ｇ‘鎺掗槦锛屽鏋滄病鏈夋纭帓闃燂紝閭ｄ箞灏辫涓轰笉榻愬 銆怑ditby shaocx,2024-12-12銆�
+ var queueList = wmsDB.mes_upi_linequeue.Where(x => x.PackageCode == upiObj.PackageCode && x.AreaCode == queryAreaCode)
+ .OrderBy(x => x.Id).ToList();
+ var fisrtId = queueList.OrderBy(x => x.Id).First().Id;
+ var endId = queueList.OrderByDescending(x => x.Id).First().Id;
+ //缁х画鏌ヨ杩欎釜鏃堕棿娈靛唴鐨勯槦鍒楁暟鎹�
+ //閲嶅啓璇ラ槦鍒�
+ queueList = wmsDB.mes_upi_linequeue.Where(x => x.Id >= fisrtId && x.Id <= endId).OrderBy(x => x.Id).ToList();
+ var syCount = allList.Where(x => x.Shelf >= upiObj.Shelf).Count();
+ if (queueList.Count() != syCount)
+ {
+ qitaoReault = false;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ }
+ else
+ {
+ //鍒ゆ柇鏄惁涔卞簭
+ bool isLuanXuan = false;
+ int temp_shelf = 0;
+ for (int i = 0; i < queueList.Count; i++)
+ {
+ if (i == 0)
+ {
+ temp_shelf = queueList[i].Shelf;
+ if (temp_shelf != upiObj.Shelf)
+ {
+ qitaoReault = false;
+ isLuanXuan = true;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ break;//璺冲嚭寰幆
+ }
+ if (queueList[i].Upi != upiObj.UPI)
+ {
+ qitaoReault = false;
+ isLuanXuan = true;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ break;//璺冲嚭寰幆
+ }
+ }
+ else
+ {
+ temp_shelf = temp_shelf + 1;
+ if (temp_shelf != queueList[i].Shelf)
+ {//璁や负涔卞簭浜�
+ qitaoReault = false;
+ isLuanXuan = true;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ break;//璺冲嚭寰幆
+ }
+ }
+ }
+
+ if (isLuanXuan == false)
+ {
+ qitaoReault = true;
+ upiObj.AreaCode = (int)AreaCodeEnum.鐮佸灈鍖哄煙;
+ }
+ }
+ }
+ }
+
+ //娉ㄦ剰锛氳鍒犻櫎璇ラ槦鍒楁暟鎹摝
+ wmsDB.mes_upi_linequeue.Remove(lastUpiLineQueue);
+ }
}
+
+ //if (qitaoReault == false) {
+ // //涓存椂
+ // SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"妯℃嫙鍟婂晩锛屾殏鍋滃晩鍟�";
+ // continue;
+ //}
using (StationServiceClient client = new StationServiceClient())
{
@@ -143,6 +256,7 @@
}
else
{
+ SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}-娌℃湁瑕佸鐞嗙殑鏁版嵁";
using (WmsDBModel wmsDB = new WmsDBModel())
{
var isAllow = IsAllloRunOutTaskMode(wmsDB, null);
@@ -168,7 +282,8 @@
private static bool IsAllloRunOutTaskMode(WmsDBModel wmsDB, mes_batchOrderUPI_new curUpiObj)
{
//棣栧厛鏌ヨ鏁版嵁搴撲腑鏄惁鏈� 瑕佸嚭搴撶殑鏁版嵁
- var isExistOutTaskForNewCreated = wmsDB.wms_rbline_task.Where(x => x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
+ var isExistOutTaskForNewCreated = wmsDB.wms_rbline_task.Where(x =>
+ (x.RbTaskType == (int)RbTaskTypeEnum.榻愬寘鍑哄簱浠诲姟 || x.RbTaskType == (int)RbTaskTypeEnum.寮哄埗鍑哄簱浠诲姟)
&& x.TaskStatus == (int)TaskStatusEnum.鏂板缓
).Count();
if (isExistOutTaskForNewCreated == 0)
--
Gitblit v1.9.3