From e8042fe43a178ca26fe4fe4f8cf5dedbfc9910fd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 03 七月 2025 10:50:24 +0800
Subject: [PATCH] 更新任务查询逻辑以包含条形码在CommonConveyorLineJob.cs和 CommonConveyorLine_GWJob.cs文件中，修改了多个任务查询方法，现支持使用任务号、子设备代码和条形码进行查询。这一改动旨在提高任务查询的准确性。同时，移除了不再需要的注释代码行。
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/dt_needBarcode.cs | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/dt_needBarcode.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/dt_needBarcode.cs
index 7e70e6f..970c257 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/dt_needBarcode.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/dt_needBarcode.cs
@@ -1,4 +1,5 @@
-锘縰sing SqlSugar;
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -13,43 +14,57 @@
public class dt_needBarcode : BaseEntity
{
[Key]
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ [ImporterHeader(IsIgnore = true)]
+ [ExporterHeader(DisplayName = "涓婚敭")]
+ [SugarColumn(IsIdentity = true, IsNullable = true, IsPrimaryKey = true, ColumnDescription = "涓婚敭")]
public int id { get; set; }
/// <summary>
/// 鐩爣搴撳尯
/// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鐩爣搴撳尯")]
+ [ImporterHeader(Name = "鐩爣搴撳尯")]
+ [ExporterHeader(DisplayName = "鐩爣搴撳尯")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐩爣搴撳尯")]
public string toArea { get; set; }
/// <summary>
/// 鏉ユ簮搴撳尯
/// </summary>
- [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "鏉ユ簮搴撳尯")]
+ [ImporterHeader(Name = "鏉ユ簮搴撳尯")]
+ [ExporterHeader(DisplayName = "鏉ユ簮搴撳尯")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鏉ユ簮搴撳尯")]
public string fromArea { get; set; }
/// <summary>
/// 鎵樼洏绫诲瀷
/// </summary>
- [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "鎵樼洏绫诲瀷")]
+ [ImporterHeader(Name = "鎵樼洏绫诲瀷")]
+ [ExporterHeader(DisplayName = "鎵樼洏绫诲瀷")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鎵樼洏绫诲瀷")]
public string barcodeType { get; set; }
/// <summary>
/// 浜х嚎
/// </summary>
- [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "鎵�灞炰骇绾�")]
+ [ImporterHeader(Name = "浜х嚎")]
+ [ExporterHeader(DisplayName = "浜х嚎")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浜х嚎")]
public string productLine { get; set; }
/// <summary>
/// 鍦ㄩ�旀暟閲�
/// </summary>
- [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "鍦ㄩ�旀暟閲�")]
+ [ImporterHeader(Name = "鍦ㄩ�旀暟閲�")]
+ [ExporterHeader(DisplayName = "鍦ㄩ�旀暟閲�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍦ㄩ�旀暟閲�")]
public int inLineNum { get; set; }
/// <summary>
/// 鐩爣缂撳瓨鏁伴噺
/// </summary>
- [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "鍙紦瀛樻暟閲�")]
+ [ImporterHeader(Name = "鍙紦瀛樻暟閲�")]
+ [ExporterHeader(DisplayName = "鍙紦瀛樻暟閲�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍙紦瀛樻暟閲�")]
public int cacheNum { get; set; } = 0;
--
Gitblit v1.9.3