From 91be499ac83725c769f2283054ed326d7e055453 Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期二, 01 七月 2025 17:27:05 +0800
Subject: [PATCH] xiaomi
---
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs | 223 +++++++++++++++++++++----------------------------------
1 files changed, 84 insertions(+), 139 deletions(-)
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 1a4c96a..3aa07fd 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
@@ -1870,85 +1870,22 @@
}
-
- /// <summary>
- /// 灏忎欢
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- internal static TaskResponse smallMaterial(smallMaterial model)
- {
- try
- {
- var startLoc = new Location();
- var endLoc = new Location();
- string Message = null;
-
- if (model.taskType=="鑷姩")
- {
-
- autoSmallMaterial(model);
-
-
- }
- else if (model.taskType == "浜哄伐")
- {
- artificialSmallMaterial(model);
-
- }
-
-
-
-
-
-
-
- var result = new TaskResponse();
- if (Message != null)
- {
- result = new TaskResponse
- {
- header = new ResponseHead { code = 0, desc = Message }
- };
- }
- else
- {
- result = new TaskResponse
- {
- header = new ResponseHead { code = 200, desc = "SUCCESS" },
- body = new ResponseBody
- {
- msg = "success",
- app_name = "Guozi client",
- data = new List<ResponseData> { new ResponseData { in_order_id = model.taskID } },
- version = ""
- }
- };
- }
- return result;
-
- }
- catch (Exception ex)
- {
- Console.WriteLine("bigMaterial:" + ex.Message + ex.StackTrace);
- LogHelper.Error("bigMaterial:" + ex.Message, ex);
- throw;
- }
-
- }
//鑷姩 鎷嗗垎
- private static string autoSmallMaterial(smallMaterial model) {
+ public static TaskResponse autoSmallMaterial(smallMaterial model) {
var db = new SqlHelper<Location>().GetInstance();
string Message = null;
- //鎷嗗垎鎴愪袱鏉′换鍔★紝涓�潯鏄枡鏋跺埌鎸囧畾鐨勭紦瀛樺尯锛屾枡鏋朵笂鐨勬墭鐩樺埌鎸囧畾鐨勫伐浣嶏紙灏忕背wcs浼狅級涓�澶�+ //鎷嗗垎鎴愪袱鏉′换鍔★紝涓�潯鏄枡鏋跺埌鎸囧畾鐨勭紦瀛樺尯锛屼簩鏄枡鏋朵笂鐨勬墭鐩樺埌鎸囧畾鐨勫伐浣嶏紙灏忕背wcs浼狅級涓�澶� var startFrame = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == model.parameters[0].src).First();
var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == startFrame.S_FRAME_CODE).First();
if (startLoc == null || startLoc.N_LOCK_STATE != 0)
{
- Message = $"{model.parameters[0].src}搴撲綅宸茶閿佸畾!";
+ return new TaskResponse
+ {
+ header = new ResponseHead { code = 0, desc = $"{model.parameters[0].src}搴撲綅宸茶閿佸畾!" }
+ };
}
var endReservoirs = Settings.ReservoirAreas.Where(s => s.areaName == model.routeType).FirstOrDefault();
var endLoc = TaskProcess.InWorkTransport(endReservoirs.areaCode);
@@ -1961,7 +1898,10 @@
var res = TaskProcess.CreateTransportHj(startLoc.S_CODE, endLoc.S_CODE, model.ts_name, locCntrRel.S_FRAME_CODE, 1, 1);
if (!res)
{
- return Message="鑷姩涓婄嚎浠诲姟鍒涘缓澶辫触";
+ return new TaskResponse
+ {
+ header = new ResponseHead { code = 0, desc = "鑷姩涓婄嚎浠诲姟鍒涘缓澶辫触" }
+ };
}
}
//鏂欐灦涓婄殑鎵樼洏鍒版寚瀹氱殑宸ヤ綅
@@ -1970,83 +1910,88 @@
var startLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.src).First();
if (startLocHj == null || startLocHj.N_LOCK_STATE != 0)
{
- Message = $"{model.parameters[0].src}搴撲綅宸茶閿佸畾!";
+ Message = Message==null? $"{model.parameters[0].src}搴撲綅宸茶閿佸畾!": Message+ $"{model.parameters[0].src}搴撲綅宸茶閿佸畾!";
}
- //璐ф灦涓婄殑璐у垽鏂竴涓嬭揣鏋舵湁娌℃湁閿�- var startFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.src).First();
- if (startFrameParent != null)
+ else
{
- var startLocParent = db.Queryable<Location>().Where(a => a.S_CODE == startFrameParent.S_FRAME_CODE).First();
- if (startLocParent == null || startLocParent.N_LOCK_STATE != 0)
+ //璐ф灦涓婄殑璐у垽鏂竴涓嬭揣鏋舵湁娌℃湁閿�+ var startFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.src).First();
+ if (startFrameParent != null)
{
- Message = $"{startFrameParent.S_FRAME_CODE}搴撲綅宸茶閿佸畾!";
+ var startLocParent = db.Queryable<Location>().Where(a => a.S_CODE == startFrameParent.S_FRAME_CODE).First();
+ if (startLocParent == null || startLocParent.N_LOCK_STATE != 0)
+ {
+ return new TaskResponse
+ {
+ header = new ResponseHead { code = 0, desc = $"{startFrameParent.S_FRAME_CODE}璐ф灦宸茶閿佸畾!" }
+ };
+ }
}
+ var endLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.dst).First();
+ if (endLocHj == null || endLocHj.N_LOCK_STATE != 0 || endLocHj.C_ENABLE != "Y")
+ {
+ //搴旇缁曡矾
+
+ Message = Message == null ? $"{parameter.dst}搴撲綅宸茶閿佸畾!" : Message + $"{parameter.dst}搴撲綅宸茶閿佸畾!";
+ }
+ else
+ {
+ //璐ф灦涓婄殑璐у垽鏂竴涓嬭揣鏋舵湁娌℃湁閿�+ var endFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.dst).First();
+ if (endFrameParent != null)
+ {
+ var endLocParent = db.Queryable<Location>().Where(a => a.S_CODE == endFrameParent.S_FRAME_CODE).First();
+ if (endLocParent == null || endLocParent.N_LOCK_STATE != 0)
+ {
+ return new TaskResponse
+ {
+ header = new ResponseHead { code = 0, desc = $"{endFrameParent.S_FRAME_CODE}璐ф灦宸茶閿佸畾!" }
+ };
+ }
+ }
+ //鍒涘缓鍒扮紦瀛樺尯浠诲姟
+ var locCntrRel1 = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLocHj.S_CODE).First();
+ //鍒涘缓浠诲姟
+ LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLocHj.S_CODE}缁堢偣:{endLocHj.S_CODE}", model.ts_name);
+ var res = TaskProcess.CreateTransport(startLocHj.S_CODE, endLocHj.S_CODE, model.ts_name, locCntrRel1.S_CNTR_CODE, 1, 1);
+ if (!res)
+ {
+ return new TaskResponse
+ {
+ header = new ResponseHead { code = 0, desc = "鑷姩涓婄嚎浠诲姟2鍒涘缓澶辫触" }
+ };
+ }
+
+ }
+
}
-
-
-
-
}
-
- return Message;
- //switch (model.ts_name)
- //{
- // case "p2p":
- // startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameter.src).First();
- // if (startLoc == null || startLoc.N_LOCK_STATE != 0 || startLoc.C_ENABLE != "Y")
- // {
- // Message = $"{model.parameter.src}搴撲綅宸茶閿佸畾!";
- // }
-
- // endLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameter.dst).First();
- // if (startLoc == null || startLoc.N_LOCK_STATE != 0 || startLoc.C_ENABLE != "Y")
- // {
- // Message = $"{model.parameter.dst}搴撲綅宸茶閿佸畾!";
- // }
-
- // break;
- // case "p2a":
- // startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameter.src).First();
- // if (startLoc == null || startLoc.N_LOCK_STATE != 0 || startLoc.C_ENABLE != "Y")
- // {
- // Message = $"{model.parameter.src}搴撲綅宸茶閿佸畾!";
- // }
- // endLoc = InWorkTransport(model.parameter.dst);
- // if (endLoc == null)
- // {
- // Message = $"{model.parameter.dst}搴撳尯娌℃湁鍙叆璐т綅!";
- // }
- // break;
- // case "a2p":
- // startLoc = OutWorkTransport(model.parameter.src);
- // if (startLoc == null)
- // {
- // Message = $"{model.parameter.dst}搴撳尯娌℃湁鍙嚭璐т綅!";
- // }
-
- // endLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameter.dst).First();
- // if (startLoc == null || startLoc.N_LOCK_STATE != 0 || startLoc.C_ENABLE != "Y")
- // {
- // Message = $"{model.parameter.dst}搴撲綅宸茶閿佸畾!";
- // }
- // break;
- //}
-
- //var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
- ////鍒涘缓浠诲姟
- //LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLoc.S_CODE}缁堢偣:{endLoc.S_CODE}", model.ts_name);
- //var res = TaskProcess.CreateTransport(startLoc.S_CODE, endLoc.S_CODE, model.ts_name, locCntrRel.S_CNTR_CODE, 1, 1);
- //if (!res)
- //{
- // return new TaskResponse
- // {
- // header = new ResponseHead { code = 1, desc = Message }
- // };
-
- //}
+ var result = new TaskResponse();
+ if (Message != null)
+ {
+ result = new TaskResponse
+ {
+ header = new ResponseHead { code = 0, desc = Message }
+ };
+ }
+ else
+ {
+ result = new TaskResponse
+ {
+ header = new ResponseHead { code = 200, desc = "SUCCESS" },
+ body = new ResponseBody
+ {
+ msg = "success",
+ app_name = "Guozi client",
+ data = new List<ResponseData> { new ResponseData { in_order_id = model.taskID } },
+ version = ""
+ }
+ };
+ }
+ return result;
}
//浜哄伐 涓嶆媶鍒�- private static void artificialSmallMaterial(smallMaterial model)
+ public static void artificialSmallMaterial(smallMaterial model)
{
var db = new SqlHelper<Location>().GetInstance();
--
Gitblit v1.9.1