11

schangxiang@126.com

2024-12-02 db38a36244caaddd417456065ac8954f56886395

11

 CC/iWareCC_ASRS/ThreadService/00_269¹¤Î»/DataProcess_269.cs

@@ -34,7 +34,8 @@
                SystemWarningMsg._lbl_alert_DataProcess_269 = string.Empty;
                try
                {
                    if (SystemValue.isAllowRuning_DataProcess_269 && SystemValue.isStartedModel)
                    //if (SystemValue.isAllowRuning_DataProcess_269 && SystemValue.isStartedModel)
                    if (SystemValue.isStartedModel)
                    {
                        var rgvLocation = StationLocationEnum.首次扫码工位.ToString();
                        /*
@@ -75,6 +76,6 @@
            }
        }

    

    }
}

 CC/iWareSql/DataAccess/WmsRecordUpiProcessHandler.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@


using iWareCommon.Utils;
using iWareModel.Entity.AGV;
using iWareModel.EnumType.EDevice.AGV;
using iWareSql.DBModel;
using iWareSql.WmsDBModel;
using System;
using System.Collections.Generic;
using System.Linq;

namespace iWareSql.DataAccess
{
    public class WmsRecordUpiProcessHandler
    {
        /// <summary>
        /// ä¿å­˜AGV实时数据
        /// </summary>
        /// <param name="vehicles"></param>
        public static void SaveAgvData(mes_batchOrderUPI_new orderUPI_New )
        {
            wms_record_upi_process upi_Process = new wms_record_upi_process()
            {

            };
        }


    }
}

 CC/iWareSql/WmsDBModel/WmsDBModel.cs

@@ -78,8 +78,10 @@
        public virtual DbSet<wms_log_action> wms_log_action { get; set; }
        public virtual DbSet<wms_rbline_runmode> wms_rbline_runmode { get; set; }
        public virtual DbSet<wms_rbline_task> wms_rbline_task { get; set; }
        public virtual DbSet<wms_record_package_process> wms_record_package_process { get; set; }
        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_record_upi_process> wms_record_upi_process { 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; }
@@ -97,6 +99,10 @@

        protected override void OnModelCreating(DbModelBuilder modelBuilder)
        {
            modelBuilder.Entity<mes_batchOrderUPI_new>()
                .Property(e => e.Info18)
                .IsUnicode(false);

            modelBuilder.Entity<mes_order_gather>()
                .Property(e => e.AllPackageArea)
                .HasPrecision(18, 4);

 CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs

@@ -115,5 +115,10 @@
        public string UpdateUserName { get; set; }

        public bool IsDelete { get; set; }

        public int? UpiFlag { get; set; }

        [StringLength(60)]
        public string Info18 { get; set; }
    }
}

 CC/iWareSql/WmsDBModel/mes_order_gather.cs

@@ -28,6 +28,7 @@

        public DateTime? UnlineTime { get; set; }

        [StringLength(50)]
        public string UnlinePerson { get; set; }

        public int PackageNum { get; set; }

 CC/iWareSql/WmsDBModel/mes_package_gather.cs

@@ -77,5 +77,7 @@
        public string UpdateUserName { get; set; }

        public bool IsDelete { get; set; }

        public int? UpiFlag { get; set; }
    }
}

 CC/iWareSql/WmsDBModel/mes_package_unline_record.cs

@@ -15,6 +15,8 @@
        [StringLength(50)]
        public string PackageCode { get; set; }

        public int? UpiFlag { get; set; }

        [StringLength(60)]
        public string Info5 { get; set; }

@@ -74,8 +76,5 @@
        public string UpdateUserName { get; set; }

        public bool IsDelete { get; set; }

        [StringLength(60)]
        public string Info9 { get; set; }
    }
}

 CC/iWareSql/WmsDBModel/mes_push_papercut.cs

@@ -19,7 +19,7 @@

        public DateTime? PushTime { get; set; }

        public int PushNum { get; set; } = 0;
        public int PushNum { get; set; }

        [Required]
        [StringLength(50)]

 CC/iWareSql/WmsDBModel/wms_record_package_process.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
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_record_package_process
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }

        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }

        [StringLength(60)]
        public string Info5 { get; set; }

        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }

        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }

        public int UpiStatus { get; set; }

        public int? UpiFlag { get; set; }

        [StringLength(255)]
        public string Location { get; set; }

        [StringLength(100)]
        public string OperRemark { get; set; }

        public DateTime? CreateTime { get; set; }

        public long? CreateUserId { get; set; }

        [StringLength(64)]
        public string CreateUserName { get; set; }
    }
}

 CC/iWareSql/WmsDBModel/wms_record_upi_process.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
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_record_upi_process
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }

        [Required]
        [StringLength(50)]
        public string Upi { get; set; }

        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }

        [StringLength(60)]
        public string Info5 { get; set; }

        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }

        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }

        public int UpiStatus { get; set; }

        public int? UpiFlag { get; set; }

        [StringLength(255)]
        public string Location { get; set; }

        [Required]
        [StringLength(50)]
        public string DetailName { get; set; }

        [StringLength(60)]
        public string Info18 { get; set; }

        [StringLength(100)]
        public string OperRemark { get; set; }

        public DateTime? CreateTime { get; set; }

        public long? CreateUserId { get; set; }

        [StringLength(64)]
        public string CreateUserName { get; set; }
    }
}

 CC/iWareSql/iWareSql.csproj

@@ -55,6 +55,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="DataAccess\WmsRecordUpiProcessHandler.cs" />
    <Compile Include="DataAccess\TaskHandler.cs" />
    <Compile Include="DataAccess\AgvHandler.cs" />
    <Compile Include="DataAccess\Base_CodeItemsHandler.cs" />
@@ -226,8 +227,10 @@
    <Compile Include="WmsDBModel\wms_log_action.cs" />
    <Compile Include="WmsDBModel\wms_rbline_runmode.cs" />
    <Compile Include="WmsDBModel\wms_rbline_task.cs" />
    <Compile Include="WmsDBModel\wms_record_package_process.cs" />
    <Compile Include="WmsDBModel\wms_record_print.cs" />
    <Compile Include="WmsDBModel\wms_record_trans.cs" />
    <Compile Include="WmsDBModel\wms_record_upi_process.cs" />
    <Compile Include="WmsDBModel\wms_stock_quan.cs" />
    <Compile Include="WmsDBModel\wms_sys_basic_data.cs" />
    <Compile Include="WmsDBModel\wms_sys_help_doc.cs" />

 SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs

@@ -25,6 +25,8 @@
        public static string W_DBHeaderWithSeparate_BZ21 = "3004" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
        public static string W_DBHeaderWithSeparate_BZ30 = "3005" + WareSdaStruct.PLCDBADDRESS_SEPARATE;

        public static string W_DBHeaderWithSeparate_269 = "3006" + WareSdaStruct.PLCDBADDRESS_SEPARATE;

        /// <summary>
        /// è¯»å–DB
        /// </summary>
@@ -150,6 +152,8 @@
            _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
            {
                StationCode = StationLocationEnum.首次扫码工位.ToString(),

                W_DataFinish = W_DBHeaderWithSeparate_269 + "0.0",
            });
            _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
            {
@@ -190,7 +194,7 @@

                W_DataFinish = W_DBHeaderWithSeparate_BZ12 + "0.0",
                W_EndMark = W_DBHeaderWithSeparate_BZ12 + "0.1",
                W_FirstMark= W_DBHeaderWithSeparate_BZ12 + "0.3",
                W_FirstMark = W_DBHeaderWithSeparate_BZ12 + "0.3",
                W_PalletizingPlaceX = W_DBHeaderWithSeparate_BZ12 + "12.0",
                W_PalletizingPlaceY = W_DBHeaderWithSeparate_BZ12 + "14.0",
                W_PalletizingPlaceZ = W_DBHeaderWithSeparate_BZ12 + "16.0",
@@ -201,7 +205,7 @@
                W_Length = W_DBHeaderWithSeparate_BZ12 + "2.0",
                W_Width = W_DBHeaderWithSeparate_BZ12 + "4.0",
                W_Height = W_DBHeaderWithSeparate_BZ12 + "6.0",
                W_PalletizingBucketType= W_DBHeaderWithSeparate_BZ12 + "20.0",
                W_PalletizingBucketType = W_DBHeaderWithSeparate_BZ12 + "20.0",
                W_PalletizingStation = W_DBHeaderWithSeparate_BZ12 + "10.0",
                W_PalletizingTaskFinish = W_DBHeaderWithSeparate_BZ12 + "0.2",
            });
@@ -246,6 +250,14 @@

            _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
            {
                StationCode = StationLocationEnum.首次扫码工位.ToString(),

                R_ReqParseData = W_DBHeaderWithSeparate_269 + "50.0",
                R_ReadCodeResult = W_DBHeaderWithSeparate_269 + "52.0",
            });

            _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
            {
                StationCode = StationLocationEnum.BZ01.ToString(),

                R_ReqParseData = W_DBHeaderWithSeparate_BZ01 + "50.0",