From 35fac8d74d298c51f9c22596ebcc51e2943b3f28 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 31 十二月 2024 15:07:16 +0800
Subject: [PATCH] 增加条码类型实体
---
Tiger.Api/Controllers/Test/TestController.R.cs | 69 +++++++++++++++++-----
Tiger.Model.Net/Tiger.Model.Net.csproj | 1
Tiger.Model.Net/Entitys/BAS/BAS_CODE_TYPE.cs | 106 +++++++++++++++++++++++++++++++++++
3 files changed, 160 insertions(+), 16 deletions(-)
diff --git a/Tiger.Api/Controllers/Test/TestController.R.cs b/Tiger.Api/Controllers/Test/TestController.R.cs
index 923136f..33e9ae2 100644
--- a/Tiger.Api/Controllers/Test/TestController.R.cs
+++ b/Tiger.Api/Controllers/Test/TestController.R.cs
@@ -25,6 +25,8 @@
using Microsoft.CodeAnalysis.Options;
using System.IO;
using System.Runtime.Loader;
+using MailKit.Search;
+using Tiger.Model.DigitalTwin;
namespace Tiger.Api.Controllers.Test
{
@@ -373,23 +375,58 @@
{
var data = action.Data;
- var json = new {
- SN = "V025720241120000161",
- ItemCode = "160305330",
- Qty = 1700,
- Unit = "PCS",
- Supplier = "V0381",
- DeliveryDate = DateTime.Now,
- ProdDate = DateTime.Now,
- BatchNo = "20241120",
- ValidityDays = 365,
- SerialNo = 161,
- ItemName = "L-CW1323GA 涓や釜瑁呭僵鐩� 闅旀澘 鏉愯川300g鍗曠矇瑁盰F鍔犲己杩囧搼鑶� 105 mm 85 mm 3 mm 鍗楁嘲 ",
- Warehouse = "W0001",
- ItemModel = "鏉愭枡 闆朵欢 鍟嗗搧",
- };
+ //var json = new {
+ // SN = "V025720241120000161",
+ // ItemCode = "160305330",
+ // Qty = 1700,
+ // Unit = "PCS",
+ // Supplier = "V0381",
+ // DeliveryDate = DateTime.Now,
+ // ProdDate = DateTime.Now,
+ // BatchNo = "20241120",
+ // ValidityDays = 365,
+ // SerialNo = 161,
+ // ItemName = "L-CW1323GA 涓や釜瑁呭僵鐩� 闅旀澘 鏉愯川300g鍗曠矇瑁盰F鍔犲己杩囧搼鑶� 105 mm 85 mm 3 mm 鍗楁嘲 ",
+ // Warehouse = "W0001",
+ // ItemModel = "鏉愭枡 闆朵欢 鍟嗗搧",
+ //};
+ //var result = action.GetResponse("GetSnInfo success.", json, true);
- var result = action.GetResponse("GetSnInfo success.", json, true);
+ //var json = new List<object>
+ //{
+ // new {
+ // OrderNo = "RE202404308721",
+ // Warehouse = "",
+ // Details = new List<object>
+ // {
+ // new { ItemCode = "442500010", ItemName = "闀挎き鍦嗗舰鍗￠拡 35 x7.3 x0.9mm SUS304H 鏂粶娉�", Qty = 1000 },
+ // new { ItemCode = "442500011", ItemName = "鐭き鍦嗗舰鍗￠拡 35 x7.3 x0.9mm SUS304H 鏂粶娉�", Qty = 500 }
+ // },
+ // SnDetails = new List<object>
+ // {
+ // new { SN = "V029720240427000069", ItemCode = "442500010", Qty = 500, Carton = "CV029720240427000001", Pallet = "PV029720240427000001" },
+ // new { SN = "V029720240427000070", ItemCode = "442500010", Qty = 500, Carton = "CV029720240427000001", Pallet = "PV029720240427000001" },
+ // new { SN = "V029720240427000071", ItemCode = "442500011", Qty = 500, Carton = "CV029720240427000002", Pallet = "PV029720240427000001" },
+ // },
+ // }
+ //};
+ //var result = action.GetResponse("GetInOrder success.", json, true);
+
+ //var json = new List<object>
+ //{
+ // new {
+ // OrderNo = "XC5406-231014306",
+ // Warehouse = "XC003",
+ // Details = new List<object>
+ // {
+ // new { ItemCode = "250100420", ItemName = "IC SMD DC-DC 0.6V 鍗曡矾 1A 1.5MHZ SOT563 TLV62568DRL TI", Qty = 1000 },
+ // new { ItemCode = "200203670", ItemName = "CAP SMD X5R 0402 6.3V 4.7uF卤20%", Qty = 1500 }
+ // },
+ // }
+ //};
+ //var result = action.GetResponse("GetOutOrder success.", json, true);
+
+ var result = action.GetResponse("OutTask success.", true);
return Ok(new { result.Timestamp, result.IsSuccessed, result.Message, result.Data });
}
diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_CODE_TYPE.cs b/Tiger.Model.Net/Entitys/BAS/BAS_CODE_TYPE.cs
new file mode 100644
index 0000000..bf9ab0d
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_CODE_TYPE.cs
@@ -0,0 +1,106 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：条码类型定义
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("条码类型定义")]
+ [Serializable]
+ [SugarTable("BAS_CODE_TYPE")]
+ public class BAS_CODE_TYPE : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：条码类型定义
+ /// </summary>
+ public BAS_CODE_TYPE() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 条码类型编码
+ /// </summary>
+ [DisplayName("条码类型编码")]
+ public string TYPE_CODE { get; set; }
+ /// <summary>
+ /// 条码类型名称
+ /// </summary>
+ [DisplayName("条码类型名称")]
+ public string TYPE_NAME { get; set; }
+ /// <summary>
+ /// 业务标识，用“;”分割
+ /// </summary>
+ [DisplayName("业务标识，用“;”分割")]
+ public string TYPE_TAG { get; set; }
+ /// <summary>
+ /// 条码类型描述
+ /// </summary>
+ [DisplayName("条码类型描述")]
+ public string TYPE_DESC { get; set; }
+ /// <summary>
+ /// 条码规则编码
+ /// </summary>
+ [DisplayName("条码规则编码")]
+ public string RULE_CODE { get; set; }
+ /// <summary>
+ /// 标签模板编码
+ /// </summary>
+ [DisplayName("标签模板编码")]
+ public string LABEL_CODE { get; set; }
+ /// <summary>
+ /// 是否启用(Y/N)
+ /// </summary>
+ [DisplayName("是否启用(Y/N)")]
+ public string IS_ACTIVE { get; set; }
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
+ public string REMARK { get; set; }
+ #endregion
+
+ #region 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BAS_CODE_TYPE类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_CODE_TYPEId))]//ClassA表中的BAS_CODE_TYPEId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BAS_CODE_TYPEId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index 0fa6e54..19f71ff 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -78,6 +78,7 @@
<Compile Include="Base\DbEntityBase.cs" />
<Compile Include="Base\TraceDebug.cs" />
<Compile Include="DTO\MESDTO.cs" />
+ <Compile Include="Entitys\BAS\BAS_CODE_TYPE.cs" />
<Compile Include="Entitys\MES\MES_ROUTE_ACT_VAR.cs" />
<Compile Include="Entitys\MES\MES_WIP_ACT_VAR.cs" />
<Compile Include="Entitys\MES\MES_WO_ACT_VAR.cs" />
--
Gitblit v1.9.3