From 31a8f3df81e2dfe1d57a2ae9a1d25c33a05ff862 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 24 六月 2025 17:28:16 +0800
Subject: [PATCH] 111

---
 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs b/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs
index 6e0c1d9..6217aaf 100644
--- a/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs
@@ -1155,10 +1155,11 @@
                                 //璇诲彇澶嶇О骞冲彴鐨勯噸閲�                                 //Convert.ToInt32(Completion(result[8]) + Completion(result[9]), 2).ToString()
                                 //(decimal.Parse(tray.oneTrayWeight1) / 100).ToString("F2");
-                                string weight = (decimal.Parse(Convert.ToInt32(Completion(result.result[6]) + Completion(result.result[7]), 2).ToString()) / 100).ToString("F2");
+                                //string weight = (decimal.Parse(Convert.ToInt32(Completion(result.result[4]) + Completion(result.result[5]), 2).ToString()) / 100).ToString("F2");
+                                string weight = ((result.result[4] * 65536 + result.result[5]) / 100).ToString();
 
-                                CMMLog.Debug($"SecondWeightActionOne: 璇诲彇璁惧{plc.location},ip:{plc.ip}閫氶亾{plc.readAddr + 7}閲岄潰鏁版嵁涓簕result.result[6]}.");
-                                CMMLog.Debug($"SecondWeightActionOne: 璇诲彇璁惧{plc.location},ip:{plc.ip}閫氶亾{plc.readAddr + 8}閲岄潰鏁版嵁涓簕result.result[7]}.");
+                                CMMLog.Debug($"SecondWeightActionOne: 璇诲彇璁惧{plc.location},ip:{plc.ip}閫氶亾{plc.readAddr + 4}閲岄潰鏁版嵁涓簕result.result[4]}.");
+                                CMMLog.Debug($"SecondWeightActionOne: 璇诲彇璁惧{plc.location},ip:{plc.ip}閫氶亾{plc.readAddr + 5}閲岄潰鏁版嵁涓簕result.result[5]}.");
                                 //double x = (double)Convert.ToInt32(Completion(result[8]) + Completion(result[9]), 2) / 100;
                                 //CMMLog.Info($"SecondWeightActionOne: 璇诲彇璁惧{plc.location},ip:{plc.ip}閫氶亾{plc.readAddr + 4}閲岄潰鏁版嵁涓簕result.result[3]}.");
                                 CMMLog.Info($"SecondWeightActionOne: weight:{weight}");
@@ -1174,8 +1175,6 @@
                         }
                         else CMMLog.Info($"SecondWeightActionOne: packageInfoModel鏈壘鍒版暟鎹紝machineNo:{model.machince},trayCode:{model.ext2}");
                         #endregion
-
-
 
                         string PlcBit02 = Settings.GetPlcInfo().Where(a => a.deviceType == "2").FirstOrDefault().location;
                         UpdateBuilder update = Update.Set("ng", result.result[2]);
@@ -1199,7 +1198,7 @@
             if (infoTwo != null)
             {
                 //var newWeight = (Convert.ToInt32(Completion(result[6]) + Completion(result[7]), 2) / 100).ToString();
-                var newWeight =  result[6] + "," + result[7];
+                var newWeight =  result[5] + "," + result[6];
                 //鏇存柊鏁版嵁
                 CMMLog.Info($"浠庡绉板钩鍙拌幏鍙栫殑鐗╂枡閲嶉噺锛歿newWeight}");
 

--
Gitblit v1.9.1