From d239f2cccb5b84d52c8c202557ea8e75cc6ab984 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 14 九月 2024 16:51:17 +0800
Subject: [PATCH] 任务管理新增功能增加分配拆垛工位功能;调整分拣码垛页面,更改拆垛机器人属性
---
Admin.NET/WCS.Application/Entity/WcsCheckTask.cs | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs b/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
index fff6418..127350a 100644
--- a/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
@@ -15,11 +15,23 @@
public class WcsCheckTask : EntityBaseData
{
/// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "TaskNo", ColumnDescription = "浠诲姟鍙�", Length = 20)]
+ public string? TaskNo { get; set; }
+
+ /// <summary>
/// WMS涓嬪彂鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "OrderNo", ColumnDescription = "WMS涓嬪彂鍗曞彿", Length = 20)]
public string? OrderNo { get; set; }
-
+
+ /// <summary>
+ /// 鏈哄櫒浜虹被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "RoboatType", ColumnDescription = "鏈哄櫒浜虹被鍨�", Length = 5)]
+ public PLCTypeEnum? RoboatType { get; set; }
+
/// <summary>
/// 鏈哄櫒浜虹紪鍙�
/// </summary>
@@ -29,8 +41,8 @@
/// <summary>
/// 鍒嗘嫞绾跨紪鍙�
/// </summary>
- [SugarColumn(ColumnName = "LineNO", ColumnDescription = "鍒嗘嫞绾跨紪鍙�", Length = 5)]
- public string? LineNO { get; set; }
+ [SugarColumn(ColumnName = "LineNo", ColumnDescription = "鍒嗘嫞绾跨紪鍙�", Length = 5)]
+ public string? LineNo { get; set; }
/// <summary>
/// 鐮佺洏宸ヤ綅鍙�
@@ -39,10 +51,22 @@
public string? Port { get; set; }
/// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "LotNo", ColumnDescription = "鎵规鍙�", Length = 50)]
+ public string? LotNo { get; set; }
+
+ /// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
[SugarColumn(ColumnName = "SkuNo", ColumnDescription = "鐗╂枡缂栫爜", Length = 20)]
public string? SkuNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "SkuName", ColumnDescription = "鐗╂枡鍚嶇О", Length = 50)]
+ public string? SkuName { get; set; }
/// <summary>
/// 瑙勬牸
@@ -71,14 +95,14 @@
/// <summary>
/// 鎻掔爜鏁伴噺
/// </summary>
- [SugarColumn(ColumnName = "BoxInsert", ColumnDescription = "鎻掔爜鏁伴噺", Length = 20)]
- public string? BoxInsert { get; set; }
+ [SugarColumn(ColumnName = "BoxInsert", ColumnDescription = "鎻掔爜鏁伴噺")]
+ public int? BoxInsert { get; set; }
/// <summary>
/// 鎵樼洏涓婄鏁伴噺
/// </summary>
- [SugarColumn(ColumnName = "BoxCount", ColumnDescription = "鎵樼洏涓婄鏁伴噺", Length = 20)]
- public string? BoxCount { get; set; }
+ [SugarColumn(ColumnName = "BoxCount", ColumnDescription = "鎵樼洏涓婄鏁伴噺")]
+ public int? BoxCount { get; set; }
/// <summary>
/// 鎬荤鏁�/璁″垝绠辨暟/棰勪及绠辨暟
@@ -99,15 +123,9 @@
public DateTime? BindTime { get; set; }
/// <summary>
- /// 缁戝畾浜�
+ /// 缁戝畾鑰匢d
/// </summary>
- [SugarColumn(ColumnName = "BindUser", ColumnDescription = "缁戝畾浜�")]
- public int? BindUser { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CreateUser", ColumnDescription = "鍒涘缓浜�")]
- public int? CreateUser { get; set; }
+ [SugarColumn(ColumnName = "BindUserId", ColumnDescription = "缁戝畾鑰匢d")]
+ public long? BindUserId { get; set; }
}
--
Gitblit v1.8.0