From 7cc26b2202675a4ef2189a60c275bc9345bc9856 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 08 七月 2025 17:04:24 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs | 19 +++++++++----------
HH.WCS.Mobox3.NongFuLinZhi/wms/LocationHelper.cs | 2 +-
HH.WCS.Mobox3.NongFuLinZhi/api/DebugController.cs | 4 ++--
HH.WCS.Mobox3.NongFuLinZhi/Properties/AssemblyInfo.cs | 4 ++--
HH.WCS.Mobox3.NongFuLinZhi/device/ModbusHelper.cs | 2 +-
5 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/Properties/AssemblyInfo.cs b/HH.WCS.Mobox3.NongFuLinZhi/Properties/AssemblyInfo.cs
index f834834..5c0d6d5 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/Properties/AssemblyInfo.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
// 鏈夊叧绋嬪簭闆嗙殑涓�埇淇℃伅鐢变互涓� // 鎺у埗銆傛洿鏀硅繖浜涚壒鎬у�鍙慨鏀� // 涓庣▼搴忛泦鍏宠仈鐨勪俊鎭�
-[assembly: AssemblyTitle("HH.WCS.JunzhouNongfu")]
+[assembly: AssemblyTitle("HH.WCS.LinzhiNongfu")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("HH.WCS.JunzhouNongfu")]
+[assembly: AssemblyProduct("HH.WCS.LinzhiNongfu")]
[assembly: AssemblyCopyright("Copyright 漏 2023")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/api/DebugController.cs b/HH.WCS.Mobox3.NongFuLinZhi/api/DebugController.cs
index fb4d0d8..b84214d 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/api/DebugController.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/api/DebugController.cs
@@ -43,7 +43,7 @@
[Route("bindCntr")]
public ReturnResult bindCntr(bindModel model)
{
- LogHelper.Info($"bindCntr requst:{model}");
+ LogHelper.Info($"bindCntr requst:{JsonConvert.SerializeObject(model)}");
ApiHelper.bindCntr(model);
return new ReturnResult();
@@ -53,7 +53,7 @@
[Route("unBindCntr")]
public ReturnResult unBindCntr(unBindModel model)
{
- LogHelper.Info($"unBindCntr requst:{model}");
+ LogHelper.Info($"unBindCntr requst:{JsonConvert.SerializeObject(model)}");
ApiHelper.unBindCntr(model);
return new ReturnResult();
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/device/ModbusHelper.cs b/HH.WCS.Mobox3.NongFuLinZhi/device/ModbusHelper.cs
index d7fe1de..3412e36 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/device/ModbusHelper.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/device/ModbusHelper.cs
@@ -6,7 +6,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace HH.WCS.JunzhouNongfu.device
+namespace HH.WCS.LinzhiNongfu.device
{
/// <summary>
/// modbus tcp 鐢ㄧ涓夋柟鐨勫寘
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs b/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
index 2936566..4826fa9 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
@@ -544,7 +544,7 @@
if (data.Length == 6)
{
- if (data.Substring(0, 2) == "11")
+ if (data.Substring(2, 2) == "22")
{
if (LocationHelper.CheckLocFree(plc.TN_Location[0]))
{
@@ -652,7 +652,7 @@
if (data.Length == 6)
{
- if (data.Substring(0, 2) == "11")
+ if (data.Substring(2, 2) == "22")
{
if (LocationHelper.CheckLocFree(plc.TN_Location[0]))
{
@@ -785,11 +785,11 @@
taskType = "娉ㄥ搴撳瓨婊℃墭涓嬬嚎锛堢摱鍧級";
}
//endArea = Settings.GetLinJiangBCPAreaList().Where(a => a.AreaName == "鐡跺澂婊℃墭" && a.Enable == "1").FirstOrDefault().AreaNo;
- if (data.Length == 4)
+ if (data.Length == 8)
{
- if (data == "1122") LinZhialysisBottleCapAndPreformTwo(plc, db, workInfo, endArea, taskType, plc.TN_Location[0], "鐡跺澂鏈�);
+ if (data.Substring(0,2) == "12") LinZhialysisBottleCapAndPreformTwo(plc, db, workInfo, endArea, taskType, plc.TN_Location[0], "鐡跺澂鏈�);
- if (data == "1221") LinZhialysisBottleCapAndPreformTwo(plc, db, workInfo, endArea, taskType, plc.TN_Location[1], "鐡跺澂鏈�);
+ if (data.Substring(2,2) == "22") LinZhialysisBottleCapAndPreformTwo(plc, db, workInfo, endArea, taskType, plc.TN_Location[1], "鐡跺澂鏈�);
}
}
else LogHelper.Info($"鐡跺澂鏈猴細{plc.deviceName} 鏈紑鍚伐鍗曪紝涓嶅彲瑙﹀彂婊℃墭涓嬬嚎", "鐡跺澂鏈�);
@@ -929,7 +929,7 @@
if (mst.S_TYPE.Contains("缈绘枟鏈�))
{
LogHelper.Info($"鏌ヨ缈绘枟鏈哄厑璁稿彇绌轰俊鍙�鍏佽鍙栫┖淇″彿={LineState[mst.S_START_LOC.Trim()].status} 鏃堕棿闂撮殧={DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds}", "瀹夊叏浜や簰");
- if ((LineState[mst.S_START_LOC.Trim()].status == "112100" || LineState[mst.S_START_LOC.Trim()].status == "112200") && DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds < 10)
+ if (LineState[mst.S_START_LOC.Trim()].status.Substring(4,2) == "00" && DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds < 10)
{
//NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1101, 18);
NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 18, "1101");
@@ -941,7 +941,7 @@
LogHelper.Info($"鏌ヨ杈撻�绾垮厑璁稿彇婊′俊鍙�鍏佽鍙栨弧淇″彿={LineState[mst.S_START_LOC.Trim()].status} 鏃堕棿闂撮殧={DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds}", "瀹夊叏浜や簰");
if (mst.S_TYPE.Contains("婊℃墭涓嬬嚎"))
{
- if ((LineState[mst.S_START_LOC.Trim()].status.Substring(4,2) == "01" || LineState[mst.S_START_LOC.Trim()].status.Substring(6,2) == "02") && DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds < 10)
+ if ((LineState[mst.S_START_LOC.Trim()].status.Substring(4,2) == "00" || LineState[mst.S_START_LOC.Trim()].status.Substring(4,2) == "02") && DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds < 10)
{
//NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1101, 18);
NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 18, "1101");
@@ -956,7 +956,6 @@
TaskProcess.sendSing(mst, 1101);
}
}
-
}
}
else LogHelper.Info($"瀛楀吀涓湭鎵惧埌璇ey鐨勬暟鎹紝key锛歿mst.S_START_LOC}");
@@ -973,7 +972,7 @@
if (mst.S_TYPE.Contains("缈绘枟鏈�))
{
LogHelper.Info($"鏌ヨ缈绘枟鏈哄厑璁镐笂婊′俊鍙�鍏佽涓婃弧淇″彿={LineState[mst.S_END_LOC.Trim()].status} 鏃堕棿闂撮殧={DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds}", "瀹夊叏浜や簰");
- if ((LineState[mst.S_END_LOC.Trim()].status == "112100" || LineState[mst.S_END_LOC.Trim()].status == "112200") && DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds < 10)
+ if (LineState[mst.S_END_LOC.Trim()].status.Substring(4,2) == "00" && DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds < 10)
{
//NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1103, 18);
NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 18, "1103");
@@ -985,7 +984,7 @@
LogHelper.Info($"鏌ヨ杈撻�绾垮厑璁歌ˉ绌轰俊鍙�鍏佽琛ョ┖淇″彿={LineState[mst.S_END_LOC.Trim()].status} 鏃堕棿闂撮殧={DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds}", "瀹夊叏浜や簰");
if (mst.S_TYPE.Contains("绌烘墭涓婄嚎"))
{
- if ((LineState[mst.S_END_LOC.Trim()].status.Substring(4,2) == "01" || LineState[mst.S_END_LOC.Trim()].status.Substring(6,2) == "02") && DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds < 10)
+ if ((LineState[mst.S_END_LOC.Trim()].status.Substring(4,2) == "00" || LineState[mst.S_END_LOC.Trim()].status.Substring(4,2) == "02") && DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds < 10)
{
//NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1103, 18);
NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 18, "1103");
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/wms/LocationHelper.cs b/HH.WCS.Mobox3.NongFuLinZhi/wms/LocationHelper.cs
index 2817042..2b33881 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/wms/LocationHelper.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/wms/LocationHelper.cs
@@ -377,7 +377,7 @@
}
});
location.N_CURRENT_NUM = lcrList.Count + count;
- if(location.N_CURRENT_NUM >location.N_CAPACITY) location.N_CURRENT_NUM = location.N_CAPACITY;
+ if (location.N_CURRENT_NUM > location.N_CAPACITY) location.N_CURRENT_NUM = location.N_CAPACITY;
location.N_LOCK_STATE = 0;
location.S_LOCK_STATE = "鏃�;
--
Gitblit v1.9.1