From 00b6105b34870f6f5a33551534d0088f3f741906 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 07 七月 2025 17:33:53 +0800
Subject: [PATCH] 退库修改
---
wms/TaskHelper.cs | 100 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 89 insertions(+), 11 deletions(-)
diff --git a/wms/TaskHelper.cs b/wms/TaskHelper.cs
index 05a3184..d983393 100644
--- a/wms/TaskHelper.cs
+++ b/wms/TaskHelper.cs
@@ -1,6 +1,8 @@
-锘縰sing HH.WCS.ZhongCeJinTan.device;
+锘縰sing HH.WCS.ZhongCeJinTan.api;
+using HH.WCS.ZhongCeJinTan.device;
using HH.WCS.ZhongCeJinTan.dispatch;
using HH.WCS.ZhongCeJinTan.util;
+using ICSharpCode.SharpZipLib.Zip;
using Newtonsoft.Json;
using SqlSugar;
using System;
@@ -12,6 +14,8 @@
using System.Xml.Linq;
using static HH.WCS.ZhongCeJinTan.util.Settings;
using static HH.WCS.ZhongCeJinTan.wms.WcsModel;
+
+
namespace HH.WCS.ZhongCeJinTan.wms
{
@@ -304,12 +308,14 @@
{
LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
- LogHelper.Info($"浠诲姟{task1.S_OP_CODE}鍒涘缓鎴愬姛", "浠诲姟");
+ LogHelper.Info($"浠诲姟{task1.S_CODE}鍒涘缓鎴愬姛", "浠诲姟");
var db = new SqlHelper<object>().GetInstance();
db.Updateable(operation).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
+
+ TaskHelper.opMesTask(task1, 0);
}
else {
- LogHelper.Info($"浠诲姟{task1.S_OP_CODE}鍒涘缓澶辫触", "浠诲姟");
+ LogHelper.Info($"浠诲姟{task1.S_CODE}鍒涘缓澶辫触", "浠诲姟");
}
}
@@ -413,12 +419,14 @@
if (CreateTask(task1) && CreateTask(task2))
{
- LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
- LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
- LocationHelper.LockLoc(operation.CONNECTION, "鍏朵粬閿�, 3);
+ //LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
+ //LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
+ //LocationHelper.LockLoc(operation.CONNECTION, "鍏朵粬閿�, 3);
LogHelper.Info($"浠诲姟{task1.S_CODE},{task2.S_CODE}鍒涘缓鎴愬姛", "浠诲姟");
var db = new SqlHelper<object>().GetInstance();
db.Updateable(operation).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
+
+ TaskHelper.opMesTask(task1, 0);
}
else
{
@@ -440,7 +448,7 @@
var count = LocationHelper.GetConnectionTaskCount(operation.CONNECTION);
LogHelper.Info($"CreateOneTask 浣滀笟:{operation.S_CODE},鎺ラ┏浣�{operation.CONNECTION}锛屼换鍔℃暟閲忥細{count}", "浠诲姟");
- if (count<4)
+ if (count<=2)
{
// 浠诲姟1
@@ -525,12 +533,14 @@
if (CreateTask(task1) && CreateTask(task2))
{
- LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
- LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
- LocationHelper.LockLoc(operation.CONNECTION, "鍏ュ簱閿�, 1);
+ //LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
+ //LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
+ //LocationHelper.LockLoc(operation.CONNECTION, "鍏ュ簱閿�, 1);
LogHelper.Info($"浠诲姟{task1.S_CODE},{task2.S_CODE}鍒涘缓鎴愬姛", "浠诲姟");
var db = new SqlHelper<object>().GetInstance();
db.Updateable(operation).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
+
+ TaskHelper.opMesTask(task2, 0);
}
else
{
@@ -576,7 +586,53 @@
};
return db.Insertable(action).ExecuteCommand() > 0;
}
- internal static WmsTaskAction GetActionRecord(string taskNo,string action)
+
+ internal static bool opMesTask(WMSTask task, int state)
+ {
+
+ HttpHelper apiHelper = new HttpHelper();
+ string baseUrl = Settings.MesApiAddres;
+ try
+ {
+
+ var interact = new
+ {
+ taskNo = task.S_OP_CODE,//浠诲姟鍙�+ updater = "WMS",// 鎿嶄綔浜�濡俉MS/MES绛�+ endStock = task.S_END_LOC,//缁堢偣
+ taskStatus = state,//0锛氬垵濮嬬姸鎬侊紝1锛氳繘琛屼腑锛�锛氬畬鎴愶紝3锛氫换鍔″彇娑�+ updateTime = DateTime.Now.ToString()//鎿嶄綔鏃堕棿
+ };
+ LogHelper.Info("Mes鏇存柊浠诲姟鐘舵� 鍦板潃淇℃伅:" + baseUrl + "updateTask", "鍥炴姤Mes浠诲姟");
+ LogHelper.Info("Mes鏇存柊浠诲姟鐘舵� 鍙傛暟淇℃伅:" + JsonConvert.SerializeObject(interact), "鍥炴姤Mes浠诲姟");
+ var result = apiHelper.Post(baseUrl + "updateTask", JsonConvert.SerializeObject(interact));
+ LogHelper.Info("Mes鏇存柊浠诲姟鐘舵� 杩斿洖淇℃伅:" + JsonConvert.SerializeObject(result), "鍥炴姤Mes浠诲姟");
+ if (!string.IsNullOrEmpty(result))
+ {
+ var res = JsonConvert.DeserializeObject<MesTaskReturn>(result);
+ if (res.success && res.code == "0")
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ LogHelper.Info("Mes鏇存柊浠诲姟鐘舵� 杩斿洖淇℃伅涓虹┖", "鍥炴姤Mes浠诲姟");
+ return false;
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Info("Mes鏇存柊浠诲姟鐘舵�寮傚父"+ex.Message, "鍥炴姤Mes浠诲姟");
+ return false;
+ }
+
+ }
+ internal static WmsTaskAction GetActionRecord(string taskNo,string action)
{
var db = new SqlHelper<WmsTaskAction>().GetInstance();
@@ -741,6 +797,15 @@
db.Deleteable<LocCntrRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
}
+
+
+ if (LocationHelper.GetErroArea(task.S_END_AREA)) {
+ db.Deleteable<Container>().Where(it => it.S_CODE == task.S_CNTR_CODE).ExecuteCommand();
+ db.Deleteable<LocCntrRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
+ db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
+ }
+
+
}
@@ -999,6 +1064,19 @@
return db.Queryable<InPri>().Where(a=>a.Enable=="Y") .ToList();
}
+ /// <summary>
+ /// 鑾峰彇鍑哄簱鎻愰珮浼樺厛绾ц〃
+ /// </summary>
+ /// <returns></returns>
+ internal static OutMinutePriority GetOutMinutePriority()
+ {
+
+ var db = new SqlHelper<object>().GetInstance();
+
+ return db.Queryable<OutMinutePriority>().Where(a => a.Enable == "Y").First();
+ }
+
+
/// <summary>
--
Gitblit v1.9.1