From 557f02072fa311eefe3123aa44afebac22adc465 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期五, 24 四月 2026 17:24:43 +0800
Subject: [PATCH] 4-24
---
项目代码/WCS/WIDESEA_WCSServer/WIDESEA_WCS/WCSService.cs | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/WCSService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/WCSService.cs"
index d9fe15b..d9be97e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/WCSService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/WCSService.cs"
@@ -1,26 +1,30 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using WIDESEA_WCS.WCSClient;
-using WIDESEA_Entity.DomainModels;
-using WIDESEA_Services.Repositories;
-using System.Linq;
-using System.Threading;
-using WIDESEA_Core.Utilities;
-using System.Diagnostics;
-using Quartz.Impl;
-using WIDESEA_Common.CutomerModel;
-using WIDESEA_Common;
-using WIDESEA_Services.IRepositories;
+锘縰sing HslCommunication;
using HslCommunication.WebSocket;
-using HslCommunication;
-using WIDESEA_Services;
+using Microsoft.SqlServer.Server;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Numeric;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using Quartz.Impl;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using WIDESEA_Common;
+using WIDESEA_Common.CutomerModel;
+using WIDESEA_Common.LogEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Core.EFDbContext;
-using WIDESEA_Common.LogEnum;
-using WIDESEA_Services.Services;
-using WIDESEA_Core.Services;
using WIDESEA_Core.Enums;
+using WIDESEA_Core.Services;
+using WIDESEA_Core.Utilities;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Services;
+using WIDESEA_Services.IRepositories;
+using WIDESEA_Services.Repositories;
+using WIDESEA_Services.Services;
+using WIDESEA_WCS.WCSClient;
namespace WIDESEA_WCS
{
@@ -175,7 +179,7 @@
resultDic.Add("normal", "0");
- Thread.Sleep(300);
+ //Thread.Sleep(300);
modelResult1 = bool.Parse(client.ReadValue(CLineInfoDBName.R_System_Emery_Model.ToString(), "System").ToString());
if (modelResult1)
@@ -203,7 +207,7 @@
}
- Thread.Sleep(300);
+ //Thread.Sleep(300);
int val = int.Parse(client.ReadValue(CLineInfoDBName.R_System_Inline_Run_Model.ToString(), "System").ToString());
if (val == 1)
resultDic.Add("controlModel", "鎵嬪姩鎺у埗");
@@ -213,6 +217,19 @@
resultDic.Add("controlModel", "鑱旀満鎺у埗");
else
resultDic.Add("controlModel", "鏈煡鐘舵��");
+
+
+
+ //Thread.Sleep(300);
+ int modelResult = int.Parse(client.ReadValue(CLineInfoDBName.R_System_Inline_Run_Model.ToString(), "OutSystem").ToString());
+ if (modelResult == 1)
+ resultDic.Add("modelResult", "鎵嬪姩鎺у埗");
+ else if (modelResult == 2)
+ resultDic.Add("modelResult", "鍗曟満鎺у埗");
+ else if (modelResult == 3)
+ resultDic.Add("modelResult", "鑱旀満鎺у埗");
+ else
+ resultDic.Add("modelResult", "鏈煡鐘舵��");
}
else
{
@@ -224,10 +241,16 @@
catch (Exception ex)
{
content.Error(ex.Message);
+ LogRecord.WriteLog(LogEnum.Errer, DateTime.Now.ToString()+"鍦℅etInboundLineCurrentModel鏂规硶鑾峰彇褰撳墠鍏ュ簱妯″紡鐨勬椂鍊欏彂鐢熶簡閿欒" + ex.Message+ "鏁版嵁"+ resultDic);
}
return content;
}
+ //public static WebResponseContent GetInorOutMODELS(SaveModel saveModel)
+ //{
+
+ //}
+
/// <summary>
/// 褰撴牎楠屾墭鐩樼爜涓嶄竴鑷存椂锛屼汉宸ヨЕ鍙戠户缁换鍔�
--
Gitblit v1.9.3