From ddab693f389b648157c8b48c7fcbdefc92561dd2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 05 七月 2024 19:55:22 +0800
Subject: [PATCH] 老PCS替换代码优化，工业大屏优化，PDA功能优化
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/info_interaction.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/info_interaction.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/info_interaction.cs"
index bd97e3f..476cbab 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/info_interaction.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/info_interaction.cs"
@@ -112,7 +112,7 @@
client.Write(key.FirstOrDefault(x => x.name == "oi_on").dbAddress, (byte)0);//鐢宠澶嶄綅
throw new Exception($"{key.Key}鏈壘鍒扮被鍨媨o_wp_type}鐨勮溅杞弬鏁癨n鍐欏叆杈婇亾淇℃伅锛歩_status锛�2,oi_on锛�0");
}
- var Work = workinfoRepository.Find(x => x.SN == o_wp_id && x.processCode == "17").OrderByDescending(x => x.CreateTime).FirstOrDefault();
+ var Work = workinfoRepository.Find(x => x.SN == o_wp_id && (key.Key.Contains("4鍗曞厓") ? x.processCode == "28" : x.processCode == "17")).OrderByDescending(x => x.CreateTime).FirstOrDefault();
if (Work == null)
{
client.Write(key.FirstOrDefault(x => x.name == "i_status").dbAddress, (byte)3);//鐘舵��
@@ -156,7 +156,7 @@
var o_wp_id = DBExtension.Read(key.FirstOrDefault(x => x.name == "o_wp_id"), client);
if (!string.IsNullOrEmpty(o_wp_id.ToString()))
{
- var Work = workinfoRepository.Find(x => x.SN == o_wp_id && x.processCode == "17").OrderByDescending(x => x.CreateTime).FirstOrDefault();
+ var Work = workinfoRepository.Find(x => x.SN == o_wp_id && (key.Key.Contains("4鍗曞厓") ? x.processCode == "28" : x.processCode == "17")).OrderByDescending(x => x.CreateTime).FirstOrDefault();
if (Work == null)
{
client.Write(key.FirstOrDefault(x => x.name == "i_status").dbAddress, (byte)2);//鐘舵��
--
Gitblit v1.9.3