From 2d3ee03961d6cfbde70342e8a97bc7b05d0b0dc3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 21 七月 2025 17:27:34 +0800
Subject: [PATCH] 优化代码, 封装货位锁和创建任务流程, 数据库事务等
---
device/ProductionLineDevice.cs | 45 ++++++++++-----------------------------------
1 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/device/ProductionLineDevice.cs b/device/ProductionLineDevice.cs
index c22a7d7..2c8dfd1 100644
--- a/device/ProductionLineDevice.cs
+++ b/device/ProductionLineDevice.cs
@@ -1,5 +1,7 @@
锘縰sing System;
+using HH.WCS.Mobox3.DSZSH.util;
+
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -32,46 +34,32 @@
public string Id { get; set; }
/// <summary>
- /// 绯荤粺鐘舵�锛�鏈湴 1鑱斿姩(AGV妯″紡) 2鏁呴殰
+ /// 绯荤粺鐘舵�:0鏈湴 1鑱斿姩(AGV妯″紡) 2鏁呴殰
/// </summary>
public int SystemState { get; set; }
/// <summary>
- /// 婊″灈涓嬬嚎锛�杈撻�绾挎湯绔湁鎴愬搧鏂欙紝闇�AGV鎼繍 0榛樿鍊�+ /// 婊″灈涓嬬嚎:1杈撻�绾挎湯绔湁鎴愬搧鏂�闇�AGV鎼繍 0榛樿鍊� /// </summary>
public int FullOffline { get; set; }
/// <summary>
- /// 鍛煎彨鎵樼洏鍨涳細1闇�绌烘墭锛屽懠鍙獳GV閰嶉� 0榛樿鍊�+ /// 鍛煎彨鎵樼洏鍨�1闇�绌烘墭,鍛煎彨AGV閰嶉� 0榛樿鍊� /// </summary>
public int CallPallet { get; set; }
/// <summary>
- /// 鍏佽 AGV 鏀炬墭鐩樺灈锛�鍏佽鏀惧灈 0榛樿鍊�+ /// 鍏佽 AGV 鏀炬墭鐩樺灈:1鍏佽鏀惧灈 0榛樿鍊� /// </summary>
public int AllowAgvPlacePallet { get; set; }
- //private int _agvPicking;
- //private int _agvPlacingPallet;
-
- ///// <summary>
- ///// AGV 姝ｅ湪鍙栬揣锛氫笅绾緼GV鍐欏叆1锛屽彇璐у畬鎴愬悗鎭㈠0
- ///// </summary>
- //public int AgvPicking {
- // get => _agvPicking;
- // set {
- // var isOk = ModbusHelper.WriteSingleRegister(10, value, Ip, Port);
- // _agvPicking = isOk ? value : throw new Exception($"淇敼 [AGV 姝ｅ湪鍙栬揣] 涓�'{value}' 澶辫触");
- // }
- //}
-
/// <summary>
- /// AGV 姝ｅ湪鍙栬揣锛氫笅绾緼GV鍐欏叆1锛屽彇璐у畬鎴愬悗鎭㈠0
+ /// AGV 姝ｅ湪鍙栬揣:涓嬬嚎AGV鍐欏叆1,鍙栬揣瀹屾垚鍚庢仮澶�
/// </summary>
public int AgvPicking { get; set; }
/// <summary>
- /// AGV 姝ｅ湪鍙栬揣锛氫笅绾緼GV鍐欏叆1锛屽彇璐у畬鎴愬悗鎭㈠0
+ /// AGV 姝ｅ湪鍙栬揣:涓嬬嚎AGV鍐欏叆1,鍙栬揣瀹屾垚鍚庢仮澶�
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
@@ -84,24 +72,13 @@
return true;
}
- ///// <summary>
- ///// AGV 姝ｅ湪鏀炬墭鐩樺灈锛氫笂绾緼GV鍐欏叆1锛屾斁鎵樺畬鎴愬悗鎭㈠0
- ///// </summary>
- //public int AgvPlacingPallet {
- // get => _agvPlacingPallet;
- // set {
- // var isOk = ModbusHelper.WriteSingleRegister(11, value, Ip, Port);
- // _agvPlacingPallet = isOk ? value : throw new Exception($"淇敼 [AGV 姝ｅ湪鏀炬墭鐩樺灈] 涓�'{value}' 澶辫触");
- // }
- //}
-
/// <summary>
- /// AGV 姝ｅ湪鏀炬墭鐩樺灈锛氫笂绾緼GV鍐欏叆1锛屾斁鎵樺畬鎴愬悗鎭㈠0
+ /// AGV 姝ｅ湪鏀炬墭鐩樺灈:涓婄嚎AGV鍐欏叆1,鏀炬墭瀹屾垚鍚庢仮澶�
/// </summary>
public int AgvPlacingPallet { get; set; }
/// <summary>
- /// AGV 姝ｅ湪鏀炬墭鐩樺灈锛氫笂绾緼GV鍐欏叆1锛屾斁鎵樺畬鎴愬悗鎭㈠0
+ /// AGV 姝ｅ湪鏀炬墭鐩樺灈:涓婄嚎AGV鍐欏叆1,鏀炬墭瀹屾垚鍚庢仮澶�
/// </summary>
public bool SetAgvPlacingPallet(int value) {
if (!ModbusHelper.WriteSingleRegister(11, value, Ip, Port)) {
@@ -124,8 +101,6 @@
CallPallet = readArray[2];
AllowAgvPlacePallet = readArray[3];
// 鍙啓鍦板潃鏁版嵁
- //_agvPicking = readArray[10];
- //_agvPlacingPallet = readArray[11];
AgvPicking = readArray[10];
AgvPlacingPallet = readArray[11];
--
Gitblit v1.9.1