From c6d9d8e2c8c5a0dea829164e4a1a5c3ed9703521 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 08 12月 2024 11:19:47 +0800
Subject: [PATCH] 2
---
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/1、DataProcess_BZ21.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
index 6d5a43b..8da34c8 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
@@ -12,6 +12,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
+using System.Diagnostics.Contracts;
using System.Linq;
using System.Text;
using System.Threading;
@@ -87,7 +88,7 @@
//澧炲姞鏍￠獙锛屽鏋滀笂涓�涓换鍔pi璺熸湰娆pi涓�鑷达紝灏辨姤閿� 銆怑ditby shaocx,2024-12-03銆�
var lastTask = wmsDB.wms_rbline_task.Where(x => x.RbTaskType == (int)RbTaskTypeEnum.鍚堝寘浠诲姟).OrderByDescending(x => x.Id).FirstOrDefault();
- if (lastTask != null && lastTask.UPI == result)
+ if (lastTask != null && lastTask.Upi == result)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-PLC閲嶅彂姝や换鍔★紝upi锛歿result}锛岀郴缁熶笉鑳介噸澶嶅鐞�,姝ゆ寰幆缁撴潫";
continue;
@@ -99,6 +100,14 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()},鏍规嵁UPI:{result}娌℃湁鎵惧埌瀵硅薄 ";
continue;
}
+
+ //楠岃瘉鏄惁鍏佽鍒囩焊
+ var validteReslt = ValidateIsAllowCut();
+ if (validteReslt == false)
+ {
+ continue;
+ }
+
//string upi = "LS070700101B0001GS";
//璋冪敤鍑虹焊鏈烘帴鍙�
var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
@@ -106,6 +115,7 @@
papercut.ApiMessage = "";
papercut.PushNum = 0;
papercut.PushStatus = (int)PushStatusEnum.NotPush;
+ papercut.CreateUserName = papercut.UpdateUserName = SysGloble.WCSSystem;
papercut.CreateTime = papercut.UpdateTime = DateTime.Now;
wmsDB.mes_push_papercut.Add(papercut);
@@ -139,9 +149,9 @@
PushNum = 0,
ApiMessage = "",
CreateTime = DateTime.Now,
- CreateUserName = "CC",
+ CreateUserName = SysGloble.WCSSystem,
UpdateTime = DateTime.Now,
- UpdateUserName = "CC",
+ UpdateUserName = SysGloble.WCSSystem
};
//鏂板浠诲姟琛�
@@ -149,7 +159,7 @@
{
Id = _id,
TaskNo = plcTaskNo,
- UPI = upiObj.UPI,
+ Upi = upiObj.UPI,
Length = upiObj.Length,
Width = upiObj.Width,
Thk = upiObj.Thk,
@@ -158,9 +168,7 @@
OrderId = upiObj.OrderId,
PackageCode = upiObj.PackageCode,
RbTaskType = (int)RbTaskTypeEnum.鍚堝寘浠诲姟,
- RbTaskTypeEnumName = RbTaskTypeEnum.鍚堝寘浠诲姟.ToString(),
TaskStatus = (int)TaskStatusEnum.鏂板缓,
- TaskStatusName = TaskStatusEnum.鏂板缓.ToString(),
TaskMsg = "澶规澘",
CreateTime = DateTime.Now,
CreateUserName = "CC",
@@ -241,5 +249,39 @@
}
+ /// <summary>
+ /// 楠岃瘉鏄惁鍏佽鍒囩焊
+ /// </summary>
+ /// <returns></returns>
+ public static bool ValidateIsAllowCut()
+ {
+ var rgvLocation = StationLocationEnum.BZ3007.ToString();
+
+ if (FormCC.stationView == null)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ return false;
+ }
+ var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
+ if (obj != null)
+ {
+ if (obj.R_AllowCut)
+ {
+ return true;
+ }
+ else
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-PLC涓嶅厑璁稿垏绾�";
+ return false;
+ }
+ }
+ else
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ return false;
+ }
+
+ }
+
}
}
--
Gitblit v1.9.3