From 12b23fd53333bbf16d5fb6b4ef88546a372a0d71 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期二, 22 七月 2025 15:16:52 +0800
Subject: [PATCH] 大车间
---
HH.WCS.Mobox3 - 大车间/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs | 12 +++++++-----
HH.WCS.Mobox3 - 大车间/HH.WCS.Mobox3.JiaTong/process/HttpModel.cs | 25 ++++++++++---------------
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git "a/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/process/HttpModel.cs" "b/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/process/HttpModel.cs"
index 30b55ea..700dcf2 100644
--- "a/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/process/HttpModel.cs"
+++ "b/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/process/HttpModel.cs"
@@ -129,12 +129,6 @@
public string LocationNum { get; set; }
/// <summary>
- /// 鍙栨秷淇℃伅
- /// </summary>
- [JsonProperty("message")]
- public string Message { get; set; } = "1";
-
- /// <summary>
/// 鐘舵�
/// </summary>
[JsonProperty("status")]
@@ -147,25 +141,26 @@
public string TaskNumber { get; set; }
/// <summary>
- /// 鐘舵�鍙樻洿鏃堕棿
+ /// 鍒拌揣鏃堕棿
/// </summary>
- [JsonProperty("time")]
- public string Time { get; set; }
+ [JsonProperty("arricalTime")]
+ public string ArricalTime { get; set; }
/// <summary>
/// 鐘舵�鍙樻洿鏃堕棿
/// </summary>
[JsonProperty("rfid")]
public string Rfid { get; set; }
/// <summary>
- /// 鐘舵�鍙樻洿鏃堕棿
+ /// 鐗╂枡缂栫爜
/// </summary>
- [JsonProperty("flag")]
- public int Flag { get; set; }
+ [JsonProperty("partNumber")]
+ public string PartNumber { get; set; }
/// <summary>
- /// 閫氫俊瀛楁
+ /// 鐗╂枡鎻忚堪
/// </summary>
- [JsonProperty("info")]
- public string Info { get; set; }
+ [JsonProperty("partDesc")]
+ public string PartDesc { get; set; }
+
}
diff --git "a/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs" "b/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs"
index 01229cc..63b788d 100644
--- "a/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs"
+++ "b/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs"
@@ -616,13 +616,15 @@
statusarrive.UseToken = "iFQ5fExGrLYLXliHYWzs";
statusArrive.TaskNumber = mst.S_EQ_NO;
statusArrive.LocationNum = mst.S_END_LOC;
- statusArrive.Time = DateTime.Now.ToString();
+ statusArrive.ArricalTime = DateTime.Now.ToString();
statusArrive.Status = status.ToString();
statusArrive.Rfid = mst.S_CNTR_CODE;
- statusArrive.Flag = flag;
- statusArrive.Info = info;
- statusArrive.Message = message;
-
+ var cntritem = ContainerHelper.GetCntrItemRel(mst.S_CNTR_CODE).FirstOrDefault();
+ if (cntritem!=null)
+ {
+ statusArrive.PartNumber = cntritem.S_ITEM_CODE;
+ statusArrive.PartDesc = cntritem.S_ITEM_NAME;
+ }
//statusArrives.Add(statusArrive);
statusarrive.data = statusArrive;
//寮�鍥炴姤
--
Gitblit v1.9.1