From 32a9985c4a3a326d4c30432374247cca5e172c93 Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期五, 04 七月 2025 16:55:49 +0800
Subject: [PATCH] 1
---
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/WmsController.cs | 8 ++--
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/Location.cs | 2
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs | 54 +++++++++++++++------------
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/smallMaterial.cs | 2
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/WCSHelper.cs | 3 +
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/WCSTask.cs | 2
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs | 4 +
7 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/WmsController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/WmsController.cs
index fc18b23..3dc0b70 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/WmsController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/WmsController.cs
@@ -34,11 +34,11 @@
[HttpPost]
- public TaskResponse autoSmallMaterial(smallMaterial model)
+ public TaskResponse smallMaterial(smallMaterial model)
{
- LogHelper.Info("autoSmallMaterial 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
- var res = TaskProcess.autoSmallMaterial(model);
- LogHelper.Info("autoSmallMaterial 杩斿洖锛� + JsonConvert.SerializeObject(res), "WMSAPI");
+ LogHelper.Info("smallMaterial 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
+ var res = TaskProcess.smallMaterial(model);
+ LogHelper.Info("smallMaterial 杩斿洖锛� + JsonConvert.SerializeObject(res), "WMSAPI");
return res;
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
index 38c4bf2..bd3fae7 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
@@ -27,6 +27,7 @@
var response = apiHelper.Post(baseUrl + "/api/om/order", request);
msg = $"[hanao-CreateAntsOrder] request={request} response={response}";
Console.WriteLine(msg);
+ LogHelper.Info("[hanao-CreateAntsOrder]" + msg);
if (response != "")
{
try
@@ -143,7 +144,8 @@
/// <summary>
/// TS璁㈠崟鍙傛暟
/// </summary>
- public AntsParasModel parameters { get; set; }
+ //public AntsParasModel parameters { get; set; }
+ public string parameters { get; set; }
/// <summary>
/// 璁㈠崟鐨勫叏灞�敮涓�D
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/Location.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/Location.cs
index 5b05e11..73c7c9a 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/Location.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/Location.cs
@@ -34,7 +34,7 @@
/// </summary>
public string S_LOCK_STATE { get; set; }
//鎵樼洏绫诲瀷
- public string S_TRAY_TYPE { get; set; }
+ //public string S_TRAY_TYPE { get; set; }
public int N_TYPE { get; set; }
/// <summary>
/// 0鏃�1鍏ュ簱閿�2鍑哄簱閿�3鍏跺畠閿�diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/WCSTask.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/WCSTask.cs
index 749123d..42654c2 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/WCSTask.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/WCSTask.cs
@@ -52,9 +52,9 @@
public string S_FRAME_CODE { get; set; }
public string S_OP_NAME { get; set; }
- public string S_WORKSHOP_NO { get; set; }
//瀛樺皬绫充换鍔″彿
+ public string S_WORKSHOP_NO { get; set; }
public string S_WORKSHOP_NAME { get; set; }
//public int N_START_LAYER { get; internal set; }
//public int N_END_LAYER { get; internal set; }
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/smallMaterial.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/smallMaterial.cs
index 8677b42..4a1bd12 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/smallMaterial.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/smallMaterial.cs
@@ -10,7 +10,7 @@
public string ts_name { get; set; }
public string createdNamne { get; set; }
- public parameters parameter { get; set; }
+ public parameters parameters { get; set; }
public string taskID { get; set; }
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
index 286d391..d03940d 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
@@ -379,12 +379,12 @@
{
Console.WriteLine($"浠诲姟mst {JsonConvert.SerializeObject(mst)}");
LogHelper.Info($"浠诲姟mst {JsonConvert.SerializeObject(mst)}", "浠诲姟");
- var startLoc = LocationHelper.GetLoc(mst.S_START_LOC);
- var endLoc = LocationHelper.GetLoc(mst.S_END_LOC);
- if (startLoc != null && endLoc != null)
+ //var startLoc = LocationHelper.GetLoc(mst.S_START_LOC);
+ //var endLoc = LocationHelper.GetLoc(mst.S_END_LOC);
+ if (mst.S_START_LOC != null && mst.S_END_LOC != null)
{
- string src = $"\"src\":\"{startLoc.S_AGV_SITE}\",";
- string dst = $"\"dst\":\"{endLoc.S_AGV_SITE}\"";
+ string src = $"\"src\":\"{mst.S_START_LOC}\",";
+ string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
string carrier_type_id = $"\"carrier_type_id\":\"-99\"";
string parmeS = "{";
string parmeD = "}";
@@ -396,7 +396,12 @@
model.priority = 1;
model.dead_line = DateTime.Now.ToString();
model.ts_name = mst.S_TYPE;
-
+ model.parameters = parme;
+ //model.parameters = new AntsParasModel {
+ // src = mst.S_START_LOC,
+ // dst = mst.S_END_LOC,
+ // carrier_type_id="-99"
+ //};
var res = RcsHelper.CreateAntsOrder(model);
if (res)
{
@@ -963,65 +968,66 @@
switch (model.ts_name)
{
case "p2p":
- startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameter.src).First();
+ startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameters.src).First();
if (startLoc == null || startLoc.N_LOCK_STATE != 0 || startLoc.C_ENABLE != "Y")
{
- Message = $"{model.parameter.src}搴撲綅宸茶閿佸畾!";
+ Message = $"{model.parameters.src}搴撲綅宸茶閿佸畾!";
}
- endLocStr = model.parameter.dst;
+ endLocStr = model.parameters.dst;
break;
case "p2a":
- startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameter.src).First();
+ startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameters.src).First();
if (startLoc == null || startLoc.N_LOCK_STATE != 0 || startLoc.C_ENABLE != "Y")
{
- Message = $"{model.parameter.src}搴撲綅宸茶閿佸畾!";
+ Message = $"{model.parameters.src}搴撲綅宸茶閿佸畾!";
}
- var endLoc = InWorkTransport(model.parameter.dst_area);
+ var endLoc = InWorkTransport(model.parameters.dst_area);
if (endLoc==null)
{
//濡傛灉娌℃壘鍒板氨绛夌涓�潯
- endLocStr = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.parameter.dst).OrderByDescending(a => a.N_ROW).ToList()[0].S_CODE;
+ endLocStr = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.parameters.dst).OrderByDescending(a => a.N_ROW).ToList()[0].S_CODE;
}
break;
case "a2p":
- startLoc = OutWorkTransport(model.parameter.src_area);
+ startLoc = OutWorkTransport(model.parameters.src_area);
if (startLoc==null)
{
- Message = $"{model.parameter.dst}搴撳尯娌℃湁鍙嚭璐т綅!";
+ Message = $"{model.parameters.dst}搴撳尯娌℃湁鍙嚭璐т綅!";
}
- endLocStr = model.parameter.dst;
+ endLocStr = model.parameters.dst;
break;
case "a2a":
- startLoc = OutWorkTransport(model.parameter.src_area);
+ startLoc = OutWorkTransport(model.parameters.src_area);
if (startLoc == null)
{
- Message = $"{model.parameter.src}搴撳尯娌℃湁鍙嚭璐т綅!";
+ Message = $"{model.parameters.src}搴撳尯娌℃湁鍙嚭璐т綅!";
}
- var endLoc1 = InWorkTransport(model.parameter.dst_area);
+ var endLoc1 = InWorkTransport(model.parameters.dst_area);
if (endLoc1 == null)
{
//濡傛灉娌℃壘鍒板氨绛夌涓�潯
- endLocStr = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.parameter.dst).OrderByDescending(a => a.N_ROW).ToList()[0].S_CODE;
+ endLocStr = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.parameters.dst).OrderByDescending(a => a.N_ROW).ToList()[0].S_CODE;
}
break;
case "p2u":
- startLoc = OutWorkTransport(model.parameter.src);
+ startLoc = OutWorkTransport(model.parameters.src);
if (startLoc == null)
{
- Message = $"{model.parameter.src}搴撳尯娌℃湁鍙嚭璐т綅!";
+ Message = $"{model.parameters.src}搴撳尯娌℃湁鍙嚭璐т綅!";
}
endLocStr = "";
break;
}
+ LogHelper.Info($"bigMaterial 鎺ユ敹鍙傛暟{JsonConvert.SerializeObject(model) }");
//鍒涘缓鎵樼洏璐т綅缁戝畾鍏崇郴
string trayCode = ContainerHelper.GenerateCntrNo();
//缁戝畾璧风偣璐т綅(浜х嚎)鍜岀墿鏂�- ContainerHelper.BindLocCntrsXm(startLoc.S_CODE, trayCode, model.parameter.sku, "", model.parameter.BatchNo, model.parameter.issueMode, model.parameter.num);
+ ContainerHelper.BindLocCntrsXm(startLoc.S_CODE, trayCode, model.parameters.sku, "", model.parameters.BatchNo, model.parameters.issueMode, model.parameters.num);
var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
//鍒涘缓浠诲姟
@@ -1070,7 +1076,7 @@
}
- public static TaskResponse autoSmallMaterial(smallMaterial model) {
+ public static TaskResponse smallMaterial(smallMaterial model) {
var db = new SqlHelper<Location>().GetInstance();
string Message = null;
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/WCSHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/WCSHelper.cs
index adccf23..76d0997 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/WCSHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/WCSHelper.cs
@@ -1,4 +1,5 @@
锘縰sing HH.WCS.XiaoMi.util;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -140,7 +141,7 @@
//N_CNTR_COUNT = cntrCount
};
-
+ LogHelper.Info($"WCSTask鍙傛暟锛�====={JsonConvert.SerializeObject(TN_Task)}");
return CreateTask(TN_Task);
}
//灏忕背璐ф灦
--
Gitblit v1.9.1