From a206dda817a9f9615db1fa52e3ac193af9ac4a92 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 11 四月 2025 10:27:24 +0800
Subject: [PATCH] 1
---
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs | 10 +++++
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/负极叫料.vue | 5 +-
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 2
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs | 43 +++++++++++----------
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/正极叫料.vue | 17 ++++++--
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 6 ++
6 files changed, 53 insertions(+), 30 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
index 8e811ea..63d62be 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
@@ -153,11 +153,18 @@
return;
}
let formDataParam = {
- dTaskId: 2,
- productCode: productCode,
- orderNo: orderNo,
- number: availableQuantity > 4 ? 4 : availableQuantity,
- inputValue: inputValue,
+ dTaskId: this.generateUUID(),
+ productCode: productCode,
+ orderNo: orderNo,
+ taskNo:2,
+ number: availableQuantity > 4 ? 4 : availableQuantity,
+ inputValue: inputValue,
+ DTaskId: this.generateUUID(),
+ ProductCode: productCode,
+ OrderNo: orderNo,
+ Number: availableQuantity > 4 ? 4 : availableQuantity,
+ InputValue: inputValue,
+ TaskType: "姝ｆ瀬"
// ...鍏朵粬闇�瑕佷紶閫掔殑鍙傛暟
};
this.$u.post('/api/PDA/AddCZTask', formDataParam).then(res => {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
index 197706b..6abbbb0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
@@ -159,12 +159,13 @@
return;
}
let formDataParam = {
- dTaskId: 2,
+ dTaskId: this.generateUUID(),
productCode: productCode,
orderNo: orderNo,
+ taskNo:2,
number: availableQuantity > 4 ? 4 : availableQuantity,
inputValue: inputValue,
- DTaskId: 2,
+ DTaskId: this.generateUUID(),
ProductCode: productCode,
OrderNo: orderNo,
Number: availableQuantity > 4 ? 4 : availableQuantity,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
index b342e89..690f02c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
@@ -19,6 +19,8 @@
using SqlSugar;
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -95,6 +97,14 @@
public string TargetAddress { get; set; }
/// <summary>
+ ///鐗╂枡鏉＄爜
+ /// </summary>
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡鏉＄爜")]
+ [ExporterHeader(DisplayName = "鐗╂枡鏉＄爜")]
+ [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鐗╂枡鏉＄爜")]
+ public string Barcode { get; set; }
+ /// <summary>
/// 褰撳墠浣嶇疆
/// </summary>
[ImporterHeader(Name = "褰撳墠浣嶇疆")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index 35852a5..3d6ae2b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -58,7 +58,7 @@
}
[HttpPost, HttpGet, Route("FinishTask"),AllowAnonymous]
- public Task<WebResponseContent> FinishTask(CZTaskFinshDto taskFinshDto)
+ public Task<WebResponseContent> FinishTask([FromBody] CZTaskFinshDto taskFinshDto)
{
return _taskInfoService.FinishTask(taskFinshDto);
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs"
index 37cb8f7..ffe6c58 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs"
@@ -191,24 +191,24 @@
try
{
// 璇诲彇浠诲姟浜や簰鍜岄噸缃氦浜掔殑鐘舵��
- int taskInteractive = agv.Communicator.Read<int>(taskInteractiveR); // 1琛ㄧず鏀跺埌
- int taskInteractiveW = agv.Communicator.Read<int>(taskInteractiveW1); // 0鍒濆/1涓嬪彂/2鍙栨秷/3鏇存敼
- int resetTaskInteractiveW = agv.Communicator.Read<int>(resetTaskW);
- int resetTaskInteractiver = agv.Communicator.Read<int>(resetTaskInteractiveR);
+ int taskInteractive = agv.Communicator.Read<Int16>(taskInteractiveR); // 1琛ㄧず鏀跺埌
+ int taskInteractiveW = agv.Communicator.Read<Int16>(taskInteractiveW1); // 0鍒濆/1涓嬪彂/2鍙栨秷/3鏇存敼
+ int resetTaskInteractiveW = agv.Communicator.Read<Int16>(resetTaskW);
+ int resetTaskInteractiver = agv.Communicator.Read<Int16>(resetTaskInteractiveR);
// 澶勭悊浠诲姟浜や簰W鍜岄噸缃氦浜扺涓嶄负0鐨勬儏鍐�
if (isTrue1 && name1 == agv.DeviceName)
{
if (taskInteractiveW != 0 || resetTaskInteractiveW != 0 || taskInteractive != 0)
{
- agv.Communicator.Write(resetTaskW, 1);
+ agv.Communicator.Write<UInt16>(resetTaskW, 1);
Task.Delay(2000).Wait();
- resetTaskInteractiveW = agv.Communicator.Read<int>(resetTaskW);
+ resetTaskInteractiveW = agv.Communicator.Read<Int16>(resetTaskW);
if (resetTaskInteractiveW == 1)
{
- agv.Communicator.Write(resetTaskW, 0);
- agv.Communicator.Write(taskInteractiveW1, 0);
+ agv.Communicator.Write<UInt16>(resetTaskW, 0);
+ agv.Communicator.Write<UInt16>(taskInteractiveW1, 0);
Task.Delay(2000).Wait();
}
return;
@@ -220,14 +220,14 @@
// 濡傛灉閲嶇疆浜や簰R涓�1锛屽垯閲嶇疆浠诲姟浜や簰W
if (resetTaskInteractiver == 1)
{
- agv.Communicator.Write(taskInteractiveW1, 0);
+ agv.Communicator.Write<UInt16>(taskInteractiveW1, 0);
for (int i = 0; i < 5; i++)
{
Task.Delay(300).Wait(); // 鐢═ask.Delay浠ｆ浛Thread.Sleep锛屼互閬垮厤绾跨▼闃诲
- int agvNumber = agv.Communicator.Read<int>(taskInteractiveW1);
+ int agvNumber = agv.Communicator.Read<Int16>(taskInteractiveW1);
if (agvNumber != 0)
{
- agv.Communicator.Write(taskInteractiveW1, 0);
+ agv.Communicator.Write<UInt16>(taskInteractiveW1, 0);
}
else
{
@@ -251,7 +251,8 @@
// 妫�鏌ヤ换鍔D鏄惁鍐欏叆姝ｇ‘
string taskId = agv.Communicator.Read<string>(taskID);
- if (taskId != agvTask.TaskNum.ToString())
+ string numberPart = taskId.Split('-')[1];
+ if (numberPart != agvTask.TaskNum.ToString())
{
throw new Exception($"缁橝GV鍐欏叆浠诲姟澶辫触,浠诲姟鍙穥agvTask.TaskNum}");
}
@@ -260,19 +261,19 @@
if (string.IsNullOrEmpty(rel))
{
// 鍐欏叆浠诲姟纭淇″彿1
- agv.Communicator.Write(taskInteractiveW1, 1);
+ agv.Communicator.Write<UInt16>(taskInteractiveW1, 1);
Task.Delay(1000).Wait();
// 璇诲彇AGV鐨勭‘璁や俊鍙�
- int readTask1Ok = agv.Communicator.Read<int>(taskInteractiveR);
+ int readTask1Ok = agv.Communicator.Read<Int16>(taskInteractiveR);
if (readTask1Ok == 1)
{
// 鍐欏叆WCS鐨勭‘璁や俊鍙�0
- agv.Communicator.Write(taskInteractiveW1, 0);
+ agv.Communicator.Write<UInt16>(taskInteractiveW1, 0);
Task.Delay(2000).Wait();
// 鍐嶆璇诲彇AGV鐨勭‘璁や俊鍙�
- int readTask0Ok = agv.Communicator.Read<int>(taskInteractiveR);
+ int readTask0Ok = agv.Communicator.Read<Int16>(taskInteractiveR);
if (readTask0Ok == 0)
{
// 鏇存柊浠诲姟鐘舵�佸苟淇濆瓨
@@ -292,7 +293,7 @@
else if (readTask1Ok == 11)
{
// 澶勭悊浠诲姟寮傚父鎯呭喌
- agv.Communicator.Write(taskInteractiveW1, 0);
+ agv.Communicator.Write<UInt16>(taskInteractiveW1, 0);
Task.Delay(2000).Wait();
int readTask0Error = agv.Communicator.Read<int>(taskInteractiveR);
@@ -342,7 +343,7 @@
public static string TaskWrite(AGV client, Dt_Task agvTask, AGVJobEnum jobEnum)
{
List<byte> sendData = new List<byte>();
- string tmp = agvTask.TaskNum.ToString();
+ string tmp = "KH-" + agvTask.TaskNum.ToString();
List<byte> taskID = Encoding.Default.GetBytes(tmp).ToList();//浠诲姟ID
taskID.Insert(0, 30);
taskID.Insert(1, Convert.ToByte(tmp.Length));
@@ -377,11 +378,11 @@
Array.Reverse(taskType);
sendData.AddRange(taskType);
- List<byte> containerType = Encoding.Default.GetBytes(agvTask.PalletCode).ToList();
+ List<byte> containerType = Encoding.Default.GetBytes(agvTask.Barcode).ToList();
containerType.Insert(0, 30);
- containerType.Insert(1, Convert.ToByte(agvTask.PalletCode.Length));
+ containerType.Insert(1, Convert.ToByte(agvTask.Barcode.Length));
- for (int i = 0; i < 30 - agvTask.PalletCode.Length; i++)
+ for (int i = 0; i < 30 - agvTask.Barcode.Length; i++)
{
containerType.Add(0);
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 2e871c8..6d62fda 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -52,6 +52,9 @@
}
public Task Execute(IJobExecutionContext context)
+
+
+
{
try
{
@@ -198,11 +201,12 @@
CurrentAddress = currentAddress,
SourceAddress = currentAddress,
TaskState = targetAddress != "WaitBind" ? (int)TaskInStatusEnum.InNew : (int)TaskInStatusEnum.InPending,
- TaskType = (int)TaskInboundTypeEnum.Inbound,
+ TaskType = (int)TaskOutboundTypeEnum.Outbound,
Grade = 1,
PalletCode = palletCode,
TargetAddress = targetAddress,
NextAddress = targetAddress,
+ Barcode = "",
Roadway = $"{taskType}AGV",
WMSId = 0,
Remark = remark
--
Gitblit v1.9.3