From 3322a19c7c15953dc4c2a14b2f9b141e6df0823f Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 12 四月 2024 16:27:48 +0800
Subject: [PATCH] 一些更改
---
Tiger.Api/Controllers/WMS/WMSController.MqCustomer.cs | 21 +
Tiger.Api/Controllers/WMS/WMSController.MqModelInfo.cs | 21 +
Tiger.Model.Net/Entitys/WMS/MengQi/ModelInfo.cs | 4
Tiger.Model.Net/Tiger.Model.Net.csproj | 7
Tiger.IBusiness/WMS/MengQi/ICustomer.cs | 1
Tiger.Model.Net/Entitys/Automate/WIP_SN.cs | 235 +++++++++++
Tiger.IBusiness/WMS/MengQi/IModelInfo.cs | 1
Tiger.Model.Net/Entitys/Automate/Vechicle.cs | 152 +++++++
Tiger.Model.Net/Entitys/Automate/WIP_SNHis.cs | 286 +++++++++++++
Tiger.Model.Net/Entitys/WMS/MengQi/SNData.cs | 7
Tiger.Model.Net/Entitys/Automate/WIP_SNResult.cs | 204 +++++++++
Tiger.Business/WMS/MengQi/Biz.Mq.Customer.cs | 35 +
Tiger.Business/WMS/MengQi/Biz.Mq.ModelInfo.cs | 33 +
Tiger.Model.Net/Entitys/WMS/MengQi/TestData.cs | 205 +++++++++
Tiger.Model.Net/Entitys/Automate/SNInfo.cs | 19
15 files changed, 1,227 insertions(+), 4 deletions(-)
diff --git a/Tiger.Api/Controllers/WMS/WMSController.MqCustomer.cs b/Tiger.Api/Controllers/WMS/WMSController.MqCustomer.cs
index 2a3d914..6474cff 100644
--- a/Tiger.Api/Controllers/WMS/WMSController.MqCustomer.cs
+++ b/Tiger.Api/Controllers/WMS/WMSController.MqCustomer.cs
@@ -71,5 +71,26 @@
}
return Ok(response);
}
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> SaveCustomer([FromBody] ApiAction<Customer> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<ICustomer>().SaveCustomer(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
}
}
diff --git a/Tiger.Api/Controllers/WMS/WMSController.MqModelInfo.cs b/Tiger.Api/Controllers/WMS/WMSController.MqModelInfo.cs
index c2d5b6c..93068fe 100644
--- a/Tiger.Api/Controllers/WMS/WMSController.MqModelInfo.cs
+++ b/Tiger.Api/Controllers/WMS/WMSController.MqModelInfo.cs
@@ -51,5 +51,26 @@
}
return Ok(response);
}
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> SaveModelInfo([FromBody] ApiAction<ModelInfo> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IModelInfo>().SaveModel(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
}
}
diff --git a/Tiger.Business/WMS/MengQi/Biz.Mq.Customer.cs b/Tiger.Business/WMS/MengQi/Biz.Mq.Customer.cs
index 3327b8a..550738b 100644
--- a/Tiger.Business/WMS/MengQi/Biz.Mq.Customer.cs
+++ b/Tiger.Business/WMS/MengQi/Biz.Mq.Customer.cs
@@ -62,7 +62,7 @@
public async Task<ApiAction> SaveImportCustomerInfo(List<Customer> list)
{
var res = new ApiAction();
- //鏇存柊鏈哄瀷璁板綍
+ //鏇存柊瀹㈡埛璁板綍
var db = Db;
var dbTran = await db.UseTranAsync(async () =>
{
@@ -75,6 +75,39 @@
}
return res;
}
+
+ /// <summary>
+ /// 淇濆瓨瀹㈡埛
+ /// </summary>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SaveCustomer(Customer customer)
+ {
+ var result = new ApiAction();
+ try
+ {
+
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ var y = db.Storageable(customer)
+ .WhereColumns(t => new { t.CustomerCode })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.Message = $"瀵煎叆寮傚父";
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨瀹㈡埛寮傚父");
+ }
+ return result;
+ }
}
}
}
diff --git a/Tiger.Business/WMS/MengQi/Biz.Mq.ModelInfo.cs b/Tiger.Business/WMS/MengQi/Biz.Mq.ModelInfo.cs
index f809379..bd4fc98 100644
--- a/Tiger.Business/WMS/MengQi/Biz.Mq.ModelInfo.cs
+++ b/Tiger.Business/WMS/MengQi/Biz.Mq.ModelInfo.cs
@@ -61,6 +61,39 @@
}
return res;
}
+
+ /// <summary>
+ /// 淇濆瓨鏈哄瀷
+ /// </summary>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SaveModel(ModelInfo modelInfo)
+ {
+ var result = new ApiAction();
+ try
+ {
+
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ var y = db.Storageable(modelInfo)
+ .WhereColumns(t => new { t.Model })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.Message = $"瀵煎叆寮傚父";
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨鏈哄瀷寮傚父");
+ }
+ return result;
+ }
}
}
}
diff --git a/Tiger.IBusiness/WMS/MengQi/ICustomer.cs b/Tiger.IBusiness/WMS/MengQi/ICustomer.cs
index b50973c..4f5a980 100644
--- a/Tiger.IBusiness/WMS/MengQi/ICustomer.cs
+++ b/Tiger.IBusiness/WMS/MengQi/ICustomer.cs
@@ -14,5 +14,6 @@
public Task<ApiAction<List<Customer>>> GetCustomerInfo();
public Task<ApiAction> SaveImportCustomerInfo(List<Customer> list);
public Task<ApiAction<PageAble<Customer>>> GetCustomers(PageAble<Customer> pageList);
+ public Task<ApiAction> SaveCustomer(Customer customer);
}
}
diff --git a/Tiger.IBusiness/WMS/MengQi/IModelInfo.cs b/Tiger.IBusiness/WMS/MengQi/IModelInfo.cs
index c396fce..911144e 100644
--- a/Tiger.IBusiness/WMS/MengQi/IModelInfo.cs
+++ b/Tiger.IBusiness/WMS/MengQi/IModelInfo.cs
@@ -13,5 +13,6 @@
{
public Task<ApiAction<PageAble<ModelInfo>>> GetModelInfo(PageAble<ModelInfo> pageList);
public Task<ApiAction> SaveImportModelInfo(List<ModelInfo> list);
+ public Task<ApiAction> SaveModel(ModelInfo user);
}
}
diff --git a/Tiger.Model.Net/Entitys/Automate/SNInfo.cs b/Tiger.Model.Net/Entitys/Automate/SNInfo.cs
new file mode 100644
index 0000000..6844551
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/Automate/SNInfo.cs
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tiger.Model
+{
+ public class SNInfo
+ {
+ public string Vechicle_ID { get; set; }
+ public string JiBanSN { get; set; }
+ public string TID { get; set; }
+ public bool IsPass { get; set; }
+ public List<WIP_SN> WipSnList { get; set; } = new List<WIP_SN>();
+ public List<SNData> SnList { get; set; } = new List<SNData>();
+ public List<Vechicle> VechicleList { get; set; } = new List<Vechicle>();
+ }
+}
diff --git a/Tiger.Model.Net/Entitys/Automate/Vechicle.cs b/Tiger.Model.Net/Entitys/Automate/Vechicle.cs
new file mode 100644
index 0000000..3afa94d
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/Automate/Vechicle.cs
@@ -0,0 +1,152 @@
+锘�/******************************************
+* 妯″潡鍚嶇О锛氬疄浣� Vechicle
+* 褰撳墠鐗堟湰锛�1.0
+* 寮�鍙戜汉鍛橈細Ben
+* 鐢熸垚鏃堕棿锛�2021/9/1
+* 鐗堟湰鍘嗗彶锛氭浠ｇ爜鐢� VB/C#.Net瀹炰綋浠ｇ爜鐢熸垚宸ュ叿(EntitysCodeGenerate 4.8) 鑷姩鐢熸垚銆�
+*
+******************************************/
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using SqlSugar;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 瀹炰綋 Vechicle
+ /// </summary>
+ [Description("Primary:")]
+ [Serializable]
+[SugarTable("Vechicle")]
+ public class Vechicle
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋 Vechicle
+ /// </summary>
+ public Vechicle(){}
+ #endregion
+
+ #region 绉佹湁鍙橀噺
+ private string _id = null;
+ private string _vechicle_id = null;
+ private string _sn = null;
+ private int _order_id = 0;
+ private DateTime _create_time = DateTime.Now;
+ private string _create_user = null;
+ private DateTime _update_time = DateTime.MinValue;
+ private string _update_user = null;
+ #endregion
+
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// ID
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true)]
+ public string ID
+ {
+ set{ _id=value;}
+ get{return _id;}
+ }
+ /// <summary>
+ /// Vechicle_ID
+ /// </summary>
+ public string Vechicle_ID
+ {
+ set{ _vechicle_id=value;}
+ get{return _vechicle_id;}
+ }
+ /// <summary>
+ /// SN
+ /// </summary>
+ public string SN
+ {
+ set{ _sn=value;}
+ get{return _sn;}
+ }
+
+ /// <summary>
+ /// Order_ID
+ /// </summary>
+ public Int32 Order_ID
+ {
+ set { _order_id = value; }
+ get { return _order_id; }
+ }
+
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿(NOT NULL)
+ /// </summary>
+ public DateTime CREATE_TIME
+ {
+ set { _create_time = value; }
+ get { return _create_time; }
+ }
+ /// <summary>
+ /// 鍒涘缓鑰�
+ /// </summary>
+ public string CREATE_USER
+ {
+ set { _create_user = value; }
+ get { return _create_user; }
+ }
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime UPDATE_TIME
+ {
+ set { _update_time = value; }
+ get { return _update_time; }
+ }
+ /// <summary>
+ /// 淇敼鑰�
+ /// </summary>
+ public string UPDATE_USER
+ {
+ set { _update_user = value; }
+ get { return _update_user; }
+ }
+ #endregion
+ }
+
+ /// <summary>
+ /// Vechicle瀹炰綋闆�
+ /// </summary>
+ [Serializable]
+ public class VechicleS : CollectionBase
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// Vechicle瀹炰綋闆�
+ /// </summary>
+ public VechicleS(){}
+ #endregion
+
+ #region 灞炴�ф柟娉�
+ /// <summary>
+ /// Vechicle闆嗗悎 澧炲姞鏂规硶
+ /// </summary>
+ public void Add(Vechicle entity)
+ {
+ this.List.Add(entity);
+ }
+ /// <summary>
+ /// Vechicle闆嗗悎 绱㈠紩
+ /// </summary>
+ public Vechicle this[int index]
+ {
+ get { return (Vechicle)this.List[index]; }
+ set { this.List[index] = value; }
+ }
+ #endregion
+ }
+
+ public class CommEntity
+ {
+ public string EntityStr { get; set; }
+ public string[] Params { get; set; }
+ }
+}
diff --git a/Tiger.Model.Net/Entitys/Automate/WIP_SN.cs b/Tiger.Model.Net/Entitys/Automate/WIP_SN.cs
new file mode 100644
index 0000000..51fc5f7
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/Automate/WIP_SN.cs
@@ -0,0 +1,235 @@
+锘�/******************************************
+* 妯″潡鍚嶇О锛氬疄浣� WIP_SN
+* 褰撳墠鐗堟湰锛�1.0
+* 寮�鍙戜汉鍛橈細Ben
+* 鐢熸垚鏃堕棿锛�2021/9/3
+* 鐗堟湰鍘嗗彶锛氭浠ｇ爜鐢� VB/C#.Net瀹炰綋浠ｇ爜鐢熸垚宸ュ叿(EntitysCodeGenerate 4.8) 鑷姩鐢熸垚銆�
+*
+******************************************/
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using SqlSugar;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 瀹炰綋 WIP_SN
+ /// </summary>
+ [Description("Primary:")]
+ [Serializable]
+ [SugarTable("WIP_SN")]
+ public class WIP_SN
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋 WIP_SN
+ /// </summary>
+ public WIP_SN(){}
+ #endregion
+
+ #region 绉佹湁鍙橀噺
+ private string _id = null;
+ private DateTime _create_time = DateTime.Now;
+ private string _create_user = null;
+ private DateTime _update_time = DateTime.MinValue;
+ private string _update_user = null;
+ private string _sn = null;
+ private string _inner_sn = null;
+ private string _outer_sn = null;
+ private string _vechicle_sn = null;
+ private string _status = null;
+ private string _type = null;
+ private string _curroper = null;
+ private string _fromoper = null;
+ private string _scanner = null;
+ private int _seq_no = 0;
+ private int _retesttimes = -1;
+ private string _remark = null;
+
+ #endregion
+
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// ID
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true)]
+ public string ID
+ {
+ set{ _id=value;}
+ get{return _id;}
+ }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿(NOT NULL)
+ /// </summary>
+ public DateTime CREATE_TIME
+ {
+ set { _create_time = value; }
+ get { return _create_time; }
+ }
+ /// <summary>
+ /// 鍒涘缓鑰�
+ /// </summary>
+ public string CREATE_USER
+ {
+ set { _create_user = value; }
+ get { return _create_user; }
+ }
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime UPDATE_TIME
+ {
+ set { _update_time = value; }
+ get { return _update_time; }
+ }
+ /// <summary>
+ /// 淇敼鑰�
+ /// </summary>
+ public string UPDATE_USER
+ {
+ set { _update_user = value; }
+ get { return _update_user; }
+ }
+ /// <summary>
+ /// SN
+ /// </summary>
+ public string SN
+ {
+ set { _sn = value; }
+ get { return _sn; }
+ }
+ /// <summary>
+ /// InnerSN
+ /// </summary>
+ public string InnerSN
+ {
+ set { _inner_sn = value; }
+ get { return _inner_sn; }
+ }
+ /// <summary>
+ /// OuterSN
+ /// </summary>
+ public string OuterSN
+ {
+ set { _outer_sn = value; }
+ get { return _outer_sn; }
+ }
+ /// <summary>
+ /// VechicleSN
+ /// </summary>
+ public string VechicleSN
+ {
+ set{ _vechicle_sn=value;}
+ get{return _vechicle_sn; }
+ }
+ /// <summary>
+ /// Status
+ /// </summary>
+ public string Status
+ {
+ set{ _status=value;}
+ get{return _status;}
+ }
+ /// <summary>
+ /// Type
+ /// </summary>
+ public string Type
+ {
+ set { _type = value; }
+ get { return _type; }
+ }
+
+ /// <summary>
+ /// CurrOper
+ /// </summary>
+ public string CurrOper
+ {
+ set{ _curroper=value;}
+ get{return _curroper;}
+ }
+ /// <summary>
+ /// FromOper
+ /// </summary>
+ public string FromOper
+ {
+ set{ _fromoper=value;}
+ get{return _fromoper;}
+ }
+ /// <summary>
+ /// Scanner
+ /// </summary>
+ public string Scanner
+ {
+ set { _scanner = value; }
+ get { return _scanner; }
+ }
+
+ /// <summary>
+ /// Order_ID
+ /// </summary>
+ public Int32 SeqNo
+ {
+ set { _seq_no = value; }
+ get { return _seq_no; }
+ }
+
+ /// <summary>
+ /// Order_ID
+ /// </summary>
+ public Int32 RetestTimes
+ {
+ set { _retesttimes = value; }
+ get { return _retesttimes; }
+ }
+
+ /// <summary>
+ /// Remark
+ /// </summary>
+ public string Remark
+ {
+ set{ _remark=value;}
+ get{return _remark; }
+ }
+
+ #region 铏氭嫙灞炴��
+ [SugarColumn(IsIgnore = true)]
+ public string DisplayValue { get; set; }
+ #endregion
+
+ #endregion
+ }
+
+ /// <summary>
+ /// WIP_SN瀹炰綋闆�
+ /// </summary>
+ [Serializable]
+ public class WIP_SNS : CollectionBase
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// WIP_SN瀹炰綋闆�
+ /// </summary>
+ public WIP_SNS(){}
+ #endregion
+
+ #region 灞炴�ф柟娉�
+ /// <summary>
+ /// WIP_SN闆嗗悎 澧炲姞鏂规硶
+ /// </summary>
+ public void Add(WIP_SN entity)
+ {
+ this.List.Add(entity);
+ }
+ /// <summary>
+ /// WIP_SN闆嗗悎 绱㈠紩
+ /// </summary>
+ public WIP_SN this[int index]
+ {
+ get { return (WIP_SN)this.List[index]; }
+ set { this.List[index] = value; }
+ }
+ #endregion
+ }
+}
diff --git a/Tiger.Model.Net/Entitys/Automate/WIP_SNHis.cs b/Tiger.Model.Net/Entitys/Automate/WIP_SNHis.cs
new file mode 100644
index 0000000..5e9256e
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/Automate/WIP_SNHis.cs
@@ -0,0 +1,286 @@
+锘�/******************************************
+* 妯″潡鍚嶇О锛氬疄浣� WIP_SNHis
+* 褰撳墠鐗堟湰锛�1.0
+* 寮�鍙戜汉鍛橈細Ben
+* 鐢熸垚鏃堕棿锛�2021/9/3
+* 鐗堟湰鍘嗗彶锛氭浠ｇ爜鐢� VB/C#.Net瀹炰綋浠ｇ爜鐢熸垚宸ュ叿(EntitysCodeGenerate 4.8) 鑷姩鐢熸垚銆�
+*
+******************************************/
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using SqlSugar;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 瀹炰綋 WIP_SNHis
+ /// </summary>
+ [Description("Primary:")]
+ [Serializable]
+ [SugarTable("WIP_SNHis")]
+ public class WIP_SNHis
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋 WIP_SNHis
+ /// </summary>
+ public WIP_SNHis() { }
+
+ public WIP_SNHis(WIP_SN item, string debugMsg, string traceMsg, string errorMsg)
+ {
+ _id = Guid.NewGuid().ToString("N");
+ _create_time = DateTime.Now;
+ _create_user = item.CREATE_USER;
+ _update_time = DateTime.Now;
+ _update_user = item.UPDATE_USER;
+ _sn = item.SN;
+ _inner_sn = item.InnerSN;
+ _outer_sn = item.OuterSN;
+ _vechicle_sn = item.VechicleSN;
+ _status = item.Status;
+ _type = item.Type;
+ _curroper = item.CurrOper;
+ _fromoper = item.FromOper;
+ _scanner = item.Scanner;
+ _seq_no = item.SeqNo;
+ _retesttimes = item.RetestTimes;
+ _remark = item.Remark;
+ _DebugMsg = debugMsg;
+ _TraceMsg = traceMsg;
+ _ErrorMsg = errorMsg;
+ }
+ #endregion
+
+ #region 绉佹湁鍙橀噺
+ private string _id = null;
+ private DateTime _create_time = DateTime.Now;
+ private string _create_user = null;
+ private DateTime _update_time = DateTime.MinValue;
+ private string _update_user = null;
+ private string _sn = null;
+ private string _inner_sn = null;
+ private string _outer_sn = null;
+ private string _vechicle_sn = null;
+ private string _status = null;
+ private string _type = null;
+ private string _curroper = null;
+ private string _fromoper = null;
+ private string _scanner = null;
+ private int _seq_no = 0;
+ private int _retesttimes = -1;
+ private string _remark = null;
+ private string _DebugMsg = null;
+ private string _TraceMsg = null;
+ private string _ErrorMsg = null;
+ #endregion
+
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// ID
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true)]
+ public string ID
+ {
+ set { _id = value; }
+ get { return _id; }
+ }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿(NOT NULL)
+ /// </summary>
+ public DateTime CREATE_TIME
+ {
+ set { _create_time = value; }
+ get { return _create_time; }
+ }
+ /// <summary>
+ /// 鍒涘缓鑰�
+ /// </summary>
+ public string CREATE_USER
+ {
+ set { _create_user = value; }
+ get { return _create_user; }
+ }
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime UPDATE_TIME
+ {
+ set { _update_time = value; }
+ get { return _update_time; }
+ }
+ /// <summary>
+ /// 淇敼鑰�
+ /// </summary>
+ public string UPDATE_USER
+ {
+ set { _update_user = value; }
+ get { return _update_user; }
+ }
+ /// <summary>
+ /// SN
+ /// </summary>
+ public string SN
+ {
+ set { _sn = value; }
+ get { return _sn; }
+ }
+ /// <summary>
+ /// InnerSN
+ /// </summary>
+ public string InnerSN
+ {
+ set { _inner_sn = value; }
+ get { return _inner_sn; }
+ }
+ /// <summary>
+ /// OuterSN
+ /// </summary>
+ public string OuterSN
+ {
+ set { _outer_sn = value; }
+ get { return _outer_sn; }
+ }
+ /// <summary>
+ /// VechicleSN
+ /// </summary>
+ public string VechicleSN
+ {
+ set { _vechicle_sn = value; }
+ get { return _vechicle_sn; }
+ }
+ /// <summary>
+ /// Status
+ /// </summary>
+ public string Status
+ {
+ set { _status = value; }
+ get { return _status; }
+ }
+ /// <summary>
+ /// Type
+ /// </summary>
+ public string Type
+ {
+ set { _type = value; }
+ get { return _type; }
+ }
+
+ /// <summary>
+ /// CurrOper
+ /// </summary>
+ public string CurrOper
+ {
+ set { _curroper = value; }
+ get { return _curroper; }
+ }
+ /// <summary>
+ /// FromOper
+ /// </summary>
+ public string FromOper
+ {
+ set { _fromoper = value; }
+ get { return _fromoper; }
+ }
+ /// <summary>
+ /// Scanner
+ /// </summary>
+ public string Scanner
+ {
+ set { _scanner = value; }
+ get { return _scanner; }
+ }
+
+ /// <summary>
+ /// Order_ID
+ /// </summary>
+ public Int32 SeqNo
+ {
+ set { _seq_no = value; }
+ get { return _seq_no; }
+ }
+
+ /// <summary>
+ /// Order_ID
+ /// </summary>
+ public Int32 RetestTimes
+ {
+ set { _retesttimes = value; }
+ get { return _retesttimes; }
+ }
+
+ /// <summary>
+ /// Remark
+ /// </summary>
+ public string Remark
+ {
+ set { _remark = value; }
+ get { return _remark; }
+ }
+
+ /// <summary>
+ /// DebugMsg
+ /// </summary>
+ public string DebugMsg
+ {
+ set { _DebugMsg = value; }
+ get { return _DebugMsg; }
+ }
+ /// <summary>
+ /// TraceMsg
+ /// </summary>
+ public string TraceMsg
+ {
+ set { _TraceMsg = value; }
+ get { return _TraceMsg; }
+ }
+ /// <summary>
+ /// ErrorMsg
+ /// </summary>
+ public string ErrorMsg
+ {
+ set { _ErrorMsg = value; }
+ get { return _ErrorMsg; }
+ }
+
+ #region 铏氭嫙灞炴��
+ [SugarColumn(IsIgnore = true)]
+ public string DisplayValue { get; set; }
+ #endregion
+
+ #endregion
+ }
+
+ /// <summary>
+ /// WIP_SNHis瀹炰綋闆�
+ /// </summary>
+ [Serializable]
+ public class WIP_SNHisS : CollectionBase
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// WIP_SNHis瀹炰綋闆�
+ /// </summary>
+ public WIP_SNHisS() { }
+ #endregion
+
+ #region 灞炴�ф柟娉�
+ /// <summary>
+ /// WIP_SNHis闆嗗悎 澧炲姞鏂规硶
+ /// </summary>
+ public void Add(WIP_SNHis entity)
+ {
+ this.List.Add(entity);
+ }
+ /// <summary>
+ /// WIP_SNHis闆嗗悎 绱㈠紩
+ /// </summary>
+ public WIP_SNHis this[int index]
+ {
+ get { return (WIP_SNHis)this.List[index]; }
+ set { this.List[index] = value; }
+ }
+ #endregion
+ }
+}
diff --git a/Tiger.Model.Net/Entitys/Automate/WIP_SNResult.cs b/Tiger.Model.Net/Entitys/Automate/WIP_SNResult.cs
new file mode 100644
index 0000000..ffcc433
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/Automate/WIP_SNResult.cs
@@ -0,0 +1,204 @@
+锘�/******************************************
+* 妯″潡鍚嶇О锛氬疄浣� WIP_SNResult
+* 褰撳墠鐗堟湰锛�1.0
+* 寮�鍙戜汉鍛橈細Ben
+* 鐢熸垚鏃堕棿锛�2021/12/14
+* 鐗堟湰鍘嗗彶锛氭浠ｇ爜鐢� VB/C#.Net瀹炰綋浠ｇ爜鐢熸垚宸ュ叿(EntitysCodeGenerate 4.8) 鑷姩鐢熸垚銆�
+*
+******************************************/
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using SqlSugar;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 瀹炰綋 WIP_SNResult
+ /// </summary>
+ [Description("Primary:ID")]
+ [Serializable]
+[SugarTable("WIP_SNResult")]
+ public class WIP_SNResult
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋 WIP_SNResult
+ /// </summary>
+ public WIP_SNResult(){}
+ #endregion
+
+ #region 绉佹湁鍙橀噺
+ private string _id = null;
+ private string _sn_id = null;
+ private DateTime _create_time = DateTime.Now;
+ private string _create_user = null;
+ private DateTime _update_time = DateTime.Now;
+ private string _update_user = null;
+ private string _sn = null;
+ private string _status = null;
+ private string _curroper = null;
+ private string _seqno = null;
+ private int _RetestTimes = -1;
+ private string _remark = null;
+ private string _Station = null;
+ private string _InnerSN = null;
+ private string _OuterSN = null;
+ #endregion
+
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 涓婚敭 ID
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true)]
+ public string ID
+ {
+ set{ _id=value;}
+ get{return _id;}
+ }
+ /// <summary>
+ /// CREATE_TIME
+ /// </summary>
+ public DateTime CREATE_TIME
+ {
+ set{ _create_time=value;}
+ get{return _create_time;}
+ }
+ /// <summary>
+ /// CREATE_USER
+ /// </summary>
+ public string CREATE_USER
+ {
+ set{ _create_user=value;}
+ get{return _create_user;}
+ }
+ /// <summary>
+ /// UPDATE_TIME
+ /// </summary>
+ public DateTime UPDATE_TIME
+ {
+ set{ _update_time=value;}
+ get{return _update_time;}
+ }
+ /// <summary>
+ /// UPDATE_USER
+ /// </summary>
+ public string UPDATE_USER
+ {
+ set{ _update_user=value;}
+ get{return _update_user;}
+ }
+ /// <summary>
+ /// SN
+ /// </summary>
+ public string SN
+ {
+ set{ _sn=value;}
+ get{return _sn;}
+ }
+ /// <summary>
+ /// Status
+ /// </summary>
+ public string Status
+ {
+ set{ _status=value;}
+ get{return _status;}
+ }
+ /// <summary>
+ /// CurrOper
+ /// </summary>
+ public string CurrOper
+ {
+ set{ _curroper=value;}
+ get{return _curroper;}
+ }
+ /// <summary>
+ /// SeqNo
+ /// </summary>
+ public string SeqNo
+ {
+ set{ _seqno=value;}
+ get{return _seqno;}
+ }
+ /// <summary>
+ /// Remark
+ /// </summary>
+ public string Remark
+ {
+ set{ _remark=value;}
+ get{return _remark;}
+ }
+ /// <summary>
+ /// SN_ID
+ /// </summary>
+ public string SN_ID
+ {
+ set { _sn_id = value; }
+ get { return _sn_id; }
+ }
+
+ /// <summary>
+ /// Station
+ /// </summary>
+ public string Station
+ {
+ set { _Station = value; }
+ get { return _Station; }
+ }
+
+ /// <summary>
+ /// RetestTimes
+ /// </summary>
+ public int RetestTimes
+ {
+ set { _RetestTimes = value; }
+ get { return _RetestTimes; }
+ }
+
+ public string InnerSN
+ {
+ set { _InnerSN = value; }
+ get { return _InnerSN; }
+ }
+
+ public string OuterSN
+ {
+ set { _OuterSN = value; }
+ get { return _OuterSN; }
+ }
+ #endregion
+ }
+
+ /// <summary>
+ /// WIP_SNResult瀹炰綋闆�
+ /// </summary>
+ [Serializable]
+ public class WIP_SNResultS : CollectionBase
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// WIP_SNResult瀹炰綋闆�
+ /// </summary>
+ public WIP_SNResultS(){}
+ #endregion
+
+ #region 灞炴�ф柟娉�
+ /// <summary>
+ /// WIP_SNResult闆嗗悎 澧炲姞鏂规硶
+ /// </summary>
+ public void Add(WIP_SNResult entity)
+ {
+ this.List.Add(entity);
+ }
+ /// <summary>
+ /// WIP_SNResult闆嗗悎 绱㈠紩
+ /// </summary>
+ public WIP_SNResult this[int index]
+ {
+ get { return (WIP_SNResult)this.List[index]; }
+ set { this.List[index] = value; }
+ }
+ #endregion
+ }
+}
diff --git a/Tiger.Model.Net/Entitys/WMS/MengQi/ModelInfo.cs b/Tiger.Model.Net/Entitys/WMS/MengQi/ModelInfo.cs
index 22bd367..b339dae 100644
--- a/Tiger.Model.Net/Entitys/WMS/MengQi/ModelInfo.cs
+++ b/Tiger.Model.Net/Entitys/WMS/MengQi/ModelInfo.cs
@@ -22,7 +22,7 @@
private string _prefix = null;
- private string _snlength = null;
+ private int _snlength = 0;
[SugarColumn(IsPrimaryKey = true)]
public string id
@@ -73,7 +73,7 @@
}
}
- public string SnLength
+ public int SnLength
{
get
{
diff --git a/Tiger.Model.Net/Entitys/WMS/MengQi/SNData.cs b/Tiger.Model.Net/Entitys/WMS/MengQi/SNData.cs
index b40fadc..edfb6c1 100644
--- a/Tiger.Model.Net/Entitys/WMS/MengQi/SNData.cs
+++ b/Tiger.Model.Net/Entitys/WMS/MengQi/SNData.cs
@@ -238,4 +238,11 @@
}
}
}
+
+ public class SNData_Ext
+ {
+ public SNData Item { set; get; }
+ public Vechicle Vechicle { get; set; }
+
+ }
}
diff --git a/Tiger.Model.Net/Entitys/WMS/MengQi/TestData.cs b/Tiger.Model.Net/Entitys/WMS/MengQi/TestData.cs
new file mode 100644
index 0000000..5577b98
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/MengQi/TestData.cs
@@ -0,0 +1,205 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tiger.Model
+{
+
+ [Serializable]
+ [Description("Primary:")]
+ [SugarTable("TestData")]
+ public class TestData
+ {
+ private string _id = null;
+ private string _sn = null;
+
+ [SugarColumn(IsPrimaryKey = true)]
+ public string id
+ {
+ get
+ {
+ return _id;
+ }
+ set
+ {
+ _id = value;
+ }
+ }
+
+ public string SN
+ {
+ get
+ {
+ return _sn;
+ }
+ set
+ {
+ _sn = value;
+ }
+ }
+
+ private string _OriginalSN = null;
+ public string OriginalSN
+ {
+ get
+ {
+ return _OriginalSN;
+ }
+ set
+ {
+ _OriginalSN = value;
+ }
+ }
+ private string _TestTime = null;
+ public string TestTime
+ {
+ get
+ {
+ return _TestTime;
+ }
+ set
+ {
+ _TestTime = value;
+ }
+ }
+ private string _CREATE_USER = null;
+ public string CREATE_USER
+ {
+ get
+ {
+ return _CREATE_USER;
+ }
+ set
+ {
+ _CREATE_USER = value;
+ }
+ }
+
+ private string _itemlcode = null;
+ public string ItemCode
+ {
+ get
+ {
+ return _itemlcode;
+ }
+ set
+ {
+ _itemlcode = value;
+ }
+ }
+
+ private string _result = null;
+ public string Result
+ {
+ get
+ {
+ return _result;
+ }
+ set
+ {
+ _result = value;
+ }
+ }
+
+ private string _lv = null;
+ public string LV
+ {
+ get
+ {
+ return _lv;
+ }
+ set
+ {
+ _lv = value;
+ }
+ }
+ private string _re = null;
+ public string Re
+ {
+ get
+ {
+ return _re;
+ }
+ set
+ {
+ _re = value;
+ }
+ }
+ private string _hp = null;
+ public string Hp
+ {
+ get
+ {
+ return _hp;
+ }
+ set
+ {
+ _hp = value;
+ }
+ }
+ private string _air = null;
+ public string Air
+ {
+ get
+ {
+ return _air;
+ }
+ set
+ {
+ _air = value;
+ }
+ }
+ private string _lvdata = null;
+ public string LvData
+ {
+ get
+ {
+ return _lvdata;
+ }
+ set
+ {
+ _lvdata = value;
+ }
+ }
+ private string _redata = null;
+ public string ReData
+ {
+ get
+ {
+ return _redata;
+ }
+ set
+ {
+ _redata = value;
+ }
+ }
+ private string _hpdata = null;
+ public string HpData
+ {
+ get
+ {
+ return _hpdata;
+ }
+ set
+ {
+ _hpdata = value;
+ }
+ }
+ private string _airdata = null;
+ public string AirData
+ {
+ get
+ {
+ return _airdata;
+ }
+ set
+ {
+ _airdata = value;
+ }
+ }
+ }
+}
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index eda53bf..e574063 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -70,6 +70,11 @@
<ItemGroup>
<Compile Include="Base\DbEntityBase.cs" />
<Compile Include="DTO\MESDTO.cs" />
+ <Compile Include="Entitys\Automate\SNInfo.cs" />
+ <Compile Include="Entitys\Automate\Vechicle.cs" />
+ <Compile Include="Entitys\Automate\WIP_SN.cs" />
+ <Compile Include="Entitys\Automate\WIP_SNHis.cs" />
+ <Compile Include="Entitys\Automate\WIP_SNResult.cs" />
<Compile Include="Entitys\DigitalTwin\Sharetronic\GetOperateChuteChangeInfoEntity.cs" />
<Compile Include="Entitys\DigitalTwin\Sharetronic\OperateTowerLightEntity.cs" />
<Compile Include="Entitys\DigitalTwin\Sharetronic\DownSingleEntity.cs" />
@@ -106,6 +111,7 @@
<Compile Include="Entitys\WMS\MengQi\SNData.cs" />
<Compile Include="Entitys\WMS\MengQi\ModelInfo.cs" />
<Compile Include="Entitys\WMS\MengQi\Customer.cs" />
+ <Compile Include="Entitys\WMS\MengQi\TestData.cs" />
<Compile Include="Entitys\WMS\MengQi\User.cs" />
<Compile Include="Entitys\WMS\V_MONTH_IN_SUM.cs" />
<Compile Include="Entitys\WMS\V_WH_ITEM_SUM.cs" />
@@ -441,7 +447,6 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Folder Include="Entitys\Automate\" />
<Folder Include="Entitys\EMS\" />
<Folder Include="Entitys\QMS\" />
</ItemGroup>
--
Gitblit v1.9.3