22
schangxiang@126.com
2024-11-28 aa1fa59aef9c9a115dee92e505752c9a8e7b7265
22
已添加7个文件
已重命名1个文件
已修改11个文件
已删除1个文件
已复制3个文件
844 ■■■■ 文件已修改
CC/iWareCC_ASRS/ThreadService/04_BZ21(搬运整垛机器人)/DataProcess_BZ21.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/DataAccess/TCSCommon.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/V_Station_Quan.cs 134 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/WmsDBModel.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/mes_PushPackageCode.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/mes_package_gather.cs 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/mes_package_linequeue.cs 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/mes_package_unline_record.cs 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/mes_push_packagecode.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/mes_push_papercut.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/WmsDBModel/wms_rbline_runmode.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/iWareSql.csproj 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/WmsDBModel.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_gather.cs 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_linequeue.cs 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_unline_record.cs 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_packagecode.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_papercut.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/iWareSql.csproj 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Print/打印模板文件/包装条码模板_二维码.btw 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Web/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/DataProcess_BZ21.cs
@@ -92,7 +92,7 @@
                                //记录任务
                                var _id = Yitter.IdGenerator.YitIdHelper.NextId();
                                var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
                                var putpakegecode = new mes_PushPackageCode()
                                var putpakegecode = new mes_push_packagecode()
                                {
                                    Id = _id,
                                    PackageCode=upiObj.PackageCode,
@@ -128,7 +128,7 @@
                                };
                                wmsDB.wms_rbline_task.Add(task);
                                wmsDB.mes_PushPackageCode.Add(putpakegecode);
                                wmsDB.mes_push_packagecode.Add(putpakegecode);
                                using (StationServiceClient client = new StationServiceClient())
                                {
@@ -164,7 +164,7 @@
                Thread.Sleep(2000);
                using (WmsDBModel edm = new WmsDBModel())
                {
                    var value = edm.mes_PushPackageCode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
                    var value = edm.mes_push_packagecode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
                    if (value != null)
                    {
                        PushPackageCodeInput input = new PushPackageCodeInput();
CC/iWareSql/DataAccess/TCSCommon.cs
@@ -47,26 +47,6 @@
            return PlaceType;
        }
        /// <summary>
        /// æ ¹æ®å®žé™…情况转换长和宽
        /// </summary>
        /// <param name="UpiInfo"></param>
        /// <param name="PhysicalLength">物理长度</param>
        /// <param name="PhysicalWidth">物理宽度</param>
        private static void GetPhysicalWidthLength(mes_batchOrderUPI_new UpiInfo, ref double PhysicalLength, ref double PhysicalWidth)
        {
            if (UpiInfo.Rotation > 0)
            {//如果是四面钻,物理长和宽对调
                PhysicalWidth = UpiInfo.Length;
                PhysicalLength = UpiInfo.Width;
            }
            else
            {
                PhysicalLength = UpiInfo.Length;
                PhysicalWidth = UpiInfo.Width;
            }
        }
    }
}
CC/iWareSql/WmsDBModel/V_Station_Quan.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,134 @@
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 V_Station_Quan
    {
        [Key]
        [Column(Order = 0)]
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
        [Key]
        [Column(Order = 1)]
        [StringLength(50)]
        public string PlaceCode { get; set; }
        [Key]
        [Column(Order = 2)]
        [StringLength(50)]
        public string PlaceName { get; set; }
        [Key]
        [Column(Order = 3)]
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public int PlaceType { get; set; }
        [StringLength(50)]
        public string PlaceTypeName { get; set; }
        public decimal? stationLength { get; set; }
        public decimal? Width { get; set; }
        public decimal? Height { get; set; }
        public decimal? Thick { get; set; }
        [Key]
        [Column(Order = 4)]
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public int PlaceStatus { get; set; }
        [Key]
        [Column(Order = 5)]
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long AreaId { get; set; }
        [StringLength(50)]
        public string AreaCode { get; set; }
        [StringLength(50)]
        public string AreaName { get; set; }
        public int? RowNo { get; set; }
        public int? ColumnNo { get; set; }
        public int? LayerNo { get; set; }
        public int? LaneNo { get; set; }
        public bool? IsVirtually { get; set; }
        [Key]
        [Column(Order = 6)]
        public bool IsDisabled { 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; }
        [Key]
        [Column(Order = 7)]
        public bool IsDelete { get; set; }
        public DateTime? InTime { get; set; }
        [StringLength(100)]
        public string Upi { get; set; }
        [StringLength(100)]
        public string DetailName { get; set; }
        [StringLength(100)]
        public string PlanNo { get; set; }
        [StringLength(100)]
        public string OrderId { get; set; }
        [StringLength(100)]
        public string PackageCode { get; set; }
        public double? Length { get; set; }
        public double? Thk { get; set; }
        public int? StockStatus { get; set; }
        [StringLength(50)]
        public string StockStatusName { get; set; }
        [StringLength(255)]
        public string OperReason { get; set; }
        [StringLength(50)]
        public string OperUser { get; set; }
        public DateTime? OperTime { get; set; }
        public int? LockStatus { get; set; }
        [StringLength(255)]
        public string LockReason { get; set; }
        [StringLength(50)]
        public string LockUser { get; set; }
        public DateTime? LockTime { get; set; }
    }
}
CC/iWareSql/WmsDBModel/WmsDBModel.cs
@@ -11,12 +11,17 @@
            : base("name=WmsDBModel")
        {
        }
        public virtual DbSet<mes_batchOrderUPI_new> mes_batchOrderUPI_new { get; set; }
        public virtual DbSet<mes_PushPackageCode> mes_PushPackageCode { get; set; }
        public virtual DbSet<ApprovalFlow> ApprovalFlow { get; set; }
        public virtual DbSet<DingTalkUser> DingTalkUser { get; set; }
        public virtual DbSet<GoViewPro> GoViewPro { get; set; }
        public virtual DbSet<GoViewProData> GoViewProData { get; set; }
        public virtual DbSet<mes_batchOrderUPI_new> mes_batchOrderUPI_new { get; set; }
        public virtual DbSet<mes_package_gather> mes_package_gather { get; set; }
        public virtual DbSet<mes_package_linequeue> mes_package_linequeue { get; set; }
        public virtual DbSet<mes_package_unline_record> mes_package_unline_record { get; set; }
        public virtual DbSet<mes_push_packagecode> mes_push_packagecode { get; set; }
        public virtual DbSet<mes_push_papercut> mes_push_papercut { get; set; }
        public virtual DbSet<SysCodeGen> SysCodeGen { get; set; }
        public virtual DbSet<SysCodeGenConfig> SysCodeGenConfig { get; set; }
        public virtual DbSet<SysConfig> SysConfig { get; set; }
@@ -87,6 +92,7 @@
        public virtual DbSet<zero_interface_list> zero_interface_list { get; set; }
        public virtual DbSet<zero_user_info> zero_user_info { get; set; }
        public virtual DbSet<V_EmptyStation> V_EmptyStation { get; set; }
        public virtual DbSet<V_Station_Quan> V_Station_Quan { get; set; }
        protected override void OnModelCreating(DbModelBuilder modelBuilder)
        {
@@ -150,8 +156,6 @@
                .Property(e => e.Height)
                .HasPrecision(10, 3);
            modelBuilder.Entity<wms_record_trans>()
                .Property(e => e.SourceQuantity)
                .HasPrecision(10, 3);
@@ -179,6 +183,22 @@
            modelBuilder.Entity<V_EmptyStation>()
                .Property(e => e.Thick)
                .HasPrecision(10, 3);
            modelBuilder.Entity<V_Station_Quan>()
                .Property(e => e.stationLength)
                .HasPrecision(10, 3);
            modelBuilder.Entity<V_Station_Quan>()
                .Property(e => e.Width)
                .HasPrecision(10, 3);
            modelBuilder.Entity<V_Station_Quan>()
                .Property(e => e.Height)
                .HasPrecision(10, 3);
            modelBuilder.Entity<V_Station_Quan>()
                .Property(e => e.Thick)
                .HasPrecision(10, 3);
        }
    }
}
CC/iWareSql/WmsDBModel/mes_PushPackageCode.cs
ÎļþÒÑɾ³ý
CC/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs
@@ -11,9 +11,9 @@
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
        public int? AreaCode { get; set; }
        public int UpiStatus { get; set; }
        [Required]
        [StringLength(50)]
        public string UPI { get; set; }
        [Required]
        [StringLength(50)]
@@ -23,9 +23,12 @@
        [StringLength(50)]
        public string OrderId { get; set; }
        [Required]
        [StringLength(50)]
        public string UPI { get; set; }
        [StringLength(60)]
        public string Info5 { get; set; }
        public int? AreaCode { get; set; }
        public int UpiStatus { get; set; }
        [Required]
        [StringLength(50)]
@@ -37,16 +40,7 @@
        public double Thk { get; set; }
        [StringLength(50)]
        public string Matgrid { get; set; }
        public int? IsEB { get; set; }
        public int? DRNum { get; set; }
        public int? IsPA { get; set; }
        public int? MaterialIndeX { get; set; }
        [Required]
        [StringLength(50)]
@@ -62,35 +56,14 @@
        public int? Shelf { get; set; }
        public double? Rotation { get; set; }
        public double? Info1 { get; set; }
        public double? Info2 { get; set; }
        public double? Info3 { 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(60)]
        public string Info4 { get; set; }
        [StringLength(60)]
        public string Info5 { get; set; }
        [StringLength(60)]
        public string Info6 { get; set; }
@@ -126,5 +99,21 @@
        [StringLength(60)]
        public string Info17 { 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; }
    }
}
CC/iWareSql/WmsDBModel/mes_package_gather.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
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 mes_package_gather
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }
        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }
        [StringLength(60)]
        public string Info5 { get; set; }
        public int? AreaCode { get; set; }
        public int UpiStatus { get; set; }
        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }
        public double? Info1 { get; set; }
        public double? Info2 { get; set; }
        public double? Info3 { get; set; }
        [StringLength(60)]
        public string Info4 { get; set; }
        [StringLength(60)]
        public string Info6 { get; set; }
        [StringLength(60)]
        public string Info7 { get; set; }
        [StringLength(60)]
        public string Info8 { get; set; }
        [StringLength(60)]
        public string Info10 { get; set; }
        [StringLength(60)]
        public string Info9 { get; set; }
        [StringLength(60)]
        public string Info11 { get; set; }
        [StringLength(60)]
        public string Info12 { get; set; }
        [StringLength(60)]
        public string Info13 { 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; }
    }
}
CC/iWareSql/WmsDBModel/mes_package_linequeue.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
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 mes_package_linequeue
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }
        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }
        [StringLength(60)]
        public string Info5 { get; set; }
        public int? AreaCode { get; set; }
        public int UpiStatus { get; set; }
        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }
        public double? Info1 { get; set; }
        public double? Info2 { get; set; }
        public double? Info3 { get; set; }
        [StringLength(60)]
        public string Info4 { get; set; }
        [StringLength(60)]
        public string Info6 { get; set; }
        [StringLength(60)]
        public string Info7 { get; set; }
        [StringLength(60)]
        public string Info8 { get; set; }
        [StringLength(60)]
        public string Info10 { get; set; }
        [StringLength(60)]
        public string Info9 { get; set; }
        [StringLength(60)]
        public string Info11 { get; set; }
        [StringLength(60)]
        public string Info12 { get; set; }
        [StringLength(60)]
        public string Info13 { 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; }
    }
}
CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,81 @@
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 mes_package_unline_record
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }
        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }
        [StringLength(60)]
        public string Info5 { get; set; }
        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }
        public double? Info1 { get; set; }
        public double? Info2 { get; set; }
        public double? Info3 { get; set; }
        [StringLength(60)]
        public string Info4 { get; set; }
        [StringLength(60)]
        public string Info6 { get; set; }
        [StringLength(60)]
        public string Info7 { get; set; }
        [StringLength(60)]
        public string Info8 { get; set; }
        [StringLength(60)]
        public string Info10 { get; set; }
        [StringLength(60)]
        public string Info9 { get; set; }
        [StringLength(60)]
        public string Info11 { get; set; }
        [StringLength(60)]
        public string Info12 { get; set; }
        [StringLength(60)]
        public string Info13 { get; set; }
        [StringLength(60)]
        public string OpRemark { 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; }
    }
}
CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs copy to CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs ¸´ÖÆ
@@ -6,7 +6,7 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;
    public partial class mes_PushPackageCode
    public partial class mes_push_packagecode
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
@@ -17,6 +17,8 @@
        public int PushStatus { get; set; }
        public DateTime? PushTime { get; set; }
        public int PushNum { get; set; }
        [Required]
CC/iWareSql/WmsDBModel/mes_push_papercut.cs
copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs copy to CC/iWareSql/WmsDBModel/mes_push_papercut.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs ¸´ÖÆ
@@ -6,7 +6,7 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;
    public partial class mes_PushPackageCode
    public partial class mes_push_papercut
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
@@ -15,8 +15,16 @@
        [StringLength(50)]
        public string PackageCode { get; set; }
        public double? Info1 { get; set; }
        public double? Info2 { get; set; }
        public double? Info3 { get; set; }
        public int PushStatus { get; set; }
        public DateTime? PushTime { get; set; }
        public int PushNum { get; set; }
        [Required]
CC/iWareSql/WmsDBModel/wms_rbline_runmode.cs
@@ -44,14 +44,9 @@
        public bool IsDelete { get; set; }
        /// <summary>
        /// ä¸Šä¸€æ¬¡ç åž›ç¼–号
        /// </summary>
        [StringLength(50)]
        public string PalletizingUPI { get; set; }
        /// <summary>
        /// ä¸Šä¸€æ¬¡ç åž›ç«™ç‚¹
        /// </summary>
        public int? PalletizingStation { get; set; }
    }
}
CC/iWareSql/iWareSql.csproj
@@ -162,7 +162,11 @@
    <Compile Include="WmsDBModel\GoViewPro.cs" />
    <Compile Include="WmsDBModel\GoViewProData.cs" />
    <Compile Include="WmsDBModel\mes_batchOrderUPI_new.cs" />
    <Compile Include="WmsDBModel\mes_PushPackageCode.cs" />
    <Compile Include="WmsDBModel\mes_package_gather.cs" />
    <Compile Include="WmsDBModel\mes_package_linequeue.cs" />
    <Compile Include="WmsDBModel\mes_package_unline_record.cs" />
    <Compile Include="WmsDBModel\mes_push_packagecode.cs" />
    <Compile Include="WmsDBModel\mes_push_papercut.cs" />
    <Compile Include="WmsDBModel\SysCodeGen.cs" />
    <Compile Include="WmsDBModel\SysCodeGenConfig.cs" />
    <Compile Include="WmsDBModel\SysConfig.cs" />
@@ -202,6 +206,7 @@
    <Compile Include="WmsDBModel\Test_Student.cs" />
    <Compile Include="WmsDBModel\Test_Teachert.cs" />
    <Compile Include="WmsDBModel\V_EmptyStation.cs" />
    <Compile Include="WmsDBModel\V_Station_Quan.cs" />
    <Compile Include="WmsDBModel\WmsDBModel.cs" />
    <Compile Include="WmsDBModel\wms_adapter_categories.cs" />
    <Compile Include="WmsDBModel\wms_adapter_management.cs" />
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -325,6 +325,9 @@
                        data.Add("Info13", item.Info13 ?? "");//当前包面积
                        data.Add("printTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                        //mycontext.mes
                        data.Add("leijisaomiaomj", item.Info13 ?? "");//累计扫描面积
                        //查询下 åŒ…数据
                        var mylist = mycontext.mes_batchOrderUPI_new.Where(x => x.PackageCode == item.PackageCode).ToList();
                        var gg = mylist.GroupBy(x => x.DetailName);
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/WmsDBModel.cs
@@ -17,7 +17,11 @@
        public virtual DbSet<GoViewPro> GoViewPro { get; set; }
        public virtual DbSet<GoViewProData> GoViewProData { get; set; }
        public virtual DbSet<mes_batchOrderUPI_new> mes_batchOrderUPI_new { get; set; }
        public virtual DbSet<mes_PushPackageCode> mes_PushPackageCode { get; set; }
        public virtual DbSet<mes_package_gather> mes_package_gather { get; set; }
        public virtual DbSet<mes_package_linequeue> mes_package_linequeue { get; set; }
        public virtual DbSet<mes_package_unline_record> mes_package_unline_record { get; set; }
        public virtual DbSet<mes_push_packagecode> mes_push_packagecode { get; set; }
        public virtual DbSet<mes_push_papercut> mes_push_papercut { get; set; }
        public virtual DbSet<SysCodeGen> SysCodeGen { get; set; }
        public virtual DbSet<SysCodeGenConfig> SysCodeGenConfig { get; set; }
        public virtual DbSet<SysConfig> SysConfig { get; set; }
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_gather.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
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 mes_package_gather
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }
        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }
        [StringLength(60)]
        public string Info5 { get; set; }
        public int? AreaCode { get; set; }
        public int UpiStatus { get; set; }
        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }
        public double? Info1 { get; set; }
        public double? Info2 { get; set; }
        public double? Info3 { get; set; }
        [StringLength(60)]
        public string Info4 { get; set; }
        [StringLength(60)]
        public string Info6 { get; set; }
        [StringLength(60)]
        public string Info7 { get; set; }
        [StringLength(60)]
        public string Info8 { get; set; }
        [StringLength(60)]
        public string Info10 { get; set; }
        [StringLength(60)]
        public string Info9 { get; set; }
        [StringLength(60)]
        public string Info11 { get; set; }
        [StringLength(60)]
        public string Info12 { get; set; }
        [StringLength(60)]
        public string Info13 { 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; }
    }
}
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_linequeue.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
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 mes_package_linequeue
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }
        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }
        [StringLength(60)]
        public string Info5 { get; set; }
        public int? AreaCode { get; set; }
        public int UpiStatus { get; set; }
        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }
        public double? Info1 { get; set; }
        public double? Info2 { get; set; }
        public double? Info3 { get; set; }
        [StringLength(60)]
        public string Info4 { get; set; }
        [StringLength(60)]
        public string Info6 { get; set; }
        [StringLength(60)]
        public string Info7 { get; set; }
        [StringLength(60)]
        public string Info8 { get; set; }
        [StringLength(60)]
        public string Info10 { get; set; }
        [StringLength(60)]
        public string Info9 { get; set; }
        [StringLength(60)]
        public string Info11 { get; set; }
        [StringLength(60)]
        public string Info12 { get; set; }
        [StringLength(60)]
        public string Info13 { 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; }
    }
}
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_unline_record.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,81 @@
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 mes_package_unline_record
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
        [Required]
        [StringLength(50)]
        public string PlanNo { get; set; }
        [Required]
        [StringLength(50)]
        public string OrderId { get; set; }
        [StringLength(60)]
        public string Info5 { get; set; }
        [Required]
        [StringLength(50)]
        public string PackageCode { get; set; }
        public double? Info1 { get; set; }
        public double? Info2 { get; set; }
        public double? Info3 { get; set; }
        [StringLength(60)]
        public string Info4 { get; set; }
        [StringLength(60)]
        public string Info6 { get; set; }
        [StringLength(60)]
        public string Info7 { get; set; }
        [StringLength(60)]
        public string Info8 { get; set; }
        [StringLength(60)]
        public string Info10 { get; set; }
        [StringLength(60)]
        public string Info9 { get; set; }
        [StringLength(60)]
        public string Info11 { get; set; }
        [StringLength(60)]
        public string Info12 { get; set; }
        [StringLength(60)]
        public string Info13 { get; set; }
        [StringLength(60)]
        public string OpRemark { 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; }
    }
}
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_packagecode.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs ÐÞ¸Ä
@@ -6,7 +6,7 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;
    public partial class mes_PushPackageCode
    public partial class mes_push_packagecode
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
@@ -17,6 +17,8 @@
        public int PushStatus { get; set; }
        public DateTime? PushTime { get; set; }
        public int PushNum { get; set; }
        [Required]
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_papercut.cs
copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs copy to LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_papercut.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs ¸´ÖÆ
@@ -6,7 +6,7 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;
    public partial class mes_PushPackageCode
    public partial class mes_push_papercut
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }
@@ -15,8 +15,16 @@
        [StringLength(50)]
        public string PackageCode { get; set; }
        public double? Info1 { get; set; }
        public double? Info2 { get; set; }
        public double? Info3 { get; set; }
        public int PushStatus { get; set; }
        public DateTime? PushTime { get; set; }
        public int PushNum { get; set; }
        [Required]
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/iWareSql.csproj
@@ -264,7 +264,11 @@
    <Compile Include="WmsDBModel\GoViewPro.cs" />
    <Compile Include="WmsDBModel\GoViewProData.cs" />
    <Compile Include="WmsDBModel\mes_batchOrderUPI_new.cs" />
    <Compile Include="WmsDBModel\mes_PushPackageCode.cs" />
    <Compile Include="WmsDBModel\mes_package_gather.cs" />
    <Compile Include="WmsDBModel\mes_package_linequeue.cs" />
    <Compile Include="WmsDBModel\mes_package_unline_record.cs" />
    <Compile Include="WmsDBModel\mes_push_packagecode.cs" />
    <Compile Include="WmsDBModel\mes_push_papercut.cs" />
    <Compile Include="WmsDBModel\SysCodeGen.cs" />
    <Compile Include="WmsDBModel\SysCodeGenConfig.cs" />
    <Compile Include="WmsDBModel\SysConfig.cs" />
LA24030_LuLiPackageLine_Print/´òÓ¡Ä£°åÎļþ/°ü×°ÌõÂëÄ£°å_¶þάÂë.btw
Binary files differ
LA24030_LuLiPackageLine_Web/index.html
@@ -6,7 +6,7 @@
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
        <link rel="stylesheet" type="text/css" media="print" href="/print-lock.css" />
        <link rel="icon" href="/favicon.ico" />
        <title>标准化原材料库</title>
        <title>鲁丽木业包装线</title>
    </head>
    <body>
        <div id="app"></div>