schangxiang@126.com
2024-11-22 0b417bdc320a980cef619d9a88ce3cb0511b498b
程序唯一性校验
已添加2个文件
已修改8个文件
172 ■■■■ 文件已修改
CC/iWareCC_ASRS/App - 本机.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/App - 正式.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/App.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/FormCC.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/DataAccess/BasicDataSetHandler.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/WmsDBModel.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/wms_sys_basic_data.cs 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/iWareSql.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DBScript/02_DML/01_InitData.sql 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsSystem/WmsSysBasicData.cs 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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.5" />
CC/iWareCC_ASRS/App - Õýʽ.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" />
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"/>
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)
CC/iWareSql/DataAccess/BasicDataSetHandler.cs
@@ -1,10 +1,6 @@
using iWareSql.Orm;
using 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();
        }
      
    }
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; }
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; }
    }
}
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" />
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
    );
    
    
    
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsSystem/WmsSysBasicData.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
using 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; }
    }
}