From 0b417bdc320a980cef619d9a88ce3cb0511b498b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 22 11月 2024 05:23:38 +0800
Subject: [PATCH] 程序唯一性校验
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsSystem/WmsSysBasicData.cs | 69 +++++++++++++++++++++++
CC/iWareCC_ASRS/App.config | 2
CC/iWareCC_ASRS/App - 正式.config | 2
CC/iWareSql/DataAccess/BasicDataSetHandler.cs | 18 ++---
DBScript/02_DML/01_InitData.sql | 19 +++---
CC/iWareCC_ASRS/App - 本机.config | 2
CC/iWareSql/WmsDBModel/wms_sys_basic_data.cs | 51 +++++++++++++++++
CC/iWareCC_ASRS/FormCC.cs | 7 +-
CC/iWareSql/iWareSql.csproj | 1
CC/iWareSql/WmsDBModel/WmsDBModel.cs | 1
10 files changed, 146 insertions(+), 26 deletions(-)
diff --git "a/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config" "b/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config"
index 4ca15c7..bed6f34 100644
--- "a/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config"
+++ "b/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config"
@@ -35,7 +35,7 @@
<add key="IsEnableNewInStorePlace" value="false"/>
</appSettings>
<connectionStrings>
- <add name="DbModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
+ <add name="WmsDBModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
diff --git "a/CC/iWareCC_ASRS/App - \346\255\243\345\274\217.config" "b/CC/iWareCC_ASRS/App - \346\255\243\345\274\217.config"
index e611a0f..fb1752a 100644
--- "a/CC/iWareCC_ASRS/App - \346\255\243\345\274\217.config"
+++ "b/CC/iWareCC_ASRS/App - \346\255\243\345\274\217.config"
@@ -35,7 +35,7 @@
<add key="IsEnableNewInStorePlace" value="false"/>
</appSettings>
<connectionStrings>
- <add name="DbModel" connectionString="data source=172.17.1.111;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=admin@123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
+ <add name="WmsDBModel" connectionString="data source=172.17.1.111;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=admin@123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
diff --git a/CC/iWareCC_ASRS/App.config b/CC/iWareCC_ASRS/App.config
index 385d342..f40abba 100644
--- a/CC/iWareCC_ASRS/App.config
+++ b/CC/iWareCC_ASRS/App.config
@@ -35,7 +35,7 @@
<add key="IsEnableNewInStorePlace" value="false"/>
</appSettings>
<connectionStrings>
- <add name="DbModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
+ <add name="WmsDBModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index 286fe2c..47d2b1a 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -12,6 +12,7 @@
using iWareModel.Entity.AGV;
using iWareSql.DataAccess;
using iWareSql.DBModel;
+using iWareSql.WmsDBModel;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -1715,7 +1716,7 @@
DialogResult dr = MessageBox.Show("纭畾瑕佸惎鍔ㄣ��" + currentCheckModelText + "銆戞ā寮忓悧?", "鍚姩妯″紡", messButton);
if (dr == DialogResult.OK)//濡傛灉鐐瑰嚮鈥滅‘瀹氣�濇寜閽�
{
- using (DbModel edm = new DbModel())
+ using (WmsDBModel edm = new WmsDBModel())
{
var ccSystem = BasicDataSetHandler.GetCCSystem(edm);
if (ccSystem == null)
@@ -1774,7 +1775,7 @@
/// <returns></returns>
private bool CommonStopService()
{
- using (DbModel edm = new DbModel())
+ using (WmsDBModel edm = new WmsDBModel())
{
var ccSystem = BasicDataSetHandler.GetCCSystem(edm);
if (ccSystem == null)
@@ -1790,7 +1791,7 @@
ccSystem.Machine = string.Empty;
ccSystem.LastMachine = Dns.GetHostName();
ccSystem.LastUnLineTime = DateTime.Now;
- ccSystem.ModifyTime = DateTime.Now;
+ ccSystem.UpdateTime = DateTime.Now;
int i = edm.SaveChanges();
if (i <= 0)
diff --git a/CC/iWareSql/DataAccess/BasicDataSetHandler.cs b/CC/iWareSql/DataAccess/BasicDataSetHandler.cs
index 9369978..da93542 100644
--- a/CC/iWareSql/DataAccess/BasicDataSetHandler.cs
+++ b/CC/iWareSql/DataAccess/BasicDataSetHandler.cs
@@ -1,10 +1,6 @@
-锘縰sing iWareSql.Orm;
+锘縰sing iWareSql.WmsDBModel;
using System;
-using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using iWareSql.DBModel;
namespace iWareSql.DataAccess
{
@@ -15,9 +11,9 @@
/// </summary>
/// <param name="edm"></param>
/// <returns></returns>
- public static Base_BasicDataSet GetCCSystem(DbModel edm)
+ public static wms_sys_basic_data GetCCSystem(WmsDBModel.WmsDBModel edm)
{
- return edm.Base_BasicDataSet.Where(x => x.BasicDataType == "1").FirstOrDefault();
+ return edm.wms_sys_basic_data.Where(x => x.BasicDataType == "1").FirstOrDefault();
}
@@ -28,9 +24,9 @@
/// <returns></returns>
public static String GetMangerPassWord()
{
- using (DbModel edm = new DbModel())
+ using (WmsDBModel.WmsDBModel edm = new WmsDBModel.WmsDBModel())
{
- return Convert.ToString(edm.Base_BasicDataSet.Where(x => x.BasicDataType == "2").Select(x => x.BasicDataValue).FirstOrDefault());
+ return Convert.ToString(edm.wms_sys_basic_data.Where(x => x.BasicDataType == "2").Select(x => x.BasicDataValue).FirstOrDefault());
}
}
@@ -39,9 +35,9 @@
/// </summary>
/// <param name="edm"></param>
/// <returns></returns>
- public static Base_BasicDataSet GetMangerPassWordObject(DbModel edm)
+ public static wms_sys_basic_data GetMangerPassWordObject(WmsDBModel.WmsDBModel edm)
{
- return edm.Base_BasicDataSet.Where(x => x.BasicDataType == "2").FirstOrDefault();
+ return edm.wms_sys_basic_data.Where(x => x.BasicDataType == "2").FirstOrDefault();
}
}
diff --git a/CC/iWareSql/WmsDBModel/WmsDBModel.cs b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
index 95a4c2a..0385382 100644
--- a/CC/iWareSql/WmsDBModel/WmsDBModel.cs
+++ b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
@@ -74,6 +74,7 @@
public virtual DbSet<wms_record_print> wms_record_print { get; set; }
public virtual DbSet<wms_record_trans> wms_record_trans { get; set; }
public virtual DbSet<wms_stock_quan> wms_stock_quan { get; set; }
+ public virtual DbSet<wms_sys_basic_data> wms_sys_basic_data { get; set; }
public virtual DbSet<wms_sys_help_doc> wms_sys_help_doc { get; set; }
public virtual DbSet<wms_sys_pda_menu> wms_sys_pda_menu { get; set; }
public virtual DbSet<wms_sys_pda_role_menu> wms_sys_pda_role_menu { get; set; }
diff --git a/CC/iWareSql/WmsDBModel/wms_sys_basic_data.cs b/CC/iWareSql/WmsDBModel/wms_sys_basic_data.cs
new file mode 100644
index 0000000..0d4e564
--- /dev/null
+++ b/CC/iWareSql/WmsDBModel/wms_sys_basic_data.cs
@@ -0,0 +1,51 @@
+namespace iWareSql.WmsDBModel
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel.DataAnnotations;
+ using System.ComponentModel.DataAnnotations.Schema;
+ using System.Data.Entity.Spatial;
+
+ public partial class wms_sys_basic_data
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string BasicDataType { get; set; }
+
+ [StringLength(50)]
+ public string BasicDataValue { get; set; }
+
+ [StringLength(50)]
+ public string Machine { get; set; }
+
+ [StringLength(50)]
+ public string LastMachine { get; set; }
+
+ public DateTime? OnLineTime { get; set; }
+
+ public DateTime? LastUnLineTime { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ public bool IsDelete { get; set; }
+
+
+ [StringLength(50)]
+ public string OperationRemark { get; set; }
+ }
+}
diff --git a/CC/iWareSql/iWareSql.csproj b/CC/iWareSql/iWareSql.csproj
index d062ac5..7707b83 100644
--- a/CC/iWareSql/iWareSql.csproj
+++ b/CC/iWareSql/iWareSql.csproj
@@ -221,6 +221,7 @@
<Compile Include="WmsDBModel\wms_record_print.cs" />
<Compile Include="WmsDBModel\wms_record_trans.cs" />
<Compile Include="WmsDBModel\wms_stock_quan.cs" />
+ <Compile Include="WmsDBModel\wms_sys_basic_data.cs" />
<Compile Include="WmsDBModel\wms_sys_help_doc.cs" />
<Compile Include="WmsDBModel\wms_sys_pda_menu.cs" />
<Compile Include="WmsDBModel\wms_sys_pda_role_menu.cs" />
diff --git a/DBScript/02_DML/01_InitData.sql b/DBScript/02_DML/01_InitData.sql
index ac2eb94..5b4c7d0 100644
--- a/DBScript/02_DML/01_InitData.sql
+++ b/DBScript/02_DML/01_InitData.sql
@@ -1,28 +1,29 @@
- DELETE Base_BasicDataSet where BasicDataType='1';
-INSERT INTO Base_BasicDataSet(
+ DELETE wms_sys_basic_data where BasicDataType='1';
+INSERT INTO wms_sys_basic_data(
+ [id],
[BasicDataType],
[BasicDataValue],
- [BasicDataUnit],
[OperationRemark],
- [CreateBy],
+ [CreateUserName],
[CreateTime],
- [ModifyBy],
- [ModifyTime]
+ [UpdateUserName],
+ [UpdateTime],
+ [IsDelete]
)
VALUES
(
+ '613664349835334',
'1', -- 璋冨害绯荤粺鍚姩鐩稿叧
'000000', -- 鏈夊�煎氨浠ｈ〃鏈夋満鍣ㄥ惎鍔ㄤ簡璋冨害绯荤粺 锛�000000鏄粯璁ょ殑绌哄�硷級
- '',
'璋冨害绯荤粺鍚姩鐩稿叧',
'sys',
getdate(),
'sys',
- getdate()
+ getdate(),
+ 0
);
-
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsSystem/WmsSysBasicData.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsSystem/WmsSysBasicData.cs
new file mode 100644
index 0000000..b796b68
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsSystem/WmsSysBasicData.cs
@@ -0,0 +1,69 @@
+锘縰sing Admin.NET.Core;
+
+/*
+ * @author : 鎮ㄧ殑鍚嶅瓧
+ * @date : 2024/8/8涓婂崍8:57:05
+ * @desc : 绯荤粺甯姪鏂囨。
+ */
+namespace Admin.NET.Application.Entity
+{
+ /// <summary>
+ /// 绯荤粺鍩虹鏁版嵁閰嶇疆
+ /// </summary>
+ [SugarTable("wms_sys_basic_data", "绯荤粺鍩虹鏁版嵁閰嶇疆")]
+ public class WmsSysBasicData : EntityBase
+ {
+
+ /// <summary>
+ /// 绫诲瀷
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "BasicDataType", ColumnDescription = "绫诲瀷", Length = 50)]
+
+ public string BasicDataType { get; set; }
+
+
+ /// <summary>
+ /// 鍊�
+ /// </summary>
+ [SugarColumn(ColumnName = "BasicDataValue", ColumnDescription = "鍊�", Length = 50)]
+
+ public string? BasicDataValue { get; set; }
+
+
+ /// <summary>
+ /// 鏈哄櫒鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "Machine", ColumnDescription = "鏈哄櫒鍚�", Length = 50)]
+
+ public string? Machine { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庣殑鏈哄櫒鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "LastMachine", ColumnDescription = "鏈�鍚庣殑鏈哄櫒鍚�", Length = 50)]
+
+ public string? LastMachine { get; set; }
+
+ /// <summary>
+ /// 涓婄嚎鏃堕棿
+ /// </summary>
+
+ [SugarColumn(ColumnName = "OnLineTime", ColumnDescription = "涓婄嚎鏃堕棿")]
+ public DateTime? OnLineTime { get; set; }
+
+ /// <summary>
+ /// 涓嬬嚎鏃堕棿
+ /// </summary>
+
+ [SugarColumn(ColumnName = "LastUnLineTime", ColumnDescription = "涓嬬嚎鏃堕棿")]
+ public DateTime? LastUnLineTime { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔璇存槑
+ /// </summary>
+ [SugarColumn(ColumnName = "OperationRemark", ColumnDescription = "鎿嶄綔璇存槑", Length = 50)]
+
+ public string? OperationRemark { get; set; }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3