From 02cf0e3740454cefa86de63330c524759408791c Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期四, 26 十二月 2024 14:44:18 +0800
Subject: [PATCH] 添加库存信息类及配置更新
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo_Hty.cs | 141 ++++++++++++++++++++++++++++
/dev/null | 33 ------
.gitignore | 1
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfoDetail_Hty.cs | 74 ++++++++++++++
4 files changed, 216 insertions(+), 33 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7b03c8c..8ce3385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1593,3 +1593,4 @@
/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/copilot-chat/bef6627e/sessions/0fd52b0d-b36f-4668-871f-5e1c1d23e2e3
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/copilot-chat/bef6627e/sessions/82695646-a5cf-44a5-803d-fe8b5ff11fef
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
+/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
deleted file mode 100644
index 1f05186..0000000
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "urls": "http://*:9291", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft.AspNetCore": "Warning"
- }
- },
- "dics": "deviceType,devicePlcType,jobAssembly,jobClassName,deviceStatus,taskType,taskState,inOutType",
- "AllowedHosts": "*",
- "ConnectionStringsEncryption": false,
- "MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
- //杩炴帴瀛楃涓�
- //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- //"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=True",
- //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=True",
- //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //璺ㄥ煙
- "Cors": {
- "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
- "EnableAllIPs": true, //褰撲负true鏃讹紝寮�鏀炬墍鏈塈P鍧囧彲璁块棶銆�
- // 鏀寔澶氫釜鍩熷悕绔彛锛屾敞鎰忕鍙ｅ彿鍚庝笉瑕佸甫/鏂滄潌锛氭瘮濡俵ocalhost:8000/锛屾槸閿欑殑
- // 娉ㄦ剰锛宧ttp://127.0.0.1:1818 鍜� http://localhost:1818 鏄笉涓�鏍风殑
- "IPs": "http://127.0.0.1:8080,http://localhost:8080"
- },
- "ApiName": "WIDESEA",
- "ExpMinutes": 120,
- "QuartzJobAutoStart": true,
- "LogDeubgEnable": true
-}
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfoDetail_Hty.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfoDetail_Hty.cs
new file mode 100644
index 0000000..7436de3
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfoDetail_Hty.cs
@@ -0,0 +1,74 @@
+锘縰sing SqlSugar;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models;
+
+[SugarTable(nameof(DtStockInfoDetail_Hty), "搴撳瓨淇℃伅鏄庣粏")]
+public class DtStockInfoDetail_Hty : BaseEntity
+{
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨淇℃伅涓婚敭
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨淇℃伅涓婚敭")]
+ public int StockId { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
+ public string MaterielCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterielName { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鎵规鍙�")]
+ public string BatchNo { get; set; }
+
+ /// <summary>
+ /// 搴忓垪鍙�
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "搴忓垪鍙�")]
+ public string SerialNumber { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鏁伴噺
+ /// </summary>
+ [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "搴撳瓨鏁伴噺")]
+ public decimal StockQuantity { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱鏁伴噺
+ /// </summary>
+ [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "鍑哄簱鏁伴噺", DefaultValue = "0")]
+ public decimal OutboundQuantity { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鏄庣粏鐘舵��
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鏄庣粏鐘舵��")]
+ public int Status { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞", Length = int.MaxValue)]
+ public string Remark { get; set; }
+}
\ No newline at end of file
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo_Hty.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo_Hty.cs
new file mode 100644
index 0000000..8e27fac
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo_Hty.cs
@@ -0,0 +1,141 @@
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models
+{
+ [SugarTable(nameof(DtStockInfo_Hty), "搴撳瓨淇℃伅鍘嗗彶")]
+ public class DtStockInfo_Hty : BaseEntity
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "涓婚敭")]
+ [ExporterHeader(DisplayName = "涓婚敭")]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "鎵樼洏缂栧彿")]
+ [ExporterHeader(DisplayName = "鎵樼洏缂栧彿")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
+ public string PalletCode { get; set; }
+
+ /// <summary>
+ /// 璐т綅缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "璐т綅ID")]
+ [ExporterHeader(DisplayName = "璐т綅ID")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "璐т綅ID")]
+ public int LocationId { get; set; }
+
+ /// <summary>
+ /// 璐т綅缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "璐т綅缂栧彿")]
+ [ExporterHeader(DisplayName = "璐т綅缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璐т綅缂栧彿")]
+ public string LocationCode { get; set; }
+
+ /// <summary>
+ /// 鏄惁婊＄洏
+ /// </summary>
+ [ImporterHeader(Name = "鏄惁瀹炵洏")]
+ [ExporterHeader(DisplayName = "鏄惁瀹炵洏")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁婊＄洏", DefaultValue = "0")]
+ public bool IsFull { get; set; }
+
+ /// <summary>
+ /// 澶囨敞 (闈欏埗\闄堝寲鏃堕棿)
+ /// </summary>
+ [ImporterHeader(Name = "鐢佃姱鏁伴噺")]
+ [ExporterHeader(DisplayName = "鐢佃姱鏁伴噺")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐢佃姱鏁伴噺")]
+ public string Remark { get; set; }
+
+ /// <summary>
+ /// 鍏宠仈宸ュ簭杩斿洖鏃堕棿锛堟敞娑瞈闈欑疆鏃堕暱锛�
+ /// </summary>
+ [ImporterHeader(Name = "宸ュ簭杩斿洖鏃堕棿")]
+ [ExporterHeader(DisplayName = "宸ュ簭杩斿洖鏃堕棿")]
+ public string LinedProcessFeedbackTime { get; set; }
+
+ /// <summary>
+ /// 鐗瑰緛鍙傛暟杩斿洖(闈欑疆鏃堕暱)
+ /// </summary>
+ [ImporterHeader(Name = "闈欑疆鏃堕暱")]
+ [ExporterHeader(DisplayName = "闈欑疆鏃堕暱")]
+ public string SpecialParameterDuration { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇浜х嚎
+ /// </summary>
+ [ImporterHeader(Name = "鐢熶骇浜х嚎")]
+ [ExporterHeader(DisplayName = "鐢熶骇浜х嚎")]
+ public string ProductionLine { get; set; }
+
+ /// <summary>
+ /// 鍖哄煙缂栫爜
+ /// </summary>
+ [ImporterHeader(Name = "鍖哄煙缂栫爜")]
+ [ExporterHeader(DisplayName = "鍖哄煙缂栫爜")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍖哄煙缂栫爜")]
+ public string AreaCode { get; set; }
+
+ /// <summary>
+ /// 搴斿嚭搴撴椂闂�
+ /// </summary>
+ [ImporterHeader(Name = "搴斿嚭搴撴椂闂�")]
+ [ExporterHeader(DisplayName = "搴斿嚭搴撴椂闂�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "搴斿嚭搴撴椂闂�")]
+ public DateTime? OutboundTime { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟淇℃伅
+ /// </summary>
+ [ImporterHeader(Name = "鍙傛暟淇℃伅")]
+ [ExporterHeader(DisplayName = "鍙傛暟淇℃伅")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍙傛暟淇℃伅", Length = int.MaxValue)]
+ public string ParameterInfos { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鐘舵��
+ /// </summary>
+ [ImporterHeader(Name = "鍒涘缓鑰�")]
+ [ExporterHeader(DisplayName = "鍒涘缓鑰�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "搴撳瓨鐘舵��")]
+ public int StockStatus { get; set; }
+
+ /// <summary>
+ /// 褰撳墠宸ュ簭
+ /// </summary>
+ [ImporterHeader(Name = "褰撳墠宸ュ簭")]
+ [ExporterHeader(DisplayName = "褰撳墠宸ュ簭")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "褰撳墠宸ュ簭")]
+ public string ProcessCode { get; set; }
+
+ /// <summary>
+ /// 涓嬩竴宸ュ簭
+ /// </summary>
+ [ImporterHeader(Name = "涓嬩竴宸ュ簭")]
+ [ExporterHeader(DisplayName = "涓嬩竴宸ュ簭")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "涓嬩竴宸ュ簭")]
+ public string NextProcessCode { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鏄庣粏
+ /// </summary>
+ [SugarColumn(ColumnName = "StockInfoDetails")]
+ [Navigate(NavigateType.OneToMany, nameof(DtStockInfoDetail_Hty.StockId))]
+ public List<DtStockInfoDetail_Hty>? StockInfoDetails { get; set; }
+
+ /// <summary>
+ /// 璐т綅鏁版嵁
+ /// </summary>
+ [SugarColumn(ColumnName = "LocationInfo")]
+ [Navigate(NavigateType.OneToOne, nameof(LocationId), nameof(DtLocationInfo.Id))]
+ public DtLocationInfo? LocationInfo { get; set; }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3