From 9aa1ccbaf232340bcc1196eddb85258e2b16f4e2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 06 12月 2024 15:38:29 +0800
Subject: [PATCH] 22
---
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/1、DataProcess_BZ21.cs | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 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..e2cc751 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;
@@ -99,6 +100,13 @@
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 +114,7 @@
papercut.ApiMessage = "";
papercut.PushNum = 0;
papercut.PushStatus = (int)PushStatusEnum.NotPush;
+ papercut.CreateUserName = papercut.UpdateUserName = "璋冨害绯荤粺";
papercut.CreateTime = papercut.UpdateTime = DateTime.Now;
wmsDB.mes_push_papercut.Add(papercut);
@@ -139,9 +148,9 @@
PushNum = 0,
ApiMessage = "",
CreateTime = DateTime.Now,
- CreateUserName = "CC",
+ CreateUserName = "璋冨害绯荤粺",
UpdateTime = DateTime.Now,
- UpdateUserName = "CC",
+ UpdateUserName = "璋冨害绯荤粺",
};
//鏂板浠诲姟琛�
@@ -241,5 +250,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