From 214000e2677e063284ba21e05af38718f60de9a2 Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期一, 07 七月 2025 14:00:48 +0800
Subject: [PATCH] 1
---
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs | 5 ++---
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs | 4 ++--
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/WCSHelper.cs | 3 ++-
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/LocationHelper.cs | 2 ++
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs
index bc95d41..2aaffe6 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs
@@ -228,8 +228,8 @@
{
//1琛ㄧず鏄惁鐢宠缁曡矾
var endLoc = LocationHelper.GetLoc(wcsTask.S_END_LOC);
- if (endLoc.N_CURRENT_NUM == 0)
- {
+ LogHelper.Info($"applyReroute 鐢宠鏄惁缁曡矾璐т綅鍙傛暟{JsonConvert.SerializeObject(endLoc)}");
+ if (endLoc.N_CURRENT_NUM == 0&& endLoc.S_LOCK_STATE=="鍏ュ簱閿�) {
result.resultCode = 0;
result.success = true;
result.msg = "鐩爣璐т綅宸茬┖";
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 818df29..d4d5074 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
@@ -460,9 +460,8 @@
{
var result = false;
var trayCodes = cntrs;
- //var taskNo = DateTime.Now.Ticks.ToString();
- var taskNo = orderName;
-
+ var taskNo = DateTime.Now.Ticks.ToString();
+
var res = WCSHelper.CreateTaskDj(taskNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, orderName,trayCarryCount, startLayer, endLayer);
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/LocationHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/LocationHelper.cs
index c63ebbd..07d6121 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/LocationHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/LocationHelper.cs
@@ -1,4 +1,5 @@
锘縰sing HH.WCS.XiaoMi.util;
+using Newtonsoft.Json;
using Opc.Ua;
using SqlSugar;
using System;
@@ -342,6 +343,7 @@
var res = false;
var db = new SqlHelper<object>().GetInstance();
var model = db.Queryable<Location>().Where(a => a.S_CODE == loc).First();
+ LogHelper.Info("LockLoc 璐т綅鍙傛暟=====锛� + JsonConvert.SerializeObject(model));
if (model != null && model.S_LOCK_STATE.Trim() == "鏃�)
{
model.N_LOCK_STATE = lockState;
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 698f3d2..5ce86b3 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/WCSHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/WCSHelper.cs
@@ -127,7 +127,8 @@
var endLoc = LocationHelper.GetLocation(to);
WCSTask TN_Task = new WCSTask()
{
- S_CODE = GenerateTaskNo(),
+ //S_CODE = GenerateTaskNo(),
+ S_CODE = orderName,
S_START_AREA = fromLoc.S_AREA_CODE,
S_END_AREA = endLoc.S_AREA_CODE,
S_START_LOC = from,
--
Gitblit v1.9.1