From 023358a9d414eb7215464948bffb5979ebb97386 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 21 七月 2025 17:27:54 +0800
Subject: [PATCH] 123
---
ams/Hanhe.iWCS.JingmenGLMNorthProtocol/WMSHelper.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/WMSHelper.cs
index 728deb5..b490081 100644
--- a/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/WMSHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/WMSHelper.cs
@@ -93,6 +93,10 @@
/// 鎵樼洏鐮� /// </summary>
public string trayCode { get; set; }
+ /// <summary>
+ /// 鎵樼洏绫诲瀷
+ /// </summary>
+ public string trayType { get; set; }
public string locationGear { get; set; }
public List<ItemData> data { get; set; }
//public List<TimeData> TimeData { get; set; }
@@ -106,6 +110,7 @@
public string endBit { get; set; }
public string trayDimension { get; set; }
public string needCreateAMSTask { get; set; }
+ public string TrayType { get; set; }
public int priority { get; set; }
//public int isFull { get; set; }
public string projectCode { get; set; }
@@ -119,6 +124,7 @@
public string endBit { get; set; }
public string trayDimension { get; set; }
public string needCreateAMSTask { get; set; }
+ public string trayType { get; set; }
public int priority { get; set; }
//public int isFull { get; set; }
public string projectCode { get; set; }
@@ -426,6 +432,7 @@
//CMMLog.Info($"WMSIn-{startBit}:鏌ヨ鏉′欢锛歩tem_code={info.materialCode},璇诲嚭 ERPItemTable 琛ㄦ暟鎹负锛歿JsonConvert.SerializeObject(erpItemTableInfo)}");
model.locationGear = info.secondNg.ToString();
model.trayCode = info.trayCode;
+ model.trayType = info.trayType == "1" ? "鐢板瓧鎵� : info.trayType == "2" ? "宸濆瓧鎵� : "";
//string product = !string.IsNullOrEmpty(info.productType) ? info.productType : erpItemTableInfo.item_spec;
model.data.Add(new ItemData()
{
@@ -497,7 +504,7 @@
return result;
}
- public static bool WMSOut(string endBit, string ItemCode) {
+ public static bool WMSOut(string endBit, string ItemCode,string trayType) {
//endBit = endBit.Substring(0, 9);
bool result = false;
HardwareAccessObject hao = HardwareAccessHelper.Instance.GetEquipmentsHAO(Constants.WMS_DEVICE_TYPE_WMS);
@@ -508,6 +515,7 @@
model.endBit = endBit;
model.projectCode = "glm";
model.needCreateAMSTask = "Y";
+ model.TrayType = trayType;
//model.Data = new List<ItemData>();
//if (!string.IsNullOrEmpty(ItemCode))
//{
@@ -547,7 +555,7 @@
return result;
}
- public static bool WMSEmptyOut(string endBit, string ItemCode, ref string taskNo, ref string trayCode)
+ public static bool WMSEmptyOut(string endBit, string ItemCode,string trayType, ref string taskNo, ref string trayCode)
{
bool result = false;
HardwareAccessObject hao = HardwareAccessHelper.Instance.GetEquipmentsHAO(Constants.WMS_DEVICE_TYPE_WMS);
@@ -559,6 +567,7 @@
model.endBit = endBit;
model.projectCode = "glm";
model.needCreateAMSTask = "Y";
+ model.trayType = trayType;
string msgData = JsonConvert.SerializeObject(model);
string reqStr = "鐗╂枡鍚�" + ItemCode + ";";
string feedback = "";
--
Gitblit v1.9.1