add

zongzhibin

2024-11-28 093a1f1e49f482a58cb95f6562ab6c890bb03c89

add

 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

copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/V_EmptyStation.cs
copy to CC/iWareSql/WmsDBModel/V_Station_Quan.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/V_EmptyStation.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -6,7 +6,7 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;

    public partial class V_EmptyStation
    public partial class V_Station_Quan
    {
        [Key]
        [Column(Order = 0)]
@@ -31,7 +31,7 @@
        [StringLength(50)]
        public string PlaceTypeName { get; set; }

        public decimal? Length { get; set; }
        public decimal? stationLength { get; set; }

        public decimal? Width { get; set; }

@@ -86,5 +86,49 @@
        [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

copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs
copy to CC/iWareSql/WmsDBModel/mes_package_gather.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -6,24 +6,38 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;

    public partial class wms_record_print
    public partial class mes_package_gather
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }

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

        public int PrintSource { 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; }

        [StringLength(60)]
        public string Info4 { get; set; }
        public double? Info1 { get; set; }

        public double? Info2 { get; set; }

        public double? Info3 { get; set; }

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

        [StringLength(60)]
        public string Info6 { get; set; }
@@ -48,25 +62,6 @@

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

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

        public int? Info15 { get; set; }

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

        public int PrintSheetNum { get; set; }

        public int PrintNum { get; set; }

        public int PrintStatus { get; set; }

        public bool IsAllowPrint { get; set; }

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

        public DateTime? CreateTime { get; set; }


 CC/iWareSql/WmsDBModel/mes_package_linequeue.cs

copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs
copy to CC/iWareSql/WmsDBModel/mes_package_linequeue.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -6,24 +6,38 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;

    public partial class wms_record_print
    public partial class mes_package_linequeue
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }

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

        public int PrintSource { 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; }

        [StringLength(60)]
        public string Info4 { get; set; }
        public double? Info1 { get; set; }

        public double? Info2 { get; set; }

        public double? Info3 { get; set; }

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

        [StringLength(60)]
        public string Info6 { get; set; }
@@ -48,25 +62,6 @@

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

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

        public int? Info15 { get; set; }

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

        public int PrintSheetNum { get; set; }

        public int PrintNum { get; set; }

        public int PrintStatus { get; set; }

        public bool IsAllowPrint { get; set; }

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

        public DateTime? CreateTime { get; set; }


 CC/iWareSql/WmsDBModel/mes_package_unline_record.cs

copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs
copy to CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -6,24 +6,34 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;

    public partial class wms_record_print
    public partial class mes_package_unline_record
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }

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

        public int PrintSource { 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; }

        [StringLength(60)]
        public string Info4 { get; set; }
        public double? Info1 { get; set; }

        public double? Info2 { get; set; }

        public double? Info3 { get; set; }

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

        [StringLength(60)]
        public string Info6 { get; set; }
@@ -50,23 +60,7 @@
        public string Info13 { get; set; }

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

        public int? Info15 { get; set; }

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

        public int PrintSheetNum { get; set; }

        public int PrintNum { get; set; }

        public int PrintStatus { get; set; }

        public bool IsAllowPrint { get; set; }

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

        public DateTime? CreateTime { get; set; }


 CC/iWareSql/WmsDBModel/mes_push_packagecode.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/mes_PushPackageCode.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -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/mes_PushPackageCode.cs
copy to CC/iWareSql/WmsDBModel/mes_push_papercut.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/mes_PushPackageCode.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -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/App - ±¾»ú.config

@@ -16,9 +16,21 @@
  </entityFramework>
  <connectionStrings>
    <!--本地-->
    <add name="MyDbContext" connectionString="data source=.;initial catalog=WHMY_Prod_Test;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"/>
    </startup>
  <system.serviceModel>
    <bindings>
      <basicHttpBinding>
        <binding name="BasicHttpBinding_IPrintWcfService" />
      </basicHttpBinding>
    </bindings>
    <client>
      <endpoint address="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/"
        binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IPrintWcfService"
        contract="PrintBaseService.IPrintWcfService" name="BasicHttpBinding_IPrintWcfService" />
    </client>
  </system.serviceModel>
</configuration>

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/App - Õýʽ.config

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
  <configSections>
    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
  </configSections>
  <entityFramework>
    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
      <parameters>
        <parameter value="mssqllocaldb"/>
      </parameters>
    </defaultConnectionFactory>
    <providers>
      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
    </providers>
  </entityFramework>
  <connectionStrings>
    <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.8"/>
  </startup>
  <system.serviceModel>
    <bindings>
      <basicHttpBinding>
        <binding name="BasicHttpBinding_IPrintWcfService" />
      </basicHttpBinding>
    </bindings>
    <client>
      <endpoint address="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/"
        binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IPrintWcfService"
        contract="PrintBaseService.IPrintWcfService" name="BasicHttpBinding_IPrintWcfService" />
    </client>
  </system.serviceModel>
</configuration>

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/App.config

@@ -15,8 +15,7 @@
    </providers>
  </entityFramework>
  <connectionStrings>
    <!--本地-->
    <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"/>
    <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.8"/>

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs

@@ -7,6 +7,7 @@
using iWareSql;
using iWareSql.DataAccess;
using iWareSql.MyDbContext;
using iWareSql.WmsDBModel;
using System;
using System.Collections.Generic;
using System.Data;
@@ -324,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/WindowsFormsApplication1/iWarePrintService.csproj

@@ -141,6 +141,7 @@
      <DependentUpon>Resources.resx</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
    <None Include="App - æ­£å¼.config" />
    <None Include="App - æœ¬æœº.config" />
    <None Include="Connected Services\PrintBaseService\item.xsd">
      <SubType>Designer</SubType>

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/ApprovalFlow.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/ApprovalFlow.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/DingTalkUser.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/DingTalkUser.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/GoViewPro.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/GoViewPro.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/GoViewProData.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/GoViewProData.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysCodeGen.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysCodeGen.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysCodeGenConfig.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysCodeGenConfig.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysConfig.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysConfig.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysDictData.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysDictData.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysDictType.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysDictType.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysFile.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysFile.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysJobCluster.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysJobCluster.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysJobDetail.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysJobDetail.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysJobTrigger.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysJobTrigger.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysJobTriggerRecord.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysJobTriggerRecord.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysLdap.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysLdap.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysLogDiff.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysLogDiff.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysLogEx.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysLogEx.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysLogOp.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysLogOp.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysLogVis.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysLogVis.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysMenu.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysMenu.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysNotice.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysNotice.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysNoticeUser.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysNoticeUser.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysOnlineUser.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysOnlineUser.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysOpenAccess.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysOpenAccess.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysOrg.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysOrg.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysPlugin.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysPlugin.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysPos.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysPos.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysPrint.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysPrint.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysRegion.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysRegion.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysRole.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysRole.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysRoleMenu.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysRoleMenu.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysRoleOrg.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysRoleOrg.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysTenant.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysTenant.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysUser.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysUser.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysUserExtOrg.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysUserExtOrg.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysUserLdap.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysUserLdap.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysUserRole.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysUserRole.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysWechatPay.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysWechatPay.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysWechatUser.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysWechatUser.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/Test_Student.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/Test_Student.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/Test_Teachert.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/Test_Teachert.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/V_EmptyStation.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/V_EmptyStation.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/V_Station_Quan.cs

copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/V_EmptyStation.cs
copy to LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/V_Station_Quan.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/V_EmptyStation.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -6,7 +6,7 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;

    public partial class V_EmptyStation
    public partial class V_Station_Quan
    {
        [Key]
        [Column(Order = 0)]
@@ -31,7 +31,7 @@
        [StringLength(50)]
        public string PlaceTypeName { get; set; }

        public decimal? Length { get; set; }
        public decimal? stationLength { get; set; }

        public decimal? Width { get; set; }

@@ -86,5 +86,49 @@
        [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; }
    }
}

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/WmsDBModel.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel.cs ÐÞ¸Ä
@@ -3,7 +3,7 @@
using System.Data.Entity;
using System.Linq;

namespace iWareSql
namespace iWareSql.WmsDBModel
{
    public partial class WmsDBModel : DbContext
    {
@@ -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; }
@@ -88,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)
        {
@@ -178,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);
        }
    }
}

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/mes_batchOrderUPI_new.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -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,8 +56,6 @@

        public int? Shelf { get; set; }

        public double? Rotation { get; set; }

        public double? Info1 { get; set; }

        public double? Info2 { get; set; }
@@ -72,9 +64,6 @@

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

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

        [StringLength(60)]
        public string Info6 { get; set; }
@@ -108,6 +97,9 @@
        [StringLength(60)]
        public string Info16 { get; set; }

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

        public DateTime? CreateTime { get; set; }

        public DateTime? UpdateTime { get; set; }

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_gather.cs

copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs
copy to LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_gather.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -6,24 +6,38 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;

    public partial class wms_record_print
    public partial class mes_package_gather
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }

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

        public int PrintSource { 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; }

        [StringLength(60)]
        public string Info4 { get; set; }
        public double? Info1 { get; set; }

        public double? Info2 { get; set; }

        public double? Info3 { get; set; }

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

        [StringLength(60)]
        public string Info6 { get; set; }
@@ -48,25 +62,6 @@

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

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

        public int? Info15 { get; set; }

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

        public int PrintSheetNum { get; set; }

        public int PrintNum { get; set; }

        public int PrintStatus { get; set; }

        public bool IsAllowPrint { get; set; }

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

        public DateTime? CreateTime { get; set; }


 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_linequeue.cs

copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs
copy to LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_linequeue.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -6,24 +6,38 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;

    public partial class wms_record_print
    public partial class mes_package_linequeue
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }

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

        public int PrintSource { 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; }

        [StringLength(60)]
        public string Info4 { get; set; }
        public double? Info1 { get; set; }

        public double? Info2 { get; set; }

        public double? Info3 { get; set; }

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

        [StringLength(60)]
        public string Info6 { get; set; }
@@ -48,25 +62,6 @@

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

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

        public int? Info15 { get; set; }

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

        public int PrintSheetNum { get; set; }

        public int PrintNum { get; set; }

        public int PrintStatus { get; set; }

        public bool IsAllowPrint { get; set; }

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

        public DateTime? CreateTime { get; set; }


 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_unline_record.cs

copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs
copy to LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_package_unline_record.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -6,24 +6,34 @@
    using System.ComponentModel.DataAnnotations.Schema;
    using System.Data.Entity.Spatial;

    public partial class wms_record_print
    public partial class mes_package_unline_record
    {
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        public long Id { get; set; }

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

        public int PrintSource { 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; }

        [StringLength(60)]
        public string Info4 { get; set; }
        public double? Info1 { get; set; }

        public double? Info2 { get; set; }

        public double? Info3 { get; set; }

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

        [StringLength(60)]
        public string Info6 { get; set; }
@@ -50,23 +60,7 @@
        public string Info13 { get; set; }

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

        public int? Info15 { get; set; }

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

        public int PrintSheetNum { get; set; }

        public int PrintNum { get; set; }

        public int PrintStatus { get; set; }

        public bool IsAllowPrint { get; set; }

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

        public DateTime? CreateTime { get; set; }


 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_packagecode.cs

copy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/mes_PushPackageCode.cs
copy to LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_packagecode.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/mes_PushPackageCode.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -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/mes_PushPackageCode.cs
copy to LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_push_papercut.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/mes_PushPackageCode.cs ¸´ÖÆ
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;
@@ -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/WmsDBModel/test_place.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/test_place.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_adapter_categories.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_adapter_categories.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_adapter_management.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_adapter_management.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_adapter_record.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_adapter_record.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_area.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_area.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_factory.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_factory.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_material.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_material.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_material_type.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_material_type.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_place.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_place.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_warehouse.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_warehouse.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_config_no_rule.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_config_no_rule.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_config_print.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_config_print.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_config_serial_rule.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_config_serial_rule.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_config_serial_sn.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_config_serial_sn.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_config_sncode_rule.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_config_sncode_rule.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_log_action.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_log_action.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_rbline_runmode.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_rbline_runmode.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_rbline_task.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_rbline_task.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_record_print.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_record_trans.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_trans.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_stock_quan.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_stock_quan.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_sys_basic_data.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_sys_basic_data.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_sys_help_doc.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_sys_help_doc.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_sys_pda_menu.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_sys_pda_menu.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_sys_pda_role_menu.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_sys_pda_role_menu.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_task.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_task.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_database_info.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_database_info.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_entity_column_info.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_entity_column_info.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_entity_info.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_entity_info.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_interface_category.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_interface_category.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_interface_list.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_interface_list.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_user_info.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_user_info.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace iWareSql
namespace iWareSql.WmsDBModel
{
    using System;
    using System.Collections.Generic;

 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/iWareSql.csproj

@@ -55,14 +55,12 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="ApprovalFlow.cs" />
    <Compile Include="DataAccess\ContainerHandler.cs" />
    <Compile Include="DataAccess\PurchaseOrderHandler.cs" />
    <Compile Include="DataAccess\SapHandler.cs" />
    <Compile Include="DataAccess\SysDictDataHandler.cs" />
    <Compile Include="DataAccess\BasicDataSetHandler.cs" />
    <Compile Include="DataAccess\ClearDataHandler.cs" />
    <Compile Include="DingTalkUser.cs" />
    <Compile Include="Entity\ExtendEntity\MatModel.cs" />
    <Compile Include="Entity\ExtendEntity\SyncStockToMesEntity.cs" />
    <Compile Include="Entity\ExtendEntity\UDT_SYS_ExceptionInfo_Extend.cs" />
@@ -79,10 +77,6 @@
    <Compile Include="Entity\ViewMode\BoardLoadMaterialView.cs" />
    <Compile Include="Entity\ViewMode\MatStockCollectView.cs" />
    <Compile Include="Entity\ViewMode\PlaceLocationView.cs" />
    <Compile Include="GoViewPro.cs" />
    <Compile Include="GoViewProData.cs" />
    <Compile Include="mes_batchOrderUPI_new.cs" />
    <Compile Include="mes_PushPackageCode.cs" />
    <Compile Include="MyDbContext\Base_BasicDataSet.cs" />
    <Compile Include="MyDbContext\basic_customer_info.cs" />
    <Compile Include="MyDbContext\basic_express_info.cs" />
@@ -264,78 +258,89 @@
    <Compile Include="MyDbContext\ware_views_detail.cs" />
    <Compile Include="MyDbContext\ware_workflow.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="SysCodeGen.cs" />
    <Compile Include="SysCodeGenConfig.cs" />
    <Compile Include="SysConfig.cs" />
    <Compile Include="SysDictData.cs" />
    <Compile Include="SysDictType.cs" />
    <Compile Include="SysFile.cs" />
    <Compile Include="SysJobCluster.cs" />
    <Compile Include="SysJobDetail.cs" />
    <Compile Include="SysJobTrigger.cs" />
    <Compile Include="SysJobTriggerRecord.cs" />
    <Compile Include="SysLdap.cs" />
    <Compile Include="SysLogDiff.cs" />
    <Compile Include="SysLogEx.cs" />
    <Compile Include="SysLogOp.cs" />
    <Compile Include="SysLogVis.cs" />
    <Compile Include="SysMenu.cs" />
    <Compile Include="SysNotice.cs" />
    <Compile Include="SysNoticeUser.cs" />
    <Compile Include="SysOnlineUser.cs" />
    <Compile Include="SysOpenAccess.cs" />
    <Compile Include="SysOrg.cs" />
    <Compile Include="SysPlugin.cs" />
    <Compile Include="SysPos.cs" />
    <Compile Include="SysPrint.cs" />
    <Compile Include="SysRegion.cs" />
    <Compile Include="SysRole.cs" />
    <Compile Include="SysRoleMenu.cs" />
    <Compile Include="SysRoleOrg.cs" />
    <Compile Include="SysTenant.cs" />
    <Compile Include="SysUser.cs" />
    <Compile Include="SysUserExtOrg.cs" />
    <Compile Include="SysUserLdap.cs" />
    <Compile Include="SysUserRole.cs" />
    <Compile Include="SysWechatPay.cs" />
    <Compile Include="SysWechatUser.cs" />
    <Compile Include="TestMyDbContext\Model1.cs" />
    <Compile Include="test_place.cs" />
    <Compile Include="Test_Student.cs" />
    <Compile Include="Test_Teachert.cs" />
    <Compile Include="V_EmptyStation.cs" />
    <Compile Include="WmsDBModel.cs" />
    <Compile Include="wms_adapter_categories.cs" />
    <Compile Include="wms_adapter_management.cs" />
    <Compile Include="wms_adapter_record.cs" />
    <Compile Include="wms_base_area.cs" />
    <Compile Include="wms_base_factory.cs" />
    <Compile Include="wms_base_material.cs" />
    <Compile Include="wms_base_material_type.cs" />
    <Compile Include="wms_base_place.cs" />
    <Compile Include="wms_base_warehouse.cs" />
    <Compile Include="wms_config_no_rule.cs" />
    <Compile Include="wms_config_print.cs" />
    <Compile Include="wms_config_serial_rule.cs" />
    <Compile Include="wms_config_serial_sn.cs" />
    <Compile Include="wms_config_sncode_rule.cs" />
    <Compile Include="wms_log_action.cs" />
    <Compile Include="wms_rbline_runmode.cs" />
    <Compile Include="wms_rbline_task.cs" />
    <Compile Include="wms_record_print.cs" />
    <Compile Include="wms_record_trans.cs" />
    <Compile Include="wms_stock_quan.cs" />
    <Compile Include="wms_sys_basic_data.cs" />
    <Compile Include="wms_sys_help_doc.cs" />
    <Compile Include="wms_sys_pda_menu.cs" />
    <Compile Include="wms_sys_pda_role_menu.cs" />
    <Compile Include="wms_task.cs" />
    <Compile Include="zero_database_info.cs" />
    <Compile Include="zero_entity_column_info.cs" />
    <Compile Include="zero_entity_info.cs" />
    <Compile Include="zero_interface_category.cs" />
    <Compile Include="zero_interface_list.cs" />
    <Compile Include="zero_user_info.cs" />
    <Compile Include="WmsDBModel\ApprovalFlow.cs" />
    <Compile Include="WmsDBModel\DingTalkUser.cs" />
    <Compile Include="WmsDBModel\GoViewPro.cs" />
    <Compile Include="WmsDBModel\GoViewProData.cs" />
    <Compile Include="WmsDBModel\mes_batchOrderUPI_new.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" />
    <Compile Include="WmsDBModel\SysDictData.cs" />
    <Compile Include="WmsDBModel\SysDictType.cs" />
    <Compile Include="WmsDBModel\SysFile.cs" />
    <Compile Include="WmsDBModel\SysJobCluster.cs" />
    <Compile Include="WmsDBModel\SysJobDetail.cs" />
    <Compile Include="WmsDBModel\SysJobTrigger.cs" />
    <Compile Include="WmsDBModel\SysJobTriggerRecord.cs" />
    <Compile Include="WmsDBModel\SysLdap.cs" />
    <Compile Include="WmsDBModel\SysLogDiff.cs" />
    <Compile Include="WmsDBModel\SysLogEx.cs" />
    <Compile Include="WmsDBModel\SysLogOp.cs" />
    <Compile Include="WmsDBModel\SysLogVis.cs" />
    <Compile Include="WmsDBModel\SysMenu.cs" />
    <Compile Include="WmsDBModel\SysNotice.cs" />
    <Compile Include="WmsDBModel\SysNoticeUser.cs" />
    <Compile Include="WmsDBModel\SysOnlineUser.cs" />
    <Compile Include="WmsDBModel\SysOpenAccess.cs" />
    <Compile Include="WmsDBModel\SysOrg.cs" />
    <Compile Include="WmsDBModel\SysPlugin.cs" />
    <Compile Include="WmsDBModel\SysPos.cs" />
    <Compile Include="WmsDBModel\SysPrint.cs" />
    <Compile Include="WmsDBModel\SysRegion.cs" />
    <Compile Include="WmsDBModel\SysRole.cs" />
    <Compile Include="WmsDBModel\SysRoleMenu.cs" />
    <Compile Include="WmsDBModel\SysRoleOrg.cs" />
    <Compile Include="WmsDBModel\SysTenant.cs" />
    <Compile Include="WmsDBModel\SysUser.cs" />
    <Compile Include="WmsDBModel\SysUserExtOrg.cs" />
    <Compile Include="WmsDBModel\SysUserLdap.cs" />
    <Compile Include="WmsDBModel\SysUserRole.cs" />
    <Compile Include="WmsDBModel\SysWechatPay.cs" />
    <Compile Include="WmsDBModel\SysWechatUser.cs" />
    <Compile Include="WmsDBModel\test_place.cs" />
    <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" />
    <Compile Include="WmsDBModel\wms_adapter_record.cs" />
    <Compile Include="WmsDBModel\wms_base_area.cs" />
    <Compile Include="WmsDBModel\wms_base_factory.cs" />
    <Compile Include="WmsDBModel\wms_base_material.cs" />
    <Compile Include="WmsDBModel\wms_base_material_type.cs" />
    <Compile Include="WmsDBModel\wms_base_place.cs" />
    <Compile Include="WmsDBModel\wms_base_warehouse.cs" />
    <Compile Include="WmsDBModel\wms_config_no_rule.cs" />
    <Compile Include="WmsDBModel\wms_config_print.cs" />
    <Compile Include="WmsDBModel\wms_config_serial_rule.cs" />
    <Compile Include="WmsDBModel\wms_config_serial_sn.cs" />
    <Compile Include="WmsDBModel\wms_config_sncode_rule.cs" />
    <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_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" />
    <Compile Include="WmsDBModel\wms_task.cs" />
    <Compile Include="WmsDBModel\zero_database_info.cs" />
    <Compile Include="WmsDBModel\zero_entity_column_info.cs" />
    <Compile Include="WmsDBModel\zero_entity_info.cs" />
    <Compile Include="WmsDBModel\zero_interface_category.cs" />
    <Compile Include="WmsDBModel\zero_interface_list.cs" />
    <Compile Include="WmsDBModel\zero_user_info.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="App.config">

 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>

 LA24030_LuLiPackageLine_Web/package.json

@@ -41,6 +41,7 @@
        "pinia": "^2.1.7",
        "print-js": "^1.6.0",
        "push.js": "^1.0.12",
        "qrcode": "^1.5.4",
        "qrcodejs2-fixes": "^0.0.2",
        "qs": "^6.12.1",
        "relation-graph": "^2.2.0",

 LA24030_LuLiPackageLine_Web/public/config.js

@@ -5,4 +5,5 @@
  "VITE_PUBLIC_PATH": "",
  "VITE_SM_PUBLIC_KEY": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312",
  "VITE_API_URL": "http://localhost:5005"
  //"VITE_API_URL": "http://172.17.1.111:5005"  //正式地址
} 

 LA24030_LuLiPackageLine_Web/src/api/main/ReportCenter/wmsStockQuan.ts

@@ -3,11 +3,10 @@
  AddWmsStockQuan = '/api/wmsStockQuan/add',
  DeleteWmsStockQuan = '/api/wmsStockQuan/delete',
  UpdateWmsStockQuan = '/api/wmsStockQuan/update',
  PageWmsStockQuan = '/api/wmsStockQuan/page', //888
  PageWmsStockQuan = '/api/wmsStockQuan/page', 
  ShortagePage = '/api/wmsStockQuan/ShortagePage', 
  
  ShortagePageGroupByInfo5 = '/api/wmsStockQuan/ShortagePageGroupByInfo5', 
  ShortageList = '/api/wmsStockQuan/ShortageList', 

  PageStockQuanForUse= '/api/wmsStockQuan/getStockQuanPageForUse',
  ListWmsStockQuan = '/api/wmsStockQuan/list',
  DetailWmsStockQuan = '/api/wmsStockQuan/detail',
@@ -80,6 +79,13 @@
            data: params
        });

		
export const ShortagePageGroupByInfo5 = (params?: any) => 
    request({
            url: Api.ShortagePageGroupByInfo5,
            method: 'post',
            data: params
        });
                // åˆ†é¡µæŸ¥è¯¢å®žæ—¶åº“å­˜
export const ShortageList = (params?: any) => 
    request({

 LA24030_LuLiPackageLine_Web/src/api/main/ThirdInterFace/mesPushPackageCode.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
import request from '/@/utils/request';
enum Api {
  AddMesPushPackageCode = '/api/mesPushPackageCode/add',
  DeleteMesPushPackageCode = '/api/mesPushPackageCode/delete',
  UpdateMesPushPackageCode = '/api/mesPushPackageCode/update',
  PageMesPushPackageCode = '/api/mesPushPackageCode/page',
  ListMesPushPackageCode = '/api/mesPushPackageCode/list',
  DetailMesPushPackageCode = '/api/mesPushPackageCode/detail',
  ImportExcelMesPushPackageCode = '/api/mesPushPackageCode/importExcel',
  DownloadExcelTemplateMesPushPackageCode = '/api/mesPushPackageCode/downloadExcelTemplate',
}

// å¢žåŠ åŒ…装完成对接
export const addMesPushPackageCode = (params?: any) =>
    request({
        url: Api.AddMesPushPackageCode,
        method: 'post',
        data: params
    });

// åˆ é™¤åŒ…装完成对接
export const deleteMesPushPackageCode = (params?: any) => 
    request({
            url: Api.DeleteMesPushPackageCode,
            method: 'post',
            data: params
        });

// ç¼–辑包装完成对接
export const updateMesPushPackageCode = (params?: any) => 
    request({
            url: Api.UpdateMesPushPackageCode,
            method: 'post',
            data: params
        });

// å¯¼å…¥åŒ…装完成对接
export const importExcelMesPushPackageCode = (params?: any) =>
    request({
        url: Api.ImportExcelMesPushPackageCode,
        method: 'post',
        data: params
    });

// ä¸‹è½½å¯¼å…¥åŒ…装完成对接模板
export const downloadExcelTemplateMesPushPackageCode = (params?: any) => 
    request({
            url: Api.DownloadExcelTemplateMesPushPackageCode,
            method: 'get',
            data: params,
            responseType: 'blob'
        });


// åˆ†é¡µæŸ¥è¯¢åŒ…装完成对接
export const pageMesPushPackageCode = (params?: any) => 
    request({
            url: Api.PageMesPushPackageCode,
            method: 'post',
            data: params
        });

// ä¸åˆ†é¡µæŸ¥è¯¢åŒ…装完成对接
export const listMesPushPackageCode = (params?: any) => 
    request({
            url: Api.ListMesPushPackageCode,
            method: 'get',
            data: params
        });

// è¯¦æƒ…包装完成对接
export const detailMesPushPackageCode = (id: any) => 
    request({
            url: Api.DetailMesPushPackageCode,
            method: 'get',
            data: { id }
        });


 LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue

@@ -1,29 +1,38 @@
<!--打印内容 -->
<template>
        <div id="printContent" class="printContent">
	

    <div class="ermbox">
                        <div class="t40">
                            é”€å”®è®¢å•å·ï¼š<span>{{ itemTitle.info16 }}</span>
                        </div>
                        <div  class="imgL">
        <canvas ref="qrcodeCanvas"></canvas>
    </div>
                        <div class="t41">
                            ç”Ÿäº§è®¢å•å·ï¼š<span>{{ itemTitle.info5 }}</span>
                        </div>
                    </div>

            <div class="printWp" v-for="(itemW, indexW) in deltailList" :key="indexW">
                <!-- <div class="t1">{{Name[0]}}&nbsp; &nbsp; &nbsp; &nbsp;{{Name[1]}}&nbsp; &nbsp; &nbsp; &nbsp;{{Name[2]}}</div> -->
                <div class="t1">{{ Name }}</div>
                <div class="header_pt">
                    <div class="box1">
                        <img class="imgL" src="http://localhost:8888/src/assets/logo-mini.png" alt="" />
				

                    <!-- <img class="imgL" src="http://localhost:8888/src/assets/logo-mini.png" alt="" /> -->
                        <!-- <img class="imgL" src="@/assets/logo.png" alt="" /> -->
                        <div class="t2">
                            <p class="text1">
                                é²ä¸½æœ¨ä¸šè‚¡ä»½æœ‰é™å…¬å¸
                            </p>
                        </div>
                    <!-- <div class="t2">
                        <p class="text1">鲁丽木业股份有限公司</p>
                    </div> -->
                    </div>
                    <div class="box-t1">
                        <div>
                            å•å·ï¼š<span>{{ itemTitle.orderNo }}</span>
                        æ‰“印时间：<span>{{ DateToday }}</span>
                        </div>
                        <div>
                            <div>
                                <span> {{ DateToday }}</span>
                            </div>
                        </div>
                        <div class="t4">
                        ç¼ºæ–™æ€»æ•°é‡ï¼š<span>{{ deltailList.length }}</span>
                        </div>
                    </div>
                </div>
@@ -32,9 +41,9 @@
                    <table cellspacing="0" cellpadding="0">
                        <tr class="middle_first">
                            <td class="middle_tree">编号</td>
                            <td class="middle_one">批次</td>
                            <td class="middle_two">订单号</td>
                            <td class="middle_four">包装号</td>
                        <td class="middle_one">材料</td>
                        <td class="middle_two">部件名称</td>
                        <td class="middle_four">尺寸</td>
                            <td class="middle_one">部件条码</td>
                        </tr>
                        <tr class="middle_first" v-for="(item, index) in itemW" :key="index">
@@ -42,17 +51,17 @@
            
                            <td class="middle_one">
                                <div>
                                    {{ item.planNo }}
                                <!-- {{ item.planNo }} -->
                                </div>
                            </td>
                            <td class="middle_two">
                                <div>
                                    {{ item.orderId }}
                                {{ item.detailName  }}
                                </div>
                            </td>
                            <td class="middle_four">
                                <div>
                                    {{ item.packageCode }}
                                {{ item.info16 }}
                                </div>
                            </td>
                            <td class="middle_one">
@@ -63,28 +72,14 @@
                        </tr>
                    </table>
                </div>
                <!-- <br /> <br /> -->
                <!-- <div class="box-t2">
        <div>供货方确认：牧野汽车装备（武汉）有限公司 </div>
        <div> ç­¾æ”¶äººï¼ˆä»£æ”¶äººï¼‰ï¼š </div>
      </div> -->
                <!-- å§“名 ç”µè¯ åœ°å€ -->
                <!-- <div class="box-t2">
        <div>姓名&电话：</div>
        <div> æ—¥æœŸï¼š </div>
      </div> -->
                <!-- <div class="box-t2 box-t2R">
        <div>地址：</div>
      </div> -->
                <span class="pageNum">{{ indexW + 1 }}</span>
            </div>
        </div>
</template>
<script lang="ts" setup>
import { ref, nextTick, computed, defineExpose, defineEmits, markRaw, defineProps } from 'vue';
import { ref, nextTick, computed, defineExpose, defineEmits, markRaw, defineProps, onMounted } from 'vue';
import printJS from 'print-js';
// import { formatUtcToData } from "@/utils/formate";

import QRCode from 'qrcode';
const Name = ref([]);
const DateToday = ref('');
const itemTitle: any = ref({});
@@ -96,12 +91,21 @@
    }
    return data;
};

const qrcodeCanvas = ref<HTMLCanvasElement | null>(null);

// };
const printHd = (name: string, itemSubTitle: any, deltailListArr: any) => {
    console.log('打印条数8888==' + deltailListArr.length);
    Name.value = name;
    debugger;

    // if(itemSubTitle && itemSubTitle.length>0){
    //   itemTitle.value = itemSubTitle[0]
    // }
    itemTitle.value.orderNo = deltailListArr[0].orderNo;
    itemTitle.value.info5 = deltailListArr[0].info5;
    itemTitle.value.info16 = deltailListArr[0].info16;

    deltailListArr.forEach((item, index) => {
        item.num = index + 1;
    });
@@ -117,6 +121,13 @@

    // console.log(itemSubTitle)
    // console.log(deltailListArr)
    if (deltailListArr[0].info5) {
        debugger
        nextTick(() => {
        QRCode.toCanvas(qrcodeCanvas.value, deltailListArr[0].info5, { width: 150 });
    });// åœ¨ç»„件挂载时生成二维码
    }

    nextTick(() => {
        printJS({
            printable: 'printContent', // è¦æ‰“印的元素的 ID
@@ -143,20 +154,26 @@
    position: relative;
}

.imgL {
    width: 140px;
}

.t1 {
    text-align: center;
    font-size: 30px !important;
    font-size: 20px !important;
    font-weight: bold;
    border: 1px solid transparent;
    padding-bottom: 119px;
}

.ermbox {
    position: absolute;
    top: 10px;
    left: 20px;	
}

.imgL {

}
.printContent {
    position: relative;
    z-index: -1;
    z-index: 999;
    font-size: 12px;
}

@@ -171,10 +188,15 @@
    display: block;
}

.printContent .t4 {
    text-align: right;
.ermbox span {
    font-weight: 700;
}

.t40 {
    font-size: 12px;
}
.t41 {
    font-size: 16px;
}
.printContent table {
    padding: 10px 0;
}
@@ -251,12 +273,27 @@
    bottom: 0;
}


    `,
            scanStyles: false, // æ˜¯å¦æ‰«æå½“前的 CSS æ ·å¼
        });
    });


};



// onMounted(async () => {
//     if (qrcodeCanvas.value) {
//         try {
//             await QRCode.toCanvas(qrcodeCanvas.value, "7777", { width: 100 });
//         } catch (err) {
//             console.error('生成二维码出错:', err);
//         }
//     } else {
//         console.error('qrcodeCanvas未定义');
//     }
// });

// æš´éœ²æ–¹æ³•
defineExpose({ printHd });
@@ -282,20 +319,26 @@
    position: relative;
}

.imgL {
    width: 140px;
}

.t1 {
    text-align: center;
    font-size: 30px !important;
    font-size: 20px !important;
    font-weight: bold;
    border: 1px solid transparent;
    padding-bottom: 119px;
}

.ermbox {
    position: absolute;
    top: 10px;
    left: 20px;	
}

.imgL {

}
.printContent {
    position: relative;
    z-index: -1;
    z-index: -999;
    font-size: 12px;
}

@@ -310,10 +353,15 @@
    display: block;
}

.printContent .t4 {
    text-align: right;
.ermbox span {
    font-weight: 700;
}

.t40 {
    font-size: 12px;
}
.t41 {
    font-size: 16px;
}
.printContent table {
    padding: 10px 0;
}

 LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/±¸·Ýindex.vue

ÎļþÒÑɾ³ý

 LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,187 @@
<template>
    <div class="mesPushPackageCode-container">
        <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
            <template #header>
                <div style="color: #fff">
                    <!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
                    <span>{{ props.title }}</span>
                </div>
            </template>
            <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading">
                <el-row :gutter="35">
                    <el-form-item v-show="false">
                        <el-input v-model="ruleForm.id" />
                    </el-form-item>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="包装号" prop="packageCode">
                            <el-input v-model="ruleForm.packageCode" placeholder="请输入包装号" maxlength="50" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="推送状态" prop="pushStatus">
                            <el-select clearable v-model="ruleForm.pushStatus" placeholder="请选择推送状态">
                                <el-option v-for="(item,index) in  getEnumPushStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="推送时间" prop="pushTime">
                            <el-date-picker v-model="ruleForm.pushTime" type="date" placeholder="推送时间" />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="推送次数" prop="pushNum">
                            <el-input-number v-model="ruleForm.pushNum" placeholder="请输入推送次数" clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="接口返回参数" prop="apiMessage">
                            <el-input v-model="ruleForm.apiMessage" placeholder="请输入接口返回参数" maxlength="50" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="创建者部门名称" prop="createOrgName">
                            <el-input v-model="ruleForm.createOrgName" placeholder="请输入创建者部门名称" maxlength="64" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>
                <span class="dialog-footer">
                    <el-button @click="cancel">取 æ¶ˆ</el-button>
                    <el-button type="primary" @click="submit" :disabled="disabled_btn">ç¡® å®š</el-button>
                </span>
            </template>
        </el-dialog>
    </div>
</template>
<style scoped>
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>
<script lang="ts" setup>
    import { ref,onMounted } from "vue";
    import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
    import { ElMessage } from "element-plus";
    import type { FormRules } from "element-plus";
    import { addMesPushPackageCode, updateMesPushPackageCode, detailMesPushPackageCode } from "/@/api/main/ThirdInterFace/mesPushPackageCode";
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';

    const getEnumPushStatusData = ref<any>([]);
    //父级传递来的参数
    var props = defineProps({
        title: {
        type: String,
        default: "",
    },
    });
    //父级传递来的函数，用于回调
    const emit = defineEmits(["reloadTable"]);
    const ruleFormRef = ref();
    const isShowDialog = ref(false);
    const loading = ref(false);
    const disabled_btn = ref(false);
    const ruleForm = ref<any>({});
    //自行添加其他规则
    const rules = ref<FormRules>({
        packageCode: [{required: true, message: '请输入包装号！', trigger: 'blur',},],
        pushStatus: [{required: true, message: '请选择推送状态！', trigger: 'change',},],
        pushNum: [{required: true, message: '请输入推送次数！', trigger: 'blur',},],
        apiMessage: [{required: true, message: '请输入接口返回参数！', trigger: 'blur',},],
        createOrgName: [{required: true, message: '请输入创建者部门名称！', trigger: 'blur',},],
        isDelete: [{required: true, message: '请选择软删除！', trigger: 'change',},],
    });

    /*
     * æ‰“开弹窗
     * @param flag æ ‡è®°ï¼ˆ1新增 2编辑 3查看）
     * @param row  è¡Œæ•°æ®
     */
    const openDialog = async (flag: number,row: any) => {
        // ruleForm.value = JSON.parse(JSON.stringify(row));
        // æ”¹ç”¨detail获取最新数据来编辑
        let rowData = JSON.parse(JSON.stringify(row));
        if (rowData.id)
            ruleForm.value = (await detailMesPushPackageCode(rowData.id)).data.result;
        else {
            ruleForm.value = rowData;
        }
        isShowDialog.value = true;
    };

    // å…³é—­å¼¹çª—
    const closeDialog = () => {
        emit("reloadTable");
        isShowDialog.value = false;
    };

    // å–消
    const cancel = () => {
        isShowDialog.value = false;
    };

    // æäº¤
    const submit = async () => {
        disabled_btn.value = true;
        ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
            if (isValid) {
                loading.value = true;
                let values = ruleForm.value;
                let ret={};
                let title='新增';
                if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
                    ret = await addMesPushPackageCode(values);
                } else {
                    title='编辑';
                    ret = await updateMesPushPackageCode(values);
                }
                loading.value = false;
                disabled_btn.value = false;
                if(ret.data.type=="success"){
                    ElMessage.success(title+'成功');
                    closeDialog();
                }
            } else {
                disabled_btn.value = false;
                ElMessage({
                    message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
                    type: "error",
                });
            }
        });
    };

	





    // é¡µé¢åŠ è½½æ—¶
    onMounted(async () => {
            getEnumPushStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PushStatusEnum')).data.result ?? [];
    });

    //将属性或者函数暴露给父组件
    defineExpose({ openDialog });
</script>





 LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,280 @@
<template>
  <div class="mesPushPackageCode-container">
    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> 
      <el-form :model="queryParamsMesPushPackageCode" ref="queryForm" labelWidth="90">
        <el-row>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
            <el-form-item label="关键字">
              <el-input v-model="queryParamsMesPushPackageCode.searchKey" clearable="" placeholder="包装号,接口返回参数,创建者部门名称,创建人,修改人"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="包装号">
              <el-input v-model="queryParamsMesPushPackageCode.packageCode" clearable="" placeholder="请输入包装号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="推送状态">
              <el-select clearable="" v-model="queryParamsMesPushPackageCode.pushStatus" placeholder="请选择推送状态">
                <el-option v-for="(item,index) in getEnumPushStatusData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
                
              </el-select>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="推送时间">
              <el-date-picker placeholder="请选择推送时间" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPackageCode.pushTimeRange" />
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="推送次数">
              <el-input-number v-model="queryParamsMesPushPackageCode.pushNum"  clearable="" placeholder="请输入推送次数"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="接口返回参数">
              <el-input v-model="queryParamsMesPushPackageCode.apiMessage" clearable="" placeholder="请输入接口返回参数"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="创建者部门名称">
              <el-input v-model="queryParamsMesPushPackageCode.createOrgName" clearable="" placeholder="请输入创建者部门名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
            <el-form-item>
              <el-button-group style="display: flex; align-items: center;">
                <el-button type="primary"  icon="ele-Search" @click="handleQueryMesPushPackageCode" v-auth="'mesPushPackageCode:page'" :disabled="disabled_btnMesPushPackageCode"> æŸ¥è¯¢ </el-button>
                      <el-button icon="ele-Refresh" @click="resetMesPushPackageCode"> é‡ç½® </el-button>
                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIMesPushPackageCode" v-if="!showAdvanceQueryUIMesPushPackageCode" style="margin-left:5px;"> é«˜çº§æŸ¥è¯¢ </el-button>
                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIMesPushPackageCode" v-if="showAdvanceQueryUIMesPushPackageCode" style="margin-left:5px;"> éšè— </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddMesPushPackageCode" v-auth="'mesPushPackageCode:add'"> æ–°å¢ž </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelMesPushPackageCode"  v-auth="'mesPushPackageCode:exportExcel'" > å¯¼å‡º </el-button>
              </el-button-group>
            </el-form-item>
            
          </el-col>
        </el-row>
      </el-form>
    </el-card>
    <el-card class="full-table" shadow="hover" style="margin-top: 5px">
      <el-table
                ref="tableRefMesPushPackageCode"
                :data="tableDataMesPushPackageCode"
                style="width: 100%"
                v-loading="loadingMesPushPackageCode"
                tooltip-effect="light"
                                row-key="id"
                @sort-change="sortChangeMesPushPackageCode"
                border="">
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="packageCode" label="包装号"  show-overflow-tooltip="" />
          <el-table-column prop="pushStatus" label="推送状态"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.pushStatus, getEnumPushStatusData_Index)}}</el-tag>
            </template>
          </el-table-column>
         <el-table-column prop="pushTime" label="推送时间" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
        <el-table-column prop="pushNum" label="推送次数"  show-overflow-tooltip="" />
        <el-table-column prop="apiMessage" label="接口返回参数"  show-overflow-tooltip="" />
        <el-table-column prop="createOrgName" label="创建者部门名称"  show-overflow-tooltip="" />
         <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
         <el-table-column prop="updateTime" label="修改时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
        <el-table-column prop="createUserName" label="创建人"  show-overflow-tooltip="" />
        <el-table-column prop="updateUserName" label="修改人"  show-overflow-tooltip="" />
        <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mesPushPackageCode:update') || auth('mesPushPackageCode:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMesPushPackageCode(scope.row)" v-auth="'mesPushPackageCode:update'"> ç¼–辑 </el-button>
            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delMesPushPackageCode(scope.row)" v-auth="'mesPushPackageCode:delete'"> åˆ é™¤ </el-button>
          </template>
        </el-table-column>
      </el-table>
      <el-pagination
                v-model:currentPage="tableParamsMesPushPackageCode.page"
                v-model:page-size="tableParamsMesPushPackageCode.pageSize"
                :total="tableParamsMesPushPackageCode.total"
                :page-sizes="[10, 20, 50, 100, 200, 500]"
                small=""
                background=""
                @size-change="handleSizeChangeMesPushPackageCode"
                @current-change="handleCurrentChangeMesPushPackageCode"
                layout="total, sizes, prev, pager, next, jumper"
    />
      <printDialogMesPushPackageCode
        ref="printDialogRefMesPushPackageCode"
        :title="printMesPushPackageCodeTitle"
        @reloadTable="handleQueryMesPushPackageCode" />
      <editDialogMesPushPackageCode
        ref="editDialogRefMesPushPackageCode"
        :title="editMesPushPackageCodeTitle"
        @reloadTable="handleQueryMesPushPackageCode"
      />
    </el-card>
  </div>
</template>

<script lang="ts" setup="" name="mesPushPackageCode">
  import { ref,onMounted } from "vue";
  import { ElMessageBox, ElMessage } from "element-plus";
  import { auth } from '/@/utils/authFunction';
  import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
  import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
  import { exportPageExcel } from '/@/utils/exportPageExcel' //引入导出方法


  import printDialogMesPushPackageCode from '/@/views/system/print/component/hiprint/preview.vue'
  import editDialogMesPushPackageCode from '/@/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue'
  import { pageMesPushPackageCode, deleteMesPushPackageCode,importExcelMesPushPackageCode,downloadExcelTemplateMesPushPackageCode } from '/@/api/main/ThirdInterFace/mesPushPackageCode';
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';
  import commonFunction from '/@/utils/commonFunction';

  const getEnumPushStatusData_Index = ref<any>([]);

    const { getEnumDesc } = commonFunction();
  
  /***************************************************[包装完成对接操作]开始***************************************************/
  const showAdvanceQueryUIMesPushPackageCode = ref(false);
  const tableRefMesPushPackageCode = ref(null);
  const printDialogRefMesPushPackageCode = ref();
  const editDialogRefMesPushPackageCode = ref();
  const loadingMesPushPackageCode = ref(false);
  const disabled_btnMesPushPackageCode = ref(false);
  const tableDataMesPushPackageCode = ref<any>([]);
  const queryParamsMesPushPackageCode = ref<any>({});
  const tableParamsMesPushPackageCode = ref({
    page: 1,
    pageSize: 10,
    total: 0,
  });

  const printMesPushPackageCodeTitle = ref("");
  const editMesPushPackageCodeTitle = ref("");

  // æ”¹å˜é«˜çº§æŸ¥è¯¢çš„控件显示状态
  const changeAdvanceQueryUIMesPushPackageCode = () => {
    showAdvanceQueryUIMesPushPackageCode.value = !showAdvanceQueryUIMesPushPackageCode.value;
  }

  // æŸ¥è¯¢åŒ…装完成对接
  const handleQueryMesPushPackageCode = async () => {
    loadingMesPushPackageCode.value = true;
    disabled_btnMesPushPackageCode.value = true;
    var res = await pageMesPushPackageCode(Object.assign(queryParamsMesPushPackageCode.value, tableParamsMesPushPackageCode.value));
    if(res.data.type=="success"){
      tableDataMesPushPackageCode.value = res.data.result?.items ?? [];
      tableParamsMesPushPackageCode.value.total = res.data.result?.total;
    }
    loadingMesPushPackageCode.value = false;
    disabled_btnMesPushPackageCode.value = false;
  };

  // é‡ç½®åŒ…装完成对接查询
  const resetMesPushPackageCode = async () => {
    queryParamsMesPushPackageCode.value = {}
  };

  // åŒ…装完成对接列排序
  const sortChangeMesPushPackageCode = async (column: any) => {
    queryParamsMesPushPackageCode.value.field = column.prop;
    queryParamsMesPushPackageCode.value.order = column.order;
    await handleQueryMesPushPackageCode();
  };

  // æ‰“开新增包装完成对接页面
  const openAddMesPushPackageCode = () => {
    editMesPushPackageCodeTitle.value = '添加包装完成对接';
    editDialogRefMesPushPackageCode.value.openDialog(1,{});
  };

  // æ‰“开打印包装完成对接页面
  const openPrintMesPushPackageCode = async (row: any) => {
    printMesPushPackageCodeTitle.value = '打印包装完成对接';
  }
  
  // æ‰“开编辑包装完成对接页面
  const openEditMesPushPackageCode = (row: any) => {
    editMesPushPackageCodeTitle.value = '编辑包装完成对接';
    editDialogRefMesPushPackageCode.value.openDialog(2,row);
  };

  // åˆ é™¤åŒ…装完成对接
  const delMesPushPackageCode = (row: any) => {
    ElMessageBox.confirm(`确定要删除吗?`, "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  })
  .then(async () => {
    loadingMesPushPackageCode.value = true;
    var ret = await deleteMesPushPackageCode(row);
    if(ret.data.type=="success"){
        ElMessage.success("删除成功");
    }
    loadingMesPushPackageCode.value = false;
    handleQueryMesPushPackageCode();
  })
  .catch(() => {});
  };

  // æ”¹å˜åŒ…装完成对接页面容量
  const handleSizeChangeMesPushPackageCode = (val: number) => {
    tableParamsMesPushPackageCode.value.pageSize = val;
    handleQueryMesPushPackageCode();
  };

  // æ”¹å˜åŒ…装完成对接页码序号
  const handleCurrentChangeMesPushPackageCode = (val: number) => {
    tableParamsMesPushPackageCode.value.page = val;
    handleQueryMesPushPackageCode();
  };

/***************************************************[包装完成对接操作]结束***************************************************/
/***************************************************[包装完成对接导出]开始***************************************************/
//定义当前页面的方法组
const functionMapMesPushPackageCode = {
      getEnumPushStatusData_Index,
      formatDate_T_Date,
      formatDate_T_Time
};
//点击导出按钮
const handleExportExcelMesPushPackageCode = async (formData:Blob) => {
    loadingMesPushPackageCode.value = true;
    disabled_btnMesPushPackageCode.value = true;
    var new_tableParamsMesPushPackageCode=JSON.parse(JSON.stringify(tableParamsMesPushPackageCode.value));
    new_tableParamsMesPushPackageCode.page = 1;
    new_tableParamsMesPushPackageCode.pageSize = 100000;
    var res = await pageMesPushPackageCode(Object.assign(queryParamsMesPushPackageCode.value, new_tableParamsMesPushPackageCode));
    if(res.data.type=="success"){
      exportExcelMesPushPackageCode(res.data.result?.items ?? []);
    }
    loadingMesPushPackageCode.value = false;
    disabled_btnMesPushPackageCode.value = false;
};
//导出
const exportExcelMesPushPackageCode  = async (exportDataList:Array) => {
  exportPageExcel(exportDataList, tableRefMesPushPackageCode,"包装完成对接",functionMapMesPushPackageCode);
};
/***************************************************[包装完成对接导出]结束***************************************************/
  // åŒ…装完成对接页面加载时
  onMounted(async () => {
    getEnumPushStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PushStatusEnum')).data.result ?? [];
  });

  handleQueryMesPushPackageCode();
</script>
<style scoped>
:deep(.el-input),
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>


 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/component/editDialog.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<template>
    <div class="wmsSubstituteGood-container">
        <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
            <template #header>
                <div style="color: #fff">
                    <!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
                    <span>{{ props.title }}</span>
                </div>
            </template>
            <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules">
                <el-row :gutter="35">
                    <el-form-item v-show="false">
                        <el-input v-model="ruleForm.id" />
                    </el-form-item>
                </el-row>
            </el-form>
            <template #footer>
                <span class="dialog-footer">
                    <el-button @click="cancel">取 æ¶ˆ</el-button>
                    <el-button type="primary" @click="submit">ç¡® å®š</el-button>
                </span>
            </template>
        </el-dialog>
    </div>
</template>
<style scoped>
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}
</style>
<script lang="ts" setup>
    import { ref,onMounted } from "vue";
    import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
    import { ElMessage } from "element-plus";
    import type { FormRules } from "element-plus";
    import { addWmsSubstituteGood, updateWmsSubstituteGood, detailWmsSubstituteGood } from "/@/api/main/WmsBase/wmsSubstituteGood";

    //父级传递来的参数
    var props = defineProps({
        title: {
        type: String,
        default: "",
    },
    });
    //父级传递来的函数，用于回调
    const emit = defineEmits(["reloadTable"]);
    const ruleFormRef = ref();
    const isShowDialog = ref(false);
    const ruleForm = ref<any>({});
    //自行添加其他规则
    const rules = ref<FormRules>({
        substituteCode: [{required: true, message: '请输入替代编号！', trigger: 'blur',},],
        materialCode: [{required: true, message: '请选择物料编号！', trigger: 'change',},],
        materialName: [{required: true, message: '请输入物料名称！', trigger: 'blur',},],
        substituteMaterialCode: [{required: true, message: '请输入替代品物料编号！', trigger: 'blur',},],
        substituteMaterialName: [{required: true, message: '请输入替代品物料名称！', trigger: 'blur',},],
        substituteIndex: [{required: true, message: '请输入替代次序！', trigger: 'blur',},],
    });

    // æ‰“开弹窗
    const openDialog = async (row: any) => {
        // ruleForm.value = JSON.parse(JSON.stringify(row));
        // æ”¹ç”¨detail获取最新数据来编辑
        let rowData = JSON.parse(JSON.stringify(row));
        if (rowData.id)
            ruleForm.value = (await detailWmsSubstituteGood(rowData.id)).data.result;
        else
            ruleForm.value = rowData;
        isShowDialog.value = true;
    };

    // å…³é—­å¼¹çª—
    const closeDialog = () => {
        emit("reloadTable");
        isShowDialog.value = false;
    };

    // å–消
    const cancel = () => {
        isShowDialog.value = false;
    };

    // æäº¤
    const submit = async () => {
        ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
            if (isValid) {
                let values = ruleForm.value;
                if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
                    await addWmsSubstituteGood(values);
                } else {
                    await updateWmsSubstituteGood(values);
                }
                closeDialog();
            } else {
                ElMessage({
                    message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
                    type: "error",
                });
            }
        });
    };







    // é¡µé¢åŠ è½½æ—¶
    onMounted(async () => {
    });

    //将属性或者函数暴露给父组件
    defineExpose({ openDialog });
</script>





 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,312 @@
<template>
    <div class="wmsSubstituteGood-container">
        <el-card class="full-table" shadow="hover" style="margin-top: 5px">
            <el-form :model="queryParams" @submit.native.prevent ref="queryForm" labelWidth="100">
                <el-row>
                    <el-col :xs="24" :sm="12" :md="12" :lg="10" :xl="4" class="mb10">
                        <el-form-item label="部件条码" size="large">
                            <el-input
                                size="large"
                                v-model="queryParams.upi"
                                ref="materialCodeInput"
                                clearable=""
                                placeholder="请扫部件条码"
                                @input="handleChange"
                                @keyup.enter.prevent="handleEnter"
                                @confirm.enter.prevent="handleEnter"
                            />
                        </el-form-item>
                    </el-col>

                    <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
                        <el-form-item>
                            <el-button-group style="display: flex; align-items: center">
                                <el-button size="large" type="primary" icon="ele-Search" @click="handleQuery"> æŸ¥è¯¢ </el-button>
                                <el-button size="large" icon="ele-Refresh" @click="() => (queryParams = {})"> é‡ç½® </el-button>
                                <!-- 
                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> é«˜çº§æŸ¥è¯¢ </el-button>
                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> éšè— </el-button> -->
                                <!-- <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWmsSubstituteGood" v-auth="'wmsSubstituteGood:add'"> æ–°å¢ž </el-button> -->
                            </el-button-group>
                        </el-form-item>
                    </el-col>
                </el-row>
            </el-form>
            <br />
            <div class="detailBox">
                <ul>
                    <!-- <li>
                        <span class="text_left">是否齐包:</span>
                        <span class="text_rt"></span>
                    </li>
                    <li>
                        <span class="text_left">是否齐套:</span>
                        <span class="text_rt"></span>
                    </li> -->

                    <li>
                        <span class="text_left">部件条码:</span>
                        <span class="text_rt">{{ tableData.upi }}</span>
                    </li>

                    <li>
                        <span class="text_left">部件名称:</span>
                        <span class="text_rt">{{ tableData.detailName }}</span>
                    </li>

                    <li>
                        <span class="text_left">批次号:</span>
                        <span class="text_rt">{{ tableData.planNo }}</span>
                    </li>
                    <li>
                        <span class="text_left">订单号:</span>
                        <span class="text_rt">{{ tableData.orderId }}</span>
                    </li>
                    <br />    <br />    <br />    <br />    <br />    <br />
                        <br />    <br />    <br />    <br />    <br />
                    <br />    <br />    <br />    <br />    <br />    <br />	


                    <!-- <li>
                        <span class="text_left">客户名称:</span>
                        <span class="text_rt">{{ tableData.Info10 }}</span>
                    </li> -->

                    <!-- <li>
                        <span class="text_left">长:</span>
                        <span class="text_rt">{{ tableData.length }}</span>
                    </li>
                    <li>
                        <span class="text_left">宽:</span>
                        <span class="text_rt">{{ tableData.width }}</span>
                    </li>
                    <li>
                        <span class="text_left">厚:</span>
                        <span class="text_rt">{{ tableData.thk }}</span>
                    </li>
                    <li>
                        <span class="text_left">部件纹理:</span>
                        <span class="text_rt">{{ tableData.matgrid }}</span>
                    </li>
                    <li>
                        <span class="text_left">是否封边:</span>
                        <span class="text_rt">{{ tableData.isEB }}</span>
                    </li>
                    <li>
                        <span class="text_left">打孔设备编号:</span>
                        <span class="text_rt">{{ tableData.dRNum }}</span>
                    </li> -->
                </ul>
            </div>
            <!-- ç”Ÿæˆform é½å¥— é½åŒ… è®¾ç½®ng包 -->
            <!-- ç”Ÿæˆform é½å¥— é½åŒ… è®¾ç½®ng包 -->
            <!-- <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules">
      <el-row :gutter="35">
        <el-form-item v-show="false">
          <el-input v-model="ruleForm.id" />
        </el-form-item>

        <el-form-item label="齐套" prop="completeSet">
          <el-select v-model="ruleForm.completeSet" placeholder="请选择齐套">
            <el-option label="选项1" value="option1"></el-option>
            <el-option label="选项2" value="option2"></el-option>
          </el-select>
        </el-form-item>

        <el-form-item label="齐包" prop="packageSetup">
          <el-input v-model="ruleForm.packageSetup" placeholder="请输入齐包设置"></el-input>
        </el-form-item>

        <el-form-item label="ng包" prop="ngPackage">
          <el-input v-model="ruleForm.ngPackage" placeholder="请输入ng包"></el-input>
        </el-form-item>
        
      </el-row>
    </el-form> -->
        </el-card>
    </div>
</template>

<script lang="ts" setup="" name="wmsSubstituteGood">
import { onMounted, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import { auth } from '/@/utils/authFunction';
import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
import { formatDate } from '/@/utils/formatTime';
import { listMes_BatchOrderUPI_New, deleteMes_BatchOrderUPI_New, importExcelMes_BatchOrderUPI_New, downloadExcelTemplateMes_BatchOrderUPI_New } from '/@/api/main/WmsOrder/mes_BatchOrderUPI_New';
import printDialog from '/@/views/system/print/component/hiprint/preview.vue';
import editDialog from '/@/views/main/WmsBase/wmsSubstituteGood/component/editDialog.vue';
import { pageWmsSubstituteGood, deleteWmsSubstituteGood } from '/@/api/main/WmsBase/wmsSubstituteGood';
import { ShortageList } from '/@/api/main/ReportCenter/wmsStockQuan';

const showAdvanceQueryUI = ref(false);
const printDialogRef = ref();
const editDialogRef = ref();
const loading = ref(false);
const tableData = ref<any>([]);
const queryParams = ref<any>({
    upi: '',
});
const tableParams = ref({
    page: 1,
    pageSize: 10,
    total: 0,
});
const getIsDisabledData = [
    {
        value: true,
        text: '是',
    },
    {
        value: false,
        text: '否',
    },
];
const printWmsSubstituteGoodTitle = ref('');
const editWmsSubstituteGoodTitle = ref('');

// æ”¹å˜é«˜çº§æŸ¥è¯¢çš„控件显示状态
const changeAdvanceQueryUI = () => {
    showAdvanceQueryUI.value = !showAdvanceQueryUI.value;
};
// ç”¨äºŽå¼•ç”¨è¾“入框
const materialCodeInput = ref(null);

onMounted(() => {
    // åœ¨ç»„件挂载后进行聚焦
    materialCodeInput.value.$el.querySelector('input').focus();
});

// æŸ¥è¯¢æ“ä½œ 888888888
const handleQuery = async () => {
    console.log('8888888进入方法', queryParams.value);
    if (!queryParams.value.upi) {
        return;
    }
    console.log('查询');
    loading.value = true;
    var res = await ShortageList(Object.assign(queryParams.value, tableParams.value));
    if (res.data.result.length != 1) {
        ElMessage.warning('此条码不存在或不在缺料清单中！');
        tableData.value = [];
        return;
    }
    tableData.value = res.data.result[0] ?? [];
    loading.value = false;
};

// åˆ—排序
const sortChange = async (column: any) => {
    queryParams.value.field = column.prop;
    queryParams.value.order = column.order;
    await handleQuery();
};

// æ‰“开新增页面
const openAddWmsSubstituteGood = () => {
    editWmsSubstituteGoodTitle.value = '添加替代品管理';
    editDialogRef.value.openDialog({});
};

// æ‰“开打印页面
const openPrintWmsSubstituteGood = async (row: any) => {
    printWmsSubstituteGoodTitle.value = '打印替代品管理';
};

// æ‰“开编辑页面
const openEditWmsSubstituteGood = (row: any) => {
    editWmsSubstituteGoodTitle.value = '编辑替代品管理';
    editDialogRef.value.openDialog(row);
};

// åˆ é™¤
const delWmsSubstituteGood = (row: any) => {
    ElMessageBox.confirm(`确定要删除吗?`, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
    })
        .then(async () => {
            var ret = await deleteWmsSubstituteGood(row);
            if (ret.data.type == 'success') {
                handleQuery();
                ElMessage.success('删除成功');
            }
        })
        .catch(() => {});
};

// æ”¹å˜é¡µé¢å®¹é‡
const handleSizeChange = (val: number) => {
    tableParams.value.pageSize = val;
    handleQuery();
};

// æ”¹å˜é¡µç åºå·
const handleCurrentChange = (val: number) => {
    tableParams.value.page = val;
    handleQuery();
};

// handleQuery();

const rules = {
    // è¿™é‡Œå®šä¹‰è¡¨å•éªŒè¯è§„则
    completeSet: [{ required: true, message: '请选择齐套', trigger: 'change' }],
    packageSetup: [{ required: true, message: '请输入齐包设置', trigger: 'blur' }],
    ngPackage: [{ required: true, message: '请输入ng包', trigger: 'blur' }],
};

const ruleForm = ref({
    id: '',
    completeSet: '',
    packageSetup: '',
    ngPackage: '',
});

const sourceEnum: any = ref([
    {
        value: 'id',
        text: 'ID',
    },
]);

const handleChange = (event: Event) => {
    console.log('77777777777');
    handleQuery();
};

const handleEnter = (event: Event) => {
    event.preventDefault(); // é˜»æ­¢é»˜è®¤äº‹ä»¶
    handleQuery();
};
</script>
<style scoped>
:deep(.el-input),
:deep(.el-select),
:deep(.el-input-number) {
    width: 100%;
}

.detailBox {
    width: 90%;
    margin: 0 auto;
    display: block;
    padding-bottom: 10px;
    ul {
        margin: 0;
        padding: 0;
        li {
            display: block;
            line-height: 30px;
            text-align: left;
            list-style-type: none;
            width: 25%;
            word-wrap: break-word;
        }
    }
}
.text_left {
    font-weight: 700;
}
</style>

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue

@@ -13,21 +13,8 @@
                        <el-input v-model="ruleForm.id" />
                    </el-form-item>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="所在区域" prop="areaCode">
                            <el-select clearable v-model="ruleForm.areaCode" placeholder="请选择所在区域">
                                <el-option v-for="(item,index) in  getEnumAreaCodeData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="板料状态" prop="upiStatus">
                            <el-select clearable v-model="ruleForm.upiStatus" placeholder="请选择板料状态">
                                <el-option v-for="(item,index) in  getEnumUpiStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
                        <el-form-item label="部件条码" prop="upi">
                            <el-input v-model="ruleForm.upi" placeholder="请输入部件条码" maxlength="50" show-word-limit clearable />
                            
                        </el-form-item>
                        
@@ -47,8 +34,28 @@
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="部件条码" prop="upi">
                            <el-input v-model="ruleForm.upi" placeholder="请输入部件条码" maxlength="50" show-word-limit clearable />
                        <el-form-item label="生产单号" prop="info5">
                            <el-input v-model="ruleForm.info5" placeholder="请输入生产单号" maxlength="60" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="所在区域" prop="areaCode">
                            <el-select clearable v-model="ruleForm.areaCode" placeholder="请选择所在区域">
                                <el-option v-for="(item,index) in  getEnumAreaCodeData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="板料状态" prop="upiStatus">
                            <el-select clearable v-model="ruleForm.upiStatus" placeholder="请选择板料状态">
                                <el-option v-for="(item,index) in  getEnumUpiStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
                            
                        </el-form-item>
                        
@@ -82,36 +89,8 @@
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="部件纹理" prop="matgrid">
                            <el-input v-model="ruleForm.matgrid" placeholder="请输入部件纹理" maxlength="50" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="是否封边" prop="isEB">
                            <el-input-number v-model="ruleForm.isEB" placeholder="请输入是否封边" clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="打孔设备编号" prop="dRNum">
                            <el-input-number v-model="ruleForm.dRNum" placeholder="请输入打孔设备编号" clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="是否优化包装" prop="isPA">
                            <el-input-number v-model="ruleForm.isPA" placeholder="请输入是否优化包装" clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="锯切图号" prop="materialIndeX">
                            <el-input-number v-model="ruleForm.materialIndeX" placeholder="请输入锯切图号" clearable />
                            
                        </el-form-item>
                        
@@ -159,13 +138,6 @@
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="转向角度" prop="rotation">
                            <el-input v-model="ruleForm.rotation" placeholder="请输入转向角度" maxlength="53" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="纸箱长" prop="info1">
                            <el-input v-model="ruleForm.info1" placeholder="请输入纸箱长" maxlength="53" show-word-limit clearable />
                            
@@ -189,13 +161,6 @@
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="销售合同单号" prop="info4">
                            <el-input v-model="ruleForm.info4" placeholder="请输入销售合同单号" maxlength="60" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="生产单号" prop="info5">
                            <el-input v-model="ruleForm.info5" placeholder="请输入生产单号" maxlength="60" show-word-limit clearable />
                            
                        </el-form-item>
                        
@@ -277,6 +242,13 @@
                        </el-form-item>
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="机械臂是否旋转" prop="info17">
                            <el-input v-model="ruleForm.info17" placeholder="请输入机械臂是否旋转" maxlength="60" show-word-limit clearable />
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>
@@ -321,10 +293,10 @@
    const ruleForm = ref<any>({});
    //自行添加其他规则
    const rules = ref<FormRules>({
        upiStatus: [{required: true, message: '请选择板料状态！', trigger: 'change',},],
        upi: [{required: true, message: '请输入部件条码！', trigger: 'blur',},],
        planNo: [{required: true, message: '请输入批次号！', trigger: 'blur',},],
        orderId: [{required: true, message: '请输入订单号！', trigger: 'blur',},],
        upi: [{required: true, message: '请输入部件条码！', trigger: 'blur',},],
        upiStatus: [{required: true, message: '请选择板料状态！', trigger: 'change',},],
        detailName: [{required: true, message: '请输入部件名称！', trigger: 'blur',},],
        length: [{required: true, message: '请输入长！', trigger: 'blur',},],
        width: [{required: true, message: '请输入宽！', trigger: 'blur',},],

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue

@@ -5,7 +5,31 @@
        <el-row>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
            <el-form-item label="关键字">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="批次号,订单号,部件条码,部件名称,部件纹理,包装号,销售合同单号,生产单号,第几包,经销店名称,产品名称,客户名称,包装编码,自提or发货,包装部件总数量,包装面积,部件名称,部件尺寸,创建人,修改人"/>
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="部件条码,批次号,订单号,生产单号,部件名称,包装号,销售合同单号,第几包,经销店名称,产品名称,客户名称,包装编码,自提or发货,包装部件总数量,包装面积,部件名称,部件尺寸,机械臂是否旋转,创建人,修改人"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="部件条码">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.upi" clearable="" placeholder="请输入部件条码"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="批次号">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.planNo" clearable="" placeholder="请输入批次号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="订单号">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.orderId" clearable="" placeholder="请输入订单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="生产单号">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info5" clearable="" placeholder="请输入生产单号"/>
              
            </el-form-item>
          </el-col>
@@ -24,24 +48,6 @@
                <el-option v-for="(item,index) in getEnumUpiStatusData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
                
              </el-select>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="批次号">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.planNo" clearable="" placeholder="请输入批次号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="订单号">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.orderId" clearable="" placeholder="请输入订单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="部件条码">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.upi" clearable="" placeholder="请输入部件条码"/>
              
            </el-form-item>
          </el-col>
@@ -70,32 +76,8 @@
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="部件纹理">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.matgrid" clearable="" placeholder="请输入部件纹理"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="是否封边">
              <el-input-number v-model="queryParamsMes_BatchOrderUPI_New.isEB"  clearable="" placeholder="请输入是否封边"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="打孔设备编号">
              <el-input-number v-model="queryParamsMes_BatchOrderUPI_New.dRNum"  clearable="" placeholder="请输入打孔设备编号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="是否优化包装">
              <el-input-number v-model="queryParamsMes_BatchOrderUPI_New.isPA"  clearable="" placeholder="请输入是否优化包装"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="锯切图号">
              <el-input-number v-model="queryParamsMes_BatchOrderUPI_New.materialIndeX"  clearable="" placeholder="请输入锯切图号"/>
              
            </el-form-item>
          </el-col>
@@ -136,12 +118,6 @@
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="转向角度">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.rotation" clearable="" placeholder="请输入转向角度"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="纸箱长">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info1" clearable="" placeholder="请输入纸箱长"/>
              
@@ -162,12 +138,6 @@
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="销售合同单号">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info4" clearable="" placeholder="请输入销售合同单号"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="生产单号">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info5" clearable="" placeholder="请输入生产单号"/>
              
            </el-form-item>
          </el-col>
@@ -237,6 +207,12 @@
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="机械臂是否旋转">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.info17" clearable="" placeholder="请输入机械臂是否旋转"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
            <el-form-item>
              <el-button-group style="display: flex; align-items: center;">
@@ -265,6 +241,10 @@
                @sort-change="sortChangeMes_BatchOrderUPI_New"
                border="">
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="upi" label="部件条码"  show-overflow-tooltip="" />
        <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
        <el-table-column prop="info5" label="生产单号"  show-overflow-tooltip="" />
          <el-table-column prop="areaCode" label="所在区域"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index)}}</el-tag>
@@ -275,30 +255,21 @@
              <el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index)}}</el-tag>
            </template>
          </el-table-column>
        <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
        <el-table-column prop="upi" label="部件条码"  show-overflow-tooltip="" />
        <el-table-column prop="detailName" label="部件名称"  show-overflow-tooltip="" />
        <el-table-column prop="length" label="长"  show-overflow-tooltip="" />
        <el-table-column prop="width" label="宽"  show-overflow-tooltip="" />
        <el-table-column prop="thk" label="厚"  show-overflow-tooltip="" />
        <el-table-column prop="matgrid" label="部件纹理"  show-overflow-tooltip="" />
        <el-table-column prop="isEB" label="是否封边"  show-overflow-tooltip="" />
        <el-table-column prop="dRNum" label="打孔设备编号"  show-overflow-tooltip="" />
        <el-table-column prop="isPA" label="是否优化包装"  show-overflow-tooltip="" />
        <el-table-column prop="materialIndeX" label="锯切图号"  show-overflow-tooltip="" />
        <el-table-column prop="packageCode" label="包装号"  show-overflow-tooltip="" />
        <el-table-column prop="machineXCenter" label="包装X坐标"  show-overflow-tooltip="" />
        <el-table-column prop="machineYCenter" label="包装Y坐标"  show-overflow-tooltip="" />
        <el-table-column prop="machineZCenter" label="包装Z坐标"  show-overflow-tooltip="" />
        <el-table-column prop="sequence" label="层数"  show-overflow-tooltip="" />
        <el-table-column prop="shelf" label="次序"  show-overflow-tooltip="" />
        <el-table-column prop="rotation" label="转向角度"  show-overflow-tooltip="" />
        <el-table-column prop="info1" label="纸箱长"  show-overflow-tooltip="" />
        <el-table-column prop="info2" label="纸箱宽"  show-overflow-tooltip="" />
        <el-table-column prop="info3" label="纸箱高"  show-overflow-tooltip="" />
        <el-table-column prop="info4" label="销售合同单号"  show-overflow-tooltip="" />
        <el-table-column prop="info5" label="生产单号"  show-overflow-tooltip="" />
        <el-table-column prop="info6" label="第几包"  show-overflow-tooltip="" />
        <el-table-column prop="info7" label="经销店名称"  show-overflow-tooltip="" />
        <el-table-column prop="info8" label="产品名称"  show-overflow-tooltip="" />
@@ -310,6 +281,7 @@
        <el-table-column prop="info14" label="部件名称"  show-overflow-tooltip="" />
        <el-table-column prop="info15" label="部件数量"  show-overflow-tooltip="" />
        <el-table-column prop="info16" label="部件尺寸"  show-overflow-tooltip="" />
        <el-table-column prop="info17" label="机械臂是否旋转"  show-overflow-tooltip="" />
         <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
         <el-table-column prop="updateTime" label="修改时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
        <el-table-column prop="createUserName" label="创建人"  show-overflow-tooltip="" />

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,774 @@
<template>
    <div>
        <!-- å•è¯¦æƒ… -->
        <el-drawer v-model="drawerVisible" :title="`${detailForm.poId}详情`" direction="rtl" size="80%" @close="handleDrawerClose">
            <template #title>
                <div class="slot_title">
                    <div class="title_orderNo">{{ title }}</div>
                    <div>详情</div>
                </div>
            </template>

            <div class="detailBoxWrap">
                <!-- è¯¦æƒ…组件 -->
                <open-details ref="propDetailRef"></open-details>
                <div class="msi-form">
                    <el-form :model="detailForm">
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="部件名称">
                                    <el-input v-model="detailForm.detailName" clearable placeholder="请输入部件名称" />
                                </el-form-item>
                            </el-col>
                            <el-col :span="4">
                                <el-form-item label-width="20px">
                                    <el-button type="primary" icon="el-icon-search" @click="getDetail">查询</el-button>
                                    <!-- <el-button type="primary" icon="ele-Printer" @click="getPrint">打印</el-button> -->
                                    <el-button type="primary" style="margin-left: 5px" icon="ele-Printer" @click="handleHtmlPrint"> æ‰“印 </el-button>
                                </el-form-item>
                            </el-col>
                        </el-row>
                    </el-form>
                </div>
                <div class="msi-content">
                    <!-- <p style="margin-bottom: 10px">物料明细</p> -->
                    <el-table :data="drawerList" border striped :max-height="480">
                        <el-table-column fixed="left" type="index" label="序号" width="55" align="center" />

                        <el-table-column prop="planNo" label="批次" show-overflow-tooltip="" />

                        <el-table-column prop="orderId" label="订单号" show-overflow-tooltip="" />
                        <el-table-column prop="info5" label="生产单号" show-overflow-tooltip="" />

                        <el-table-column prop="packageCode" label="包装号" show-overflow-tooltip="" />
                        <el-table-column prop="upi" label="部件条码" show-overflow-tooltip="" />
                        <el-table-column prop="detailName" label="部件名称" show-overflow-tooltip="" />

                        <!-- <el-table-column prop="placeCode" label="库位编码" show-overflow-tooltip="" />
                        <el-table-column prop="inTime" label="进入时间" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
                        <el-table-column prop="upi" label="部件条码" show-overflow-tooltip="" />
                        <el-table-column prop="detailName" label="部件名称" show-overflow-tooltip="" />
                        <el-table-column prop="planNo" label="批次" show-overflow-tooltip="" />
                        <el-table-column prop="orderId" label="订单号" show-overflow-tooltip="" />
                        <el-table-column prop="packageCode" label="包装号" show-overflow-tooltip="" />
                        <el-table-column prop="length" label="长" show-overflow-tooltip="" />
                        <el-table-column prop="width" label="宽" show-overflow-tooltip="" />
                        <el-table-column prop="thk" label="厚" show-overflow-tooltip="" />
                        <el-table-column prop="stockStatus" label="库存状态" show-overflow-tooltip="">
                            <template #default="scope">
                                <el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index) }}</el-tag>
                            </template>
                        </el-table-column>
                        <el-table-column prop="stockStatusName" label="库存状态名称" show-overflow-tooltip="" />
                        <el-table-column prop="operReason" label="操作原因" show-overflow-tooltip="" />
                        <el-table-column prop="operUser" label="操作人" show-overflow-tooltip="" />
                        <el-table-column prop="operTime" label="操作时间" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
                        <el-table-column prop="lockStatus" label="锁定状态" show-overflow-tooltip="">
                            <template #default="scope">
                                <el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index) }}</el-tag>
                            </template>
                        </el-table-column>
                        <el-table-column prop="lockReason" label="锁定原因" show-overflow-tooltip="" />
                        <el-table-column prop="lockUser" label="锁定人" show-overflow-tooltip="" />
                        <el-table-column prop="lockTime" label="锁定时间" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
                        <el-table-column prop="remarks" label="备注" show-overflow-tooltip="" />
                        <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
                        <el-table-column prop="updateTime" label="修改时间" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
                        <el-table-column prop="createUserName" label="创建人" show-overflow-tooltip="" />
                        <el-table-column prop="updateUserName" label="修改人" show-overflow-tooltip="" /> -->
                    </el-table>
                    <Pagination :total="detailCount" v-model:page="detailForm.Page" v-model:limit="detailForm.PageSize" @pagination="getDetail" style="margin-top: 20px; text-align: center"></Pagination>

                    <div></div>
                </div>
            </div>
			
        <!-- æ‰“印 -->
        <print-table-ckd ref="printTableRef"></print-table-ckd>
        </el-drawer>

    </div>
</template>
<script lang="ts" setup>
import Pagination from '/@/components/Pagination/index.vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ref, nextTick, computed, getCurrentInstance, watch, defineExpose, defineProps, onMounted } from 'vue';
import { getAPI } from '/@/utils/axios-utils';
import { SysEnumApi } from '/@/api-services/api';
import printJS from 'print-js';
import { addWmsOrderPurchase, updateWmsOrderPurchase, detailWmsOrderPurchase } from '/@/api/main/WmsOrder/wmsOrderPurchase';
import OpenDetails from '/@/components/openDetails/openDetails.vue';
import { pageBaseCustomer } from '/@/api/main/WmsBase/baseCustomer';
import { listWmsOrderPurchaseDetails, pageWmsOrderPurchaseDetails } from '/@/api/main/WmsOrder/wmsOrderPurchaseDetails';
import commonFunction from '/@/utils/commonFunction';
import { handleSlectDataWmsBusinessType } from '/@/utils/selectData';
import printTableCkd from '/@/components/printTableCkd.vue';
// æŽ¨èè®¾ç½®æ“ä½œ width ä¸º 200
import { hiprint } from 'vue-plugin-hiprint';
import { SysPrintApi } from '/@/api-services/api';
import { SysPrint } from '/@/api-services/models';
import { ShortagePage } from '/@/api/main/ReportCenter/wmsStockQuan';

const moveType = 10; //移动类型 å…¥åº“
const { proxy }: any = getCurrentInstance(); // è®¿é—®å®žä¾‹ä¸Šä¸‹æ–‡ proxy同时支持开发 çº¿ä¸ŠçŽ¯å¢ƒ
const getEnumOrderTypeData = ref<any>([]);

const getEnumDockData = ref<any>([]);
const getBusinessTypeData_Index = ref<any>([]); //业务类型 create by liuwq
const getEnumPoStatusData = ref<any>([]);
const { getEnumDesc } = commonFunction();
const emits = defineEmits(['getTabelData']);
const getEnumPoDetailStatusData_Index = ref<any>([]);
const getEnumOrderTypeData_Index = ref<any>([]);

const props = defineProps({
    titleAuthor: {
        type: Number,
        required: true,
    },
    hexiao: {
        type: Number,
        default: 1,
        required: true,
    },
});
//控制订单类型 - ä¸‹æ‹‰èœå•
const titleAuthor = computed(() => props.titleAuthor);
// æ˜¯å¦æ˜¾ç¤ºæ ¸é”€æŒ‰é’®
const hexiao = computed(() => props.hexiao);
const loading = ref(false);

const getEnumStockStatusData_Index = ref<any>([]);
const getEnumLockStatusData_Index = ref<any>([]);

// form表单展开

const orderType = ref('');
const orderDoRuType = ref(); // ç”¨äºŽå¯¼å…¥çš„变量
const itemBtn = ref(1);
// æŽ§åˆ¶bom物料权限
const isShowBomBtn = ref(0);

// ç¦æ­¢ä¹‹å‰çš„日期
const disabledDate = (time: Date) => {
    return time.getTime() + 3600 * 1000 * 24 < Date.now();
};
// ä¸Šä¼ çª—口
const uploadVisible = ref(false);

//------------sap获取PO单
const outVisible2 = ref(false);
const outerForm2 = ref({
    purchaseNo: '',
});
const getSapOrderPO = (param?: number) => {
    if (param && param == 1) {
        outVisible2.value = true;
        return;
    }
    if (outerForm2.value.purchaseNo == '') {
        ElMessage.warning('请输入单号');
        return;
    }
};
//关闭出库窗口的回调
const closeOutDialog2 = () => {
    outerForm2.value.purchaseNo = '';
};

//------------sap获取PO单

// --------------------PO单列表-----------------------------------
//查询
const formModel = ref({
    WareMaterialCode: '',
    WareMaterialName: '',
    PurchaseNo: '',
    CreatedUserName: '',
    CreatedTimeBegin: '',
    CreatedTimeEnd: '',
    CreateDate: [],
    IssueTimeBegin: '',
    IssueTimeEnd: '',
    IssueDate: [],
    MaterialTypeStaus: '',
    SourceBy: '',
    WriteOffState: '',
    signStatus: '',
    status: '',
    freeOrderType: '',
    IsQueryAll: false, //是否显示全部数据
    // LoginUserID: LoginUserID, //用户id
    OrderMenuType: '', //判断是哪个菜单入库
    Page: 1,
    PageSize: 10,
    poApprovalStatus: '',
    keyCode: '',
    IsDisable: '', //是否作废
});

//入库单列表数据
let tableData = ref([]);
const tableRef = ref();

//列表的数据条数
const totalItems = ref<number>(0);

// //缓存枚举
// const enumList: any = cache.getCache('enumList');
// console.log(enumList.inEnumOrderType);

//获取PO单列表
const getTabelData = () => {
    //判断创建时间是否有选择
    if (formModel.value.CreateDate && formModel.value.CreateDate.length > 0) {
        formModel.value.CreatedTimeBegin = formModel.value.CreateDate[0];
        formModel.value.CreatedTimeEnd = ''; //addDate(formModel.value.CreateDate[1], 1); //日期查询 ç»“束时间 éœ€è¦åŠ ä¸€å¤©
    } else {
        // æ—¥åŽ†æ¸…空 å†æŸ¥è¯¢bug
        if (formModel.value.CreatedTimeBegin || formModel.value.CreatedTimeEnd) {
            formModel.value.CreatedTimeBegin = '';
            formModel.value.CreatedTimeEnd = '';
        }
    }
    //判断下发时间是否有选择
    if (formModel.value.IssueDate && formModel.value.IssueDate.length > 0) {
        formModel.value.IssueTimeBegin = formModel.value.IssueDate[0];
        formModel.value.IssueTimeEnd = formModel.value.IssueDate[1];
    } else {
        // æ—¥åŽ†æ¸…空 å†æŸ¥è¯¢bug
        if (formModel.value.IssueTimeBegin || formModel.value.IssueTimeEnd) {
            formModel.value.IssueTimeBegin = '';
            formModel.value.IssueTimeEnd = '';
        }
    }
};
getTabelData();

//重置搜索
const resetForm = () => {
    formModel.value = {
        WareMaterialCode: '',
        WareMaterialName: '',
        PurchaseNo: '',
        CreatedUserName: '',
        CreatedTimeBegin: '',
        CreatedTimeEnd: '',
        CreateDate: [],
        IssueTimeBegin: '',
        IssueTimeEnd: '',
        IssueDate: [],
        MaterialTypeStaus: '',
        SourceBy: '',
        WriteOffState: '',
        signStatus: '',
        status: '',
        freeOrderType: '',
        IsQueryAll: false, //是否显示全部数据
        //  LoginUserID: LoginUserID, //用户id
        OrderMenuType: '', //判断是哪个菜单入库
        Page: 1,
        PageSize: 10,
        poApprovalStatus: '',
        keyCode: '',
        IsDisable: '', //是否作废
    };
    getTabelData();
};
// -----------------删除、导出操作--------------------------
//选中的行
const checkRows = ref<{ id: number }[]>([]);
// é€‰æ‹©
const handleSelectionChange = (val: any) => {
    checkRows.value = val;
};

// -------------------获取PO单下物料详情-----------------------------------
//入库单下物料详情请求
const detailForm = ref({
    detailName: '',
    packageCode: '',
    Page: 1,
    PageSize: 10,
});

// ç‰©æ–™è¯¦æƒ…抽屉
const drawerVisible = ref(false);
const drawerType = ref('drawerAll');
// const
//单号
const purchaseNo = ref('');
const IsKitting = ref(false);
//打开抽屉
const openDrawer = async (type: number, scope: any = {}, entozhExcell?: any) => {
    detailForm.value.Page = 1; //bug:点编辑-再点详情
    detailForm.value.PageSize = 10; //bug:点编辑-再点详情
    if (scope.info5) {
        title.value = `${scope.info5}`;
    }
    drawerType.value = 'drawerAll';
    drawerVisible.value = true;
    detailForm.value.info5 = scope.info5;
    purchaseNo.value = scope.info5;
    debugger;
    //获取物料列表
    if (detailForm.value.info5 == '') {
        drawerList.value = [];
        detailCount.value = 0;
        return;
    }
    //------------------获取物料列表物料明细
    getDetail();
    //------------------获取物料列表物料明细
    getEnumStockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('StockStatusEnum')).data.result ?? [];
    getEnumLockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('LockStatusEnum')).data.result ?? [];

    //----------------物料明细
    // æ ¹æ®çŠ¶æ€è½¬ä¸­æ–‡ ä¿ç•™3位小数
    let scopetrans = JSON.parse(JSON.stringify(scope));
    // scopetrans.totalquantity = Number(scopetrans.totalquantity).toFixed(3);
    nextTick(() => {
        scopetrans.poStatus = getEnumDesc(scopetrans.poStatus, getEnumPoDetailStatusData_Index.value);
        scopetrans.businessType = getEnumDesc(scopetrans.businessType, getBusinessTypeData_Index.value);
        scopetrans.orderType = getEnumDesc(scopetrans.orderType, getEnumOrderTypeData_Index.value);
        proxy.$refs['propDetailRef'].openADialog(scopetrans, entozhExcell);
    });
};

//关闭抽屉
const handleDrawerClose = () => {
    detailForm.value = {
        detailName: '',
        packageCode: '',
        Page: 1,
        PageSize: 10,
    };
    deltailList.value = [];
    detailCount.value = 0;
    drawerList.value = [];
    detailCount.value = 0;
};

//物料详情类型
interface DetailType {
    id: number;
}

//入库单详情列表
const deltailList = ref<DetailType[]>([]);
//弹出层数据
const drawerList = ref<DetailType[]>([]);

//入库单详情列表数据条数
const detailCount = ref(0);

//弹出层标题
let title = ref('');
//获取入库单下物料详情
const getDetail = async (callback?: any) => {
    loading.value = true;

    var res = await ShortagePage(Object.assign(detailForm.value));
    if (callback == 1) {
        //编辑入口
        warehousOrderDetails.value = res.data.result?.items ?? [];
        detailCount.value = res.data.result?.total;
    } else {
        drawerList.value = res.data.result?.items ?? [];
        detailCount.value = res.data.result?.total;
    }
    loading.value = false;
};
// ----------------新增、编辑-------------------------------
//窗口类型
const dialogType = ref('add');

const dialogVisible = ref(false);

//添加编辑表单ref
const dialogRef = ref();

//添加/编辑参数
let addForm = ref({
    createdTime: '',
    updatedTime: '',
    createdUserName: '',
    createdUserId: '',
    purchaseNo: '',
    purchaserUserId: 0,
    basicExpressInfoCode: null,
    materialType: '', //5
    status: 0,
    supplierCode: '',
    supplierName: '',
    remark: '',
    deliveryType: 1,
    EstimatedDate: '',
    purchaseOrderDetails: [] as any[],
    dI_NO: '',
    sJ_NO: '',
    machineToolTypeName: '',
    machineToolNo: '',
    freeOrderType: '',
});

//rules
const formRules = {
    businessType: [{ required: true, message: '请选择业务类型！', trigger: 'change' }],
    supplierCode: [{ required: true, message: '请输入供应商！', trigger: 'blur' }],
    purchaseNo: [{ required: true, message: '请输入PO单号！', trigger: 'blur' }],
    orderTypeName: [{ required: true, message: '请输入订单类型名称！', trigger: 'blur' }],
};
//打开新增、编辑窗口
const openDialog = async (type: number, scope: any = {}) => {
    handleQueryTdp();
    getEnumOrderTypeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderTypeEnum')).data.result ?? [];
    getBusinessTypeData_Index.value = await handleSlectDataWmsBusinessType(moveType); //下拉读取业务类型接口 create  by liuwq
    getEnumPoStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderStatusEnum')).data.result ?? [];

    getEnumDockData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('DockEnum')).data.result ?? [];

    if (type == 1) {
        detailForm.value.PageSize = 10;
        dialogType.value = 'add';
    } else {
        dialogType.value = 'edit';
        detailForm.value.PageSize = 1000;
        addForm.value = { ...scope };

        console.log(addForm.value);
        detailForm.value.poId = scope.id;
        //获取物料 - å›žè°ƒå‡½æ•°æ›¿æ¢å®šæ—¶å™¨

        //------------------获取物料列表物料明细
        getDetail(1);
        //----------------物料明细
    }
    dialogVisible.value = true;
    load.value = false;
    //清除选中项
    nextTick(() => {
        if (dialogRef.value) {
            dialogRef.value.clearValidate();
        }
    });
};

//物料详情的table ref
const detailRef = ref();
const setRowKey = (row: any) => {
    return row.id + row.poLineNumber;
};
//关闭窗口
const closeDialog = () => {
    load.value = false;
    addForm.value = {
        createdTime: '',
        updatedTime: '',
        createdUserName: '',
        createdUserId: '',
        purchaseNo: '',
        purchaserUserId: 0,
        basicExpressInfoCode: null,
        materialType: '', //5
        status: 0,
        supplierCode: '',
        supplierName: '',
        remark: '',
        deliveryType: 1,
        EstimatedDate: '',
        purchaseOrderDetails: [] as any[],
        dI_NO: '',
        sJ_NO: '',
        machineToolTypeName: '',
        machineToolNo: '',
        freeOrderType: '',
    };
    warehousOrderDetails.value = [];
    checkedDetails.value = [];
    deltailList.value = [];
    detailCount.value = 0;
    detailRef.value.clearSelection();
};

//添加编辑窗口物料列表
const warehousOrderDetails = ref<any[]>([]);

//物料详情列表选中的物料
const checkedDetails = ref<any[]>([]);

//物料详情列表中勾选事件
const detailsCheckChange = (val: any) => {
    checkedDetails.value = val;
};

//删除选中的物料详情
const delCheckedDetails = () => {
    ElMessageBox.confirm('是否确认删除？', '提示', {
        confirmButtonText: '确认',
        cancelButtonText: '取消',
        type: 'warning',
    })
        .then(() => {
            let arr = [];
            if (checkedDetails.value[0].diRelationID) {
                checkedDetails.value.forEach((item) => {
                    console.log(item);
                    let index = warehousOrderDetails.value.findIndex((detail) => detail.code == item.code && detail.diRelationID == item.diRelationID);
                    if (index > -1) {
                        warehousOrderDetails.value.splice(index, 1);
                    }
                });
            } else {
                checkedDetails.value.forEach((item) => {
                    let index = warehousOrderDetails.value.findIndex((detail) => detail.code == item.code && detail.poLineNumber == item.poLineNumber);
                    warehousOrderDetails.value.splice(index, 1);
                });
            }
            arr = warehousOrderDetails.value;
            warehousOrderDetails.value = [];
            //bug ç›¸åŒç‰©æ–™ ä¸åŒBom
            nextTick(() => {
                warehousOrderDetails.value = arr;
                checkedDetails.value = [];
                detailRef.value.clearSelection();
            });
        })
        .catch(() => ElMessage.info('已取消删除'));
};

const load = ref(false);
//编辑、添加提交
const confirm = () => {
    dialogRef.value.validate(async (vali: any) => {
        if (vali) {
            console.log('确认');
            if (warehousOrderDetails.value.length < 0) {
                ElMessage.warning('请选择物料');
                return;
            }
            let idx = warehousOrderDetails.value.findIndex((v) => v.poLineNumber == '' || v.poLineNumber == undefined);
            if (idx > -1) {
                ElMessage.warning('请输入行号');
                return;
            }
            let isNext = '';
            warehousOrderDetails.value.forEach((item) => {
                const arr: any = warehousOrderDetails.value.filter((detail) => detail.poLineNumber == item.poLineNumber);
                if (arr.length > 1) {
                    isNext = `行号：${arr[0].poLineNumber}不能相同`;
                    return;
                }
            });
            if (isNext != '') {
                ElMessage.warning(isNext);
                return;
            }

            let idx2 = warehousOrderDetails.value.findIndex((v) => v.quantity == '' || v.quantity == undefined || v.quantity <= 0);
            if (idx2 > -1) {
                ElMessage.warning('数量不合规范！');
                return;
            }
            addForm.value.purchaseOrderDetails = [];
            warehousOrderDetails.value.forEach((item) => {
                const obj = {
                    poId: item.poId || 0,
                    materialCode: item.materialCode,
                    materialName: item.materialName,
                    id: item.id || '',
                    quantity: item.quantity,
                    barNo: item.barNo,
                    remark: addForm.value.remark,
                    poLineNumber: item.poLineNumber,
                    materialType: item.deliveryType,
                    clientCode: item.diCustomCode || '',
                    clientChinaName: item.diCustomChinaName || '',
                    plannedStartTime: item.plannedStartTime,
                    plannedEndTime: item.plannedEndTime,
                    projectNo: item.projectNo,
                    erpCode: item.erpCode,
                    supplierBatch: item.supplierBatch,
                    unit: item.unit,
                };
                addForm.value.purchaseOrderDetails.push(obj);
            });
            load.value = true;
            //添加
            if (dialogType.value == 'add') {
                load.value = true;
                let res = await addWmsOrderPurchase(addForm.value);
                if (res.data && res.data.code == 200) {
                    ElMessage.success('添加成功');
                    dialogVisible.value = false;
                    emits('getTabelData');
                }
                load.value = false;
            } else {
                load.value = true;
                let res = await updateWmsOrderPurchase(addForm.value);
                if (res.data && res.data.code == 200) {
                    ElMessage.success('编辑成功');
                    dialogVisible.value = false;
                    emits('getTabelData');
                }
                load.value = false;
            }
        } else {
            ElMessage.warning('表单验证失败');
        }
    });
};
// -----------------添加物料操作-------------------------
//物料基础数据窗口
const addMaterialVisible = ref(false);

//物料基础数据列表
const materialList = ref([]);

//物料基础数据条数
const materialTotal = ref(0);

//物料基础数据form
const materialForm = ref({
    MaterialTypeId: '',
    Code: '',
    MaterialCode: '',
    // MaterialType: 1,
    Page: 1,
    PageSize: 10,
});

//获取物料基础列表
const getMaterialList = async () => {
    loading.value = true;
    // var res = await pageWmsMaterial(Object.assign(queryParams.value, tableParams.value));
    var res = await pageWmsMaterial(Object.assign(materialForm.value));

    materialList.value = res.data.result?.items ?? [];
    //tableParams.value.total = res.data.result?.total;
    materialTotal.value = res.data.result?.total;
    loading.value = false;
};

//重置物料
const resetMaterialForm = () => {
    materialForm.value = {
        MaterialTypeId: '',
        Code: '',
        MaterialCode: '',
        Page: 1,
        // MaterialType: 1,
        PageSize: 10,
    };
    getMaterialList();
};

//选中的基础物料数据
const checkedMaterial = ref<any[]>([]);

//物料基础数据勾选
const materialSelectionChange = (val: any) => {
    checkedMaterial.value = val;
};

//打开新增物料窗口
const addMaterialDialog = () => {
    // if ( addForm.value.freeOrderType && isShowBomBtn.value ) {
    //   ElMessage.warning("免费件类型是PR2，只能新增DI维护的物料！");
    //   return;
    // }
    getMaterialList();
    addMaterialVisible.value = true;
};

//基础物料table的ref对象
const materialRef = ref();

//确认添加材料
const confirmAddMaterial = () => {
    //物料列表没数据，直接添加
    if (warehousOrderDetails.value.length == 0) {
        // è‡ªåŠ¨ç»™è¡Œå·å¤å€¼
        checkedMaterial.value.forEach((item, index) => {
            item.unit = item.poUnit;
            if (!item.poLineNumber) {
                item.poLineNumber = index + 1 + warehousOrderDetails.value.length;
            }
        });

        warehousOrderDetails.value.push(...checkedMaterial.value);
    } else {
        for (let i = 0; i < checkedMaterial.value.length; i++) {
            let idx = warehousOrderDetails.value.findIndex(
                (item: { poLineNumber: any; code: any }) => item.code == checkedMaterial.value[i].code && item.poLineNumber == checkedMaterial.value[i].poLineNumber
            );
            if (idx > -1) {
                return ElMessage.warning(`物料编号${checkedMaterial.value[i].code}，行号：${checkedMaterial.value[i].poLineNumber || ''}在物料列表中已存在,请去除勾选`);
            }
        }

        // è‡ªåŠ¨ç»™è¡Œå·å¤å€¼
        checkedMaterial.value.forEach((item, index) => {
            item.unit = item.poUnit;
            if (!item.poLineNumber) {
                item.poLineNumber = index + 1 + warehousOrderDetails.value.length;
            }
        });
        warehousOrderDetails.value.push(...checkedMaterial.value);
    }

    addMaterialVisible.value = false;
};

//关闭新增物料窗口
const closeMaterialDialog = () => {
    materialForm.value = {
        MaterialTypeId: '',
        Code: '',
        Page: 1,
        // MaterialType: 1,
        PageSize: 10,
    };
    materialList.value = [];
    checkedMaterial.value = [];
    materialRef.value.clearSelection();
};

// é¡µé¢åŠ è½½æ—¶
onMounted(async () => {});

// æ‰“印
let itemSubTitle = ref<any[]>([]);
const handleHtmlPrint = () => {
    proxy.$refs['printTableRef'].printHd('缺件清单', {}, drawerList.value); //deltailList

    // proxy.$refs['printTableRef'].printHd('缺件清单', itemSubTitle.value, drawerList.value); //deltailList
};

// æš´éœ²æ–¹æ³•
defineExpose({ openDialog, openDrawer });
</script>
<style lang="less" scoped>
.detailBoxWrap {
    margin: 10px;
}

.msi-form {
    margin-top: 10px;
}
.msi-form {
    margin-bottom: 10px;
}
.slot_title {
    display: flex;
    align-items: center;
    // margin-left: 20px;
    .title_orderNo {
        font-size: 18px;
        color: #f18201;
        font-weight: bold;
        margin-right: 5px;
    }
}
</style>

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/index.vue

@@ -26,34 +26,6 @@
                        </el-form-item>
                    </el-col>

                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsStockQuan">
            <el-form-item label="物料名称">
              <el-input v-model="queryParamsWmsStockQuan.materialName" clearable="" placeholder="请输入物料名称"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsStockQuan">
            <el-form-item label="库存状态">
              <el-select clearable="" v-model="queryParamsWmsStockQuan.stockStatus" placeholder="请选择库存状态">
                <el-option v-for="(item,index) in getEnumStockStatusData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
                
              </el-select>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsStockQuan">
            <el-form-item label="供应商批次">
              <el-input v-model="queryParamsWmsStockQuan.supplierBatch" clearable="" placeholder="请输入供应商批次"/>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsStockQuan">
            <el-form-item label="批次">
              <el-input v-model="queryParamsWmsStockQuan.batch" clearable="" placeholder="请输入批次"/>
              
            </el-form-item>
          </el-col> -->

                    <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
                        <el-form-item>
                            <el-button-group style="display: flex; align-items: center">
@@ -64,7 +36,7 @@
                                <el-button type="primary" style="margin-left: 5px" icon="ele-Plus" @click="openAddWmsStockQuan" v-auth="'wmsStockQuan:add'"> æ–°å¢ž </el-button>
                                <el-button type="primary" style="margin-left: 5px" icon="ele-Download" @click="handleExportExcelWmsStockQuan" v-auth="'wmsStockQuan:exportExcel'"> å¯¼å‡º </el-button>

                                <el-button type="primary" style="margin-left: 5px" icon="ele-Printer" @click="handleHtmlPrint" v-auth="'wmsStockQuan:exportExcel'" :disabled="checkRows.length == 0"> æ‰“印 </el-button>
                                <!-- <el-button type="primary" style="margin-left: 5px" icon="ele-Printer" @click="handleHtmlPrint" v-auth="'wmsStockQuan:exportExcel'" :disabled="checkRows.length == 0"> æ‰“印 </el-button> -->
                                <!-- 
                                <el-button type="primary" style="margin-left: 5px" icon="ele-Printer" v-print="print" plain @click="handleHtmlPrint">打印</el-button> -->
                            </el-button-group>
@@ -86,13 +58,27 @@
                @selection-change="handleSelectionChange"
                border=""
            >
                <el-table-column align="center" width="60" type="selection" />
                <!-- <el-table-column align="center" width="60" type="selection" /> -->
                <el-table-column type="index" label="序号" width="55" align="center" />

                <el-table-column label="生产单号" prop="packageCode" width="150" align="left" show-overflow-tooltip>
                    <template #default="scope">
                        <span class="under_line" @click="openDrawer(1, scope.row)">
                            {{ scope.row.info5 }}
                        </span>
                    </template>
                </el-table-column>

                <!-- <el-table-column prop="info5" label="生产单号" show-overflow-tooltip="" /> -->
                <el-table-column prop="shortageCount" label="缺件数量" show-overflow-tooltip="" />

                <!-- 
                <el-table-column prop="planNo" label="批次" show-overflow-tooltip="" />
                <el-table-column prop="orderId" label="订单号" show-overflow-tooltip="" />
                <el-table-column prop="packageCode" label="包装号" show-overflow-tooltip="" />
                <el-table-column prop="upi" label="部件条码" show-overflow-tooltip="" />
                <el-table-column prop="detailName" label="部件名称" show-overflow-tooltip="" />
                <el-table-column prop="detailName" label="部件名称" show-overflow-tooltip="" /> -->

                <!-- <el-table-column prop="totalCount" label="总数量" show-overflow-tooltip="" />
                <el-table-column prop="hasCount" label="缓存岛数量" show-overflow-tooltip="" />
                <el-table-column prop="shortageCount" label="缺料数量" show-overflow-tooltip="" /> -->
@@ -143,8 +129,11 @@
            <editDialogWmsStockQuan ref="editDialogRefWmsStockQuan" :title="editWmsStockQuanTitle" @reloadTable="handleQueryWmsStockQuan" />
        </el-card>

        <!-- æ‰€æœ‰å¼¹æ¡† ï¼šæ–°å¢ž ç¼–辑 è¯¦æƒ… -->
        <open-allprop titleAuthor="1" hexiao="0" ref="propALlProp"></open-allprop>
        <!-- æ‰“印 -->
        <print-table-ckd ref="printTableRef"></print-table-ckd>

    </div>
</template>

@@ -155,14 +144,16 @@
import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
import { formatDate, formatDate_T_Date, formatDate_T_Time, defaultTimeRange } from '/@/utils/formatTime';
import { exportPageExcel } from '/@/utils/exportPageExcel'; //引入导出方法

import printJS from 'print-js';
import printDialogWmsStockQuan from '/@/views/system/print/component/hiprint/preview.vue';
import { ShortagePage, deleteWmsStockQuan, importExcelWmsStockQuan, downloadExcelTemplateWmsStockQuan } from '/@/api/main/ReportCenter/wmsStockQuan';
import { ShortagePage, deleteWmsStockQuan, importExcelWmsStockQuan, downloadExcelTemplateWmsStockQuan, ShortagePageGroupByInfo5 } from '/@/api/main/ReportCenter/wmsStockQuan';
import { getAPI } from '/@/utils/axios-utils';
import { SysEnumApi } from '/@/api-services/api';
import commonFunction from '/@/utils/commonFunction';
import { addWmsRecordSncodePrint } from '/@/api/main/PrintCenter/wmsRecordSncodePrint';
import printTableCkd from '/@/components/printTableCkd.vue';
import OpenAllprop from './component/openAllprop.vue';

const { proxy }: any = getCurrentInstance(); // è®¿é—®å®žä¾‹ä¸Šä¸‹æ–‡ proxy同时支持开发 çº¿ä¸ŠçŽ¯å¢ƒ
import printJs from 'print-js';

@@ -198,7 +189,7 @@
const handleQueryWmsStockQuan = async () => {
    loadingWmsStockQuan.value = true;
    disabled_btnWmsStockQuan.value = true;
    var res = await ShortagePage(Object.assign(queryParamsWmsStockQuan.value, tableParamsWmsStockQuan.value));
    var res = await ShortagePageGroupByInfo5(Object.assign(queryParamsWmsStockQuan.value, tableParamsWmsStockQuan.value));
    if (res.data.type == 'success') {
        tableDataWmsStockQuan.value = res.data.result?.items ?? [];
        tableParamsWmsStockQuan.value.total = res.data.result?.total;
@@ -454,16 +445,16 @@

// æ‰“印
let itemSubTitle = ref<any[]>([]);
const handleHtmlPrint = () => {
    proxy.$refs['printTableRef'].printHd('缺包清单', itemSubTitle.value, checkRows.value); //deltailList
const handleHtmlPrint = (dataList: any) => {
    debugger;
    proxy.$refs['printTableRef'].printHd('缺包清单', itemSubTitle.value, dataList); //deltailList
    // proxy.$refs['printTableRef'].printHd('缺包清单', itemSubTitle.value, checkRows.value); //deltailList
};
// //打印
// const print = ref({
//   id: 'printContent',
//   popTitle: ' ',
//   //extraCss: "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css",
//   extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
// })

// ---------------详情-----------------------
const openDrawer = (type: number, item?: any) => {
    proxy.$refs['propALlProp'].openDrawer(type, item, {});
};
</script>
<style scoped>
:deep(.el-input),
@@ -471,4 +462,10 @@
:deep(.el-input-number) {
    width: 100%;
}

.under_line {
    color: #f18201;
    text-decoration: underline;
    cursor: pointer;
}
</style>

 LA24030_LuLiPackageLine_Web/stats.html

ÎļþÌ«´ó

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json

@@ -9,7 +9,7 @@
        //"ConfigId": "1300000000001", // é»˜è®¤åº“标识-禁止修改
        "DbType": "SqlServer", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、QuestDB、HG、ClickHouse、GBase、Odbc、Custom
        // "ConnectionString": "Server=.;Database=iWare_RawMaterialWarehouse_Wms;User=sa;Password=123456;MultipleActiveResultSets=True;", // åº“连接字符串
        "ConnectionString": "Server=.;Database=LA24030_LuLiPackageLine;User=sa;Password=123abc.com;MultipleActiveResultSets=True;", // åº“连接字符串
        "ConnectionString": "Server=172.17.1.111;Database=LA24030_LuLiPackageLine;User=sa;Password=admin@123;MultipleActiveResultSets=True;", // åº“连接字符串
        //"SlaveConnectionConfigs": [ // è¯»å†™åˆ†ç¦»/主从
        //    {
        //        "HitRate": 10,
@@ -22,7 +22,7 @@
        //],
        "DbSettings": {
          "EnableInitDb": true, // å¯ç”¨åº“初始化
          "EnableDiffLog": true, // å¯ç”¨åº“表差异日志
          "EnableDiffLog": false, // å¯ç”¨åº“表差异日志
          "EnableUnderLine": false // å¯ç”¨é©¼å³°è½¬ä¸‹åˆ’线
        },
        "TableSettings": {
@@ -30,7 +30,7 @@
          "EnableIncreTable": false // å¯ç”¨è¡¨å¢žé‡æ›´æ–°-特性[IncreTable]
        },
        "SeedSettings": {
          "EnableInitSeed": false, // å¯ç”¨ç§å­åˆå§‹åŒ–
          "EnableInitSeed": true, // å¯ç”¨ç§å­åˆå§‹åŒ–
          "EnableIncreSeed": false // å¯ç”¨ç§å­å¢žé‡æ›´æ–°-特性[IncreSeed]
        }
      }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs

@@ -62,7 +62,8 @@
    public const string WmsStockSnapshotDetailsGroupName = "库存快照管理";
    public const string printCenterGroupName = "打印中心";
    

    public const string ThirdInterFaceServiceGroupName = "第三方服务接口管理";
    public const string ThirdInterFaceGroupName = "第三方服务接口管理2";


}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs

@@ -1,10 +1,12 @@
using Admin.NET.Core;
using Admin.NET.Core.Enum;

namespace Admin.NET.Application.Entity;

/// <summary>
/// æŽ¨é€mes包装号表
/// </summary>
[SugarTable("mes_PushPackageCode", "推送mes包装号表")]
[SugarTable("mes_push_packagecode", "推送mes包装号表")]
public class MesPushPackageCode : EntityBase
{
    /// <summary>
@@ -19,7 +21,14 @@
    /// </summary>
    [Required]
    [SugarColumn(ColumnName = "PushStatus", ColumnDescription = "推送状态")]
    public int PushStatus { get; set; }
    public PushStatusEnum PushStatus { get; set; }


    /// <summary>
    /// æŽ¨é€æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "PushTime", ColumnDescription = "推送时间")]
    public DateTime? PushTime { get; set; }

    /// <summary>
    /// æŽ¨é€æ¬¡æ•°

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
using Admin.NET.Core;
using Admin.NET.Core.Enum;

namespace Admin.NET.Application.Entity;

/// <summary>
/// æŽ¨é€mes裁纸机接口
/// </summary>
[SugarTable("mes_push_papercut", "推送mes裁纸机接口")]
public class MesPushPaperCut : EntityBase
{
    #region æŽ¨é€å‚æ•°

    /// <summary>
    /// åŒ…装号
    /// </summary>
    [Required]
    [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
    public string PackageCode { get; set; }

    [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱长", Length = 50)]
    public float? Info1 { get; set; }

    [SugarColumn(ColumnName = "Info2", ColumnDescription = "纸箱宽", Length = 50)]
    public float? Info2 { get; set; }

    [SugarColumn(ColumnName = "Info3", ColumnDescription = "纸箱高", Length = 50)]
    public float? Info3 { get; set; }

    #endregion


    /// <summary>
    /// æŽ¨é€çŠ¶æ€
    /// </summary>
    [Required]
    [SugarColumn(ColumnName = "PushStatus", ColumnDescription = "推送状态")]
    public PushStatusEnum PushStatus { get; set; }


    /// <summary>
    /// æŽ¨é€æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "PushTime", ColumnDescription = "推送时间")]
    public DateTime? PushTime { get; set; }

    /// <summary>
    /// æŽ¨é€æ¬¡æ•°
    /// </summary>
    [Required]
    [SugarColumn(ColumnName = "PushNum", ColumnDescription = "推送次数")]
    public int PushNum { get; set; }

    /// <summary>
    /// æŽ¥å£è¿”回参数
    /// </summary>
    [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "接口返回参数", Length = 50)]
    public string ApiMessage { get; set; }

}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs

@@ -13,25 +13,10 @@
    [SugarTable("mes_batchOrderUPI_new", "批次数据")]
    public class Mes_BatchOrderUPI_New : EntityBase
    {
        #region wms新增字段 ã€Editby shaocx,2024-11-20】

        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "所在区域")]
        public AreaCodeEnum? AreaCode { get; set; }


        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required]
        [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "板料状态")]
        public UpiStatusEnum UpiStatus { get; set; }

        #endregion


        [SugarColumn(ColumnName = "UPI", ColumnDescription = "部件条码", Length = 50)]
        public string UPI { get; set; }


        [Required]
@@ -42,9 +27,31 @@
        [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
        public string OrderId { get; set; }

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
        public string? Info5 { get; set; }


        #region wms新增字段 ã€Editby shaocx,2024-11-20】

        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "所在区域")]
        public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.无区域;


        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required]
        [SugarColumn(ColumnName = "UPI", ColumnDescription = "部件条码", Length = 50)]
        public string UPI { get; set; }
        [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "板料状态")]
        public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.初始;

        #endregion


        [Required]
        [SugarColumn(ColumnName = "DetailName", ColumnDescription = "部件名称", Length = 50)]
@@ -60,30 +67,30 @@
        [SugarColumn(ColumnName = "Thk", ColumnDescription = "厚")]
        public float Thk { get; set; }

        [SugarColumn(ColumnName = "Matgrid", ColumnDescription = "部件纹理", Length = 50)]
        public string? Matgrid { get; set; }
        //[SugarColumn(ColumnName = "Matgrid", ColumnDescription = "部件纹理", Length = 50)]
        //public string? Matgrid { get; set; }

        [SugarColumn(ColumnName = "IsEB", ColumnDescription = "是否封边")]
        public int? IsEB { get; set; }
        //[SugarColumn(ColumnName = "IsEB", ColumnDescription = "是否封边")]
        //public int? IsEB { get; set; }

        /// <summary>
        /// æ‰“孔设备编号 ã€EditBy shaocx,2022-05-28】
        /// 0：不打孔
        /// 1：四面钻
        /// 2：豪迈六面钻
        /// 5：南兴六面钻
        /// </summary>
        [SugarColumn(ColumnName = "DRNum", ColumnDescription = "打孔设备编号")]
        public int? DRNum { get; set; }
        ///// <summary>
        ///// æ‰“孔设备编号 ã€EditBy shaocx,2022-05-28】
        ///// 0：不打孔
        ///// 1：四面钻
        ///// 2：豪迈六面钻
        ///// 5：南兴六面钻
        ///// </summary>
        //[SugarColumn(ColumnName = "DRNum", ColumnDescription = "打孔设备编号")]
        //public int? DRNum { get; set; }

        [SugarColumn(ColumnName = "IsPA", ColumnDescription = "是否优化包装")]
        public int? IsPA { get; set; }

        /// <summary>
        /// é”¯åˆ‡å›¾å·
        /// </summary>
        [SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "锯切图号")]
        public int? MaterialIndeX { get; set; }
        ///// <summary>
        ///// é”¯åˆ‡å›¾å·
        ///// </summary>
        //[SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "锯切图号")]
        //public int? MaterialIndeX { get; set; }


        #region åŒ…装线有关
@@ -115,15 +122,15 @@
        #endregion


        /// <summary>
        /// æ˜¯å¦è½¬å‘
        /// 0：不转向
        /// 1：转向
        /// ç›®å‰åªæœ‰å››é¢é’»æ‰èƒ½è½¬å‘
        /// </summary>
        [Required]
        [SugarColumn(ColumnName = "Rotation", ColumnDescription = "转向角度", Length = 50)]
        public float? Rotation { get; set; }
        ///// <summary>
        ///// æ˜¯å¦è½¬å‘
        ///// 0：不转向
        ///// 1：转向
        ///// ç›®å‰åªæœ‰å››é¢é’»æ‰èƒ½è½¬å‘
        ///// </summary>
        //[Required]
        //[SugarColumn(ColumnName = "Rotation", ColumnDescription = "转向角度", Length = 50)]
        //public float? Rotation { get; set; }


     
@@ -141,11 +148,7 @@
        [SugarColumn(ColumnName = "Info4", ColumnDescription = "销售合同单号", Length = 60)]
        public string? Info4 { get; set; }

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
        public string? Info5 { get; set; }


        /// <summary>
        /// ç¬¬å‡ åŒ…

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
using Admin.NET.Core;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/5/29上午10:26:39
 * @desc : è°ƒåº¦ä»»åŠ¡
 */
namespace Admin.NET.Application.Entity
{
    /// <summary>
    /// åŒ…汇总数据
    /// </summary>
    [SugarTable("mes_package_gather", "包汇总数据")]
    public class Mes_Package_Gather : EntityBase
    {

        [Required]
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "批次号", Length = 50)]
        public string PlanNo { get; set; }

        [Required]
        [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
        public string OrderId { get; set; }

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
        public string? Info5 { get; set; }


        #region wms新增字段 ã€Editby shaocx,2024-11-20】

        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "所在区域")]
        public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.无区域;


        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required]
        [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "板料状态")]
        public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.初始;

        #endregion


        #region åŒ…装线有关

        [Required]
        [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
        public string PackageCode { get; set; }



        #endregion



        [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱长", Length = 50)]
        public float? Info1 { get; set; }

        [SugarColumn(ColumnName = "Info2", ColumnDescription = "纸箱宽", Length = 50)]
        public float? Info2 { get; set; }

        [SugarColumn(ColumnName = "Info3", ColumnDescription = "纸箱高", Length = 50)]
        public float? Info3 { get; set; }
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info4", ColumnDescription = "销售合同单号", Length = 60)]
        public string? Info4 { get; set; }



        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        [SugarColumn(ColumnName = "Info6", ColumnDescription = "第几包", Length = 60)]
        public string? Info6 { get; set; }

        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        [SugarColumn(ColumnName = "Info7", ColumnDescription = "经销店名称", Length = 60)]
        public string? Info7 { get; set; }

        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info8", ColumnDescription = "产品名称", Length = 60)]
        public string? Info8 { get; set; }

        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info10", ColumnDescription = "客户名称", Length = 60)]
        public string? Info10 { get; set; }

        /// <summary>
        /// åŒ…装编码
        /// </summary>
        [SugarColumn(ColumnName = "Info9", ColumnDescription = "包装编码", Length = 60)]
        public string? Info9 { get; set; }

        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        [SugarColumn(ColumnName = "Info11", ColumnDescription = "自提or发货", Length = 60)]
        public string? Info11 { get; set; }

        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        [SugarColumn(ColumnName = "Info12", ColumnDescription = "包装部件总数量", Length = 60)]
        public string? Info12 { get; set; }

        /// <summary>
        /// åŒ…装面积
        /// </summary>
        [SugarColumn(ColumnName = "Info13", ColumnDescription = "包装面积", Length = 60)]
        public string? Info13 { get; set; }

    }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_LineQueue.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
using Admin.NET.Core;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/5/29上午10:26:39
 * @desc : è°ƒåº¦ä»»åŠ¡
 */
namespace Admin.NET.Application.Entity
{
    /// <summary>
    /// åŒ…产线队列数据
    /// </summary>
    [SugarTable("mes_package_linequeue", "包产线队列数据")]
    public class Mes_Package_LineQueue : EntityBase
    {

        [Required]
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "批次号", Length = 50)]
        public string PlanNo { get; set; }

        [Required]
        [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
        public string OrderId { get; set; }

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
        public string? Info5 { get; set; }


        #region wms新增字段 ã€Editby shaocx,2024-11-20】

        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "所在区域")]
        public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.无区域;


        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required]
        [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "板料状态")]
        public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.初始;

        #endregion


        #region åŒ…装线有关

        [Required]
        [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
        public string PackageCode { get; set; }



        #endregion



        [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱长", Length = 50)]
        public float? Info1 { get; set; }

        [SugarColumn(ColumnName = "Info2", ColumnDescription = "纸箱宽", Length = 50)]
        public float? Info2 { get; set; }

        [SugarColumn(ColumnName = "Info3", ColumnDescription = "纸箱高", Length = 50)]
        public float? Info3 { get; set; }
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info4", ColumnDescription = "销售合同单号", Length = 60)]
        public string? Info4 { get; set; }



        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        [SugarColumn(ColumnName = "Info6", ColumnDescription = "第几包", Length = 60)]
        public string? Info6 { get; set; }

        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        [SugarColumn(ColumnName = "Info7", ColumnDescription = "经销店名称", Length = 60)]
        public string? Info7 { get; set; }

        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info8", ColumnDescription = "产品名称", Length = 60)]
        public string? Info8 { get; set; }

        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info10", ColumnDescription = "客户名称", Length = 60)]
        public string? Info10 { get; set; }

        /// <summary>
        /// åŒ…装编码
        /// </summary>
        [SugarColumn(ColumnName = "Info9", ColumnDescription = "包装编码", Length = 60)]
        public string? Info9 { get; set; }

        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        [SugarColumn(ColumnName = "Info11", ColumnDescription = "自提or发货", Length = 60)]
        public string? Info11 { get; set; }

        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        [SugarColumn(ColumnName = "Info12", ColumnDescription = "包装部件总数量", Length = 60)]
        public string? Info12 { get; set; }

        /// <summary>
        /// åŒ…装面积
        /// </summary>
        [SugarColumn(ColumnName = "Info13", ColumnDescription = "包装面积", Length = 60)]
        public string? Info13 { get; set; }

    }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,115 @@
using Admin.NET.Core;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/5/29上午10:26:39
 * @desc : è°ƒåº¦ä»»åŠ¡
 */
namespace Admin.NET.Application.Entity
{
    /// <summary>
    /// åŒ…产线下线记录数据
    /// </summary>
    [SugarTable("mes_package_unline_record", "包产线下线记录数据")]
    public class Mes_Package_UnLine_Record : EntityBase
    {

        [Required]
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "批次号", Length = 50)]
        public string PlanNo { get; set; }

        [Required]
        [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
        public string OrderId { get; set; }

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
        public string? Info5 { get; set; }


        #region åŒ…装线有关

        [Required]
        [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
        public string PackageCode { get; set; }



        #endregion



        [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱长", Length = 50)]
        public float? Info1 { get; set; }

        [SugarColumn(ColumnName = "Info2", ColumnDescription = "纸箱宽", Length = 50)]
        public float? Info2 { get; set; }

        [SugarColumn(ColumnName = "Info3", ColumnDescription = "纸箱高", Length = 50)]
        public float? Info3 { get; set; }
        /// <summary>
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info4", ColumnDescription = "销售合同单号", Length = 60)]
        public string? Info4 { get; set; }



        /// <summary>
        /// ç¬¬å‡ åŒ…
        /// </summary>
        [SugarColumn(ColumnName = "Info6", ColumnDescription = "第几包", Length = 60)]
        public string? Info6 { get; set; }

        /// <summary>
        /// ç»é”€åº—名称
        /// </summary>
        [SugarColumn(ColumnName = "Info7", ColumnDescription = "经销店名称", Length = 60)]
        public string? Info7 { get; set; }

        /// <summary>
        /// äº§å“åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info8", ColumnDescription = "产品名称", Length = 60)]
        public string? Info8 { get; set; }

        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        [SugarColumn(ColumnName = "Info10", ColumnDescription = "客户名称", Length = 60)]
        public string? Info10 { get; set; }

        /// <summary>
        /// åŒ…装编码
        /// </summary>
        [SugarColumn(ColumnName = "Info9", ColumnDescription = "包装编码", Length = 60)]
        public string? Info9 { get; set; }

        /// <summary>
        /// è‡ªæor发货
        /// </summary>
        [SugarColumn(ColumnName = "Info11", ColumnDescription = "自提or发货", Length = 60)]
        public string? Info11 { get; set; }

        /// <summary>
        /// åŒ…装部件总数量
        /// </summary>
        [SugarColumn(ColumnName = "Info12", ColumnDescription = "包装部件总数量", Length = 60)]
        public string? Info12 { get; set; }

        /// <summary>
        /// åŒ…装面积
        /// </summary>
        [SugarColumn(ColumnName = "Info13", ColumnDescription = "包装面积", Length = 60)]
        public string? Info13 { get; set; }


        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [SugarColumn(ColumnName = "OpRemark", ColumnDescription = "备注", Length = 60)]
        public string? OpRemark { get; set; }
    }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PushStatusEnum.cs

@@ -5,6 +5,12 @@
using System.Threading.Tasks;

namespace Admin.NET.Core.Enum;


/// <summary>
/// æŽ¨é€çŠ¶æ€  
/// </summary>
[Description("推送状态")]
public enum PushStatusEnum
{
    /// <summary>

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/UpiStatusEnum.cs

@@ -1,5 +1,7 @@


using System.ComponentModel;

namespace Admin.NET.Application;

/// <summary>
@@ -27,19 +29,34 @@
    å·²é½åŒ… = 2,

    /// <summary>
    /// ç åž›ä¸­
    /// </summary>
    [Description("码垛中")]
    ç åž›ä¸­ = 3,


    /// <summary>
    /// å·²ç åž›
    /// </summary>
    [Description("已码垛")]
    å·²ç åž› = 3,
    å·²ç åž› = 4,

    /// <summary>
    /// å·²åˆåŒ…
    /// </summary>
    [Description("已合包")]
    å·²åˆåŒ… = 4,

    /// <summary>
    /// å·²ç åž›
    /// å·²åˆåŒ…
    /// </summary>
    [Description("码垛中")]
    ç åž›ä¸­ = 5,
    [Description("已合包")]
    å·²åˆåŒ… = 5,

    /// <summary>
    /// å·²ä¸‹çº¿
    /// </summary>
    [Description("已下线")]
    å·²ä¸‹çº¿ = 6

}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs ÐÞ¸Ä
@@ -4,7 +4,7 @@
namespace Admin.NET.Application;

    /// <summary>
    /// æŽ¨é€mes包装号基础输入参数
    /// åŒ…装完成对接基础输入参数
    /// </summary>
    public class MesPushPackageCodeBaseInput
    {
@@ -16,7 +16,12 @@
        /// <summary>
        /// æŽ¨é€çŠ¶æ€
        /// </summary>
        public virtual int PushStatus { get; set; }
        public virtual Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; }
        
        /// <summary>
        /// æŽ¨é€æ—¶é—´
        /// </summary>
        public virtual DateTime? PushTime { get; set; }
        
        /// <summary>
        /// æŽ¨é€æ¬¡æ•°
@@ -27,6 +32,16 @@
        /// æŽ¥å£è¿”回参数
        /// </summary>
        public virtual string ApiMessage { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…部门Id
        /// </summary>
        public virtual long? CreateOrgId { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…部门名称
        /// </summary>
        public virtual string CreateOrgName { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
@@ -59,16 +74,6 @@
        public virtual string UpdateUserName { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…部门Id
        /// </summary>
        public virtual long? CreateOrgId { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…部门名称
        /// </summary>
        public virtual string CreateOrgName { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
        /// </summary>
        public virtual bool IsDelete { get; set; }
@@ -76,7 +81,7 @@
    }

    /// <summary>
    /// æŽ¨é€mes包装号分页查询输入参数
    /// åŒ…装完成对接分页查询输入参数
    /// </summary>
    public class MesPushPackageCodeInput : BasePageInput
    {
@@ -93,8 +98,17 @@
        /// <summary>
        /// æŽ¨é€çŠ¶æ€
        /// </summary>
        public int? PushStatus { get; set; }
        public Admin.NET.Core.Enum.PushStatusEnum? PushStatus { get; set; }
        
        /// <summary>
        /// æŽ¨é€æ—¶é—´
        /// </summary>
        public DateTime? PushTime { get; set; }
        
        /// <summary>
         /// æŽ¨é€æ—¶é—´èŒƒå›´
         /// </summary>
         public List<DateTime?> PushTimeRange { get; set; } 
        /// <summary>
        /// æŽ¨é€æ¬¡æ•°
        /// </summary>
@@ -113,7 +127,7 @@
    }

    /// <summary>
    /// æŽ¨é€mes包装号增加输入参数
    /// åŒ…装完成对接增加输入参数
    /// </summary>
    public class AddMesPushPackageCodeInput : MesPushPackageCodeBaseInput
    {
@@ -127,13 +141,25 @@
        /// æŽ¨é€çŠ¶æ€
        /// </summary>
        [Required(ErrorMessage = "推送状态不能为空")]
        public override int PushStatus { get; set; }
        public override Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; }
        
        /// <summary>
        /// æŽ¨é€æ¬¡æ•°
        /// </summary>
        [Required(ErrorMessage = "推送次数不能为空")]
        public override int PushNum { get; set; }
        
        /// <summary>
        /// æŽ¥å£è¿”回参数
        /// </summary>
        [Required(ErrorMessage = "接口返回参数不能为空")]
        public override string ApiMessage { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…部门名称
        /// </summary>
        [Required(ErrorMessage = "创建者部门名称不能为空")]
        public override string CreateOrgName { get; set; }
        
        /// <summary>
        /// è½¯åˆ é™¤
@@ -144,14 +170,14 @@
    }

    /// <summary>
    /// æŽ¨é€mes包装号删除输入参数
    /// åŒ…装完成对接删除输入参数
    /// </summary>
    public class DeleteMesPushPackageCodeInput : BaseIdInput
    {
    }

    /// <summary>
    /// æŽ¨é€mes包装号更新输入参数
    /// åŒ…装完成对接更新输入参数
    /// </summary>
    public class UpdateMesPushPackageCodeInput : AddMesPushPackageCodeInput
    {
@@ -164,13 +190,9 @@
    }

    /// <summary>
    /// æŽ¨é€mes包装号主键查询输入参数
    /// åŒ…装完成对接主键查询输入参数
    /// </summary>
    public class QueryByIdMesPushPackageCodeInput : DeleteMesPushPackageCodeInput
    {

    }
public class PushPackageCodeInput
{ 
    public string PackageCode { get; set; }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs

ÎļþÃû´Ó LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
namespace Admin.NET.Application;

/// <summary>
/// æŽ¨é€mes包装号输出参数
/// åŒ…装完成对接输出参数
/// </summary>
public class MesPushPackageCodeOutput
{
@@ -18,7 +18,12 @@
    /// <summary>
    /// æŽ¨é€çŠ¶æ€
    /// </summary>
    public int PushStatus { get; set; }
    public Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; }
    
    /// <summary>
    /// æŽ¨é€æ—¶é—´
    /// </summary>
    public DateTime? PushTime { get; set; }
    
    /// <summary>
    /// æŽ¨é€æ¬¡æ•°
@@ -29,6 +34,16 @@
    /// æŽ¥å£è¿”回参数
    /// </summary>
    public string ApiMessage { get; set; }
    
    /// <summary>
    /// åˆ›å»ºè€…部门Id
    /// </summary>
    public long? CreateOrgId { get; set; }
    
    /// <summary>
    /// åˆ›å»ºè€…部门名称
    /// </summary>
    public string CreateOrgName { get; set; }
    
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
@@ -61,26 +76,9 @@
    public string UpdateUserName { get; set; }
    
    /// <summary>
    /// åˆ›å»ºè€…部门Id
    /// </summary>
    public long? CreateOrgId { get; set; }
    
    /// <summary>
    /// åˆ›å»ºè€…部门名称
    /// </summary>
    public string CreateOrgName { get; set; }
    
    /// <summary>
    /// è½¯åˆ é™¤
    /// </summary>
    public bool IsDelete { get; set; }
    
    }
public class Respone
{
    public int iState;
    public string message;
    public object result;

}


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,199 @@
using Admin.NET.Core.Service;
using Admin.NET.Application.Entity;
using Microsoft.AspNetCore.Http;
using System.Data;
using System.Web;
using System.Text;
namespace Admin.NET.Application;
/// <summary>
/// åŒ…装完成对接服务
/// </summary>
[ApiDescriptionSettings(ApplicationConst.ThirdInterFaceGroupName, Order = 100)]
public class MesPushPackageCodeService : IDynamicApiController, ITransient
{
    private readonly SqlSugarRepository<MesPushPackageCode> _rep;
    public MesPushPackageCodeService(SqlSugarRepository<MesPushPackageCode> rep)
    {
        _rep = rep;
    }

    /// <summary>
    /// åˆ†é¡µæŸ¥è¯¢åŒ…装完成对接
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Page")]
    [Description("MesPushPackageCode/Page")]
    public async Task<SqlSugarPagedList<MesPushPackageCodeOutput>> Page(MesPushPackageCodeInput input)
    {
        var query = CommonPageFilter(input);
        return await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
    }

    /// <summary>
    /// ä¸åˆ†é¡µæŸ¥è¯¢åŒ…装完成对接
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "List")]
    [Description("MesPushPackageCode/List")]
    public async Task<List<MesPushPackageCodeOutput>> List([FromQuery] MesPushPackageCodeInput input)
    {
        var query = CommonPageFilter(input);
        return await query.OrderBuilder(input, "", "Id").Select<MesPushPackageCodeOutput>().ToListAsync();
    }

    /// <summary>
    /// å¢žåŠ åŒ…装完成对接
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Add")]
    [Description("MesPushPackageCode/Add")]
    public async Task<long> Add(AddMesPushPackageCodeInput input)
    {
        var entity = input.Adapt<MesPushPackageCode>();

        //重复性验证
        await CheckExist(entity);

        await _rep.InsertAsync(entity);
        return entity.Id;
    }

    /// <summary>
    /// åˆ é™¤åŒ…装完成对接
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Delete")]
    [Description("MesPushPackageCode/Delete")]
    public async Task Delete(DeleteMesPushPackageCodeInput input)
    {
        var entity = await _rep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
        //await _rep.FakeDeleteAsync(entity);   //假删除
        await _rep.DeleteAsync(entity);   //真删除
    }

    /// <summary>
    /// æ›´æ–°åŒ…装完成对接
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "Update")]
    [Description("MesPushPackageCode/Update")]
    public async Task Update(UpdateMesPushPackageCodeInput input)
    {
        var entity = input.Adapt<MesPushPackageCode>();

        //重复性验证
        await CheckExist(entity,true);

        await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
    }

    /// <summary>
    /// èŽ·å–包装完成对接
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "Detail")]
    [Description("MesPushPackageCode/Detail")]
    public async Task<MesPushPackageCode> Detail([FromQuery] QueryByIdMesPushPackageCodeInput input)
    {
        return await _rep.GetFirstAsync(u => u.Id == input.Id);
    }






    #region ç§æœ‰æ–¹æ³•

    /// <summary>
    /// å…¬å…±æŸ¥è¯¢åŒ…装完成对接条件
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    private ISugarQueryable<MesPushPackageCodeOutput> CommonPageFilter(MesPushPackageCodeInput input)
    {
        var query = _rep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
                u.PackageCode.Contains(input.SearchKey.Trim())
                || u.ApiMessage.Contains(input.SearchKey.Trim())
                || u.CreateOrgName.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .WhereIF(input.PushStatus.HasValue, u => u.PushStatus == input.PushStatus)
            .WhereIF(input.PushNum>0, u => u.PushNum == input.PushNum)
            .WhereIF(!string.IsNullOrWhiteSpace(input.ApiMessage), u => u.ApiMessage.Contains(input.ApiMessage.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.CreateOrgName), u => u.CreateOrgName.Contains(input.CreateOrgName.Trim()))
            .Select<MesPushPackageCodeOutput>();
        if(input.PushTimeRange != null && input.PushTimeRange.Count >0)
        {
            DateTime? start= input.PushTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.PushTime > start);
            if (input.PushTimeRange.Count >1 && input.PushTimeRange[1].HasValue)
            {
                var end = input.PushTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.PushTime < end);
            }
        } 
        return query;
       }

        /// <summary>
        /// é‡å¤æ€§éªŒè¯
        /// </summary>
        /// <param name="input">验证对象</param>
        /// <param name="isEdit">是否是编辑</param>
        /// <returns></returns>
        private async Task CheckExist( MesPushPackageCode input,bool isEdit=false)
        {
           


            //没有配置组合校验，不需要验重

           
            //没有配置单独校验，不需要验重
       }

       /// <summary>
        /// æ ¹æ®ç»„合校验和单独校验验证数据是否已存在-导入时验证
        /// </summary>
        /// <param name="inputs"></param>
        /// <returns></returns>
        private async Task CheckExisitForImport(List<MesPushPackageCode> inputs)
        { 
            if (inputs?.Count <= 0)
            {
                throw Oops.Oh($"导入数据不能为空");
            }
            //根据组合校验验证表格中中是否已存在相同数据  
                      






          
           //根据单独校验验证表格中中是否已存在相同数据  
           
           
           
        }
     #endregion

}


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,79 @@
using Admin.NET.Core.Service;
using Admin.NET.Application.Entity;
using Microsoft.AspNetCore.Http;
using System.Data;
using System.Web;
using System.Text;
using Furion.DatabaseAccessor;
using Admin.NET.Application.Service.WmsOrder.Mes_BatchOrderUPI_New.Dto;

namespace Admin.NET.Application;
/// <summary>
/// ç¬¬ä¸‰æ–¹æŽ¥å£æœåŠ¡
/// </summary>
[ApiDescriptionSettings(ApplicationConst.ThirdInterFaceServiceGroupName, Order = 100)]
public class ThirdInterFaceService : IDynamicApiController, ITransient
{
    private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _rep;
    private readonly SqlSugarRepository<Mes_Package_Gather> _mes_Package_Gather_Rep;
    public ThirdInterFaceService(SqlSugarRepository<Mes_BatchOrderUPI_New> rep,
        SqlSugarRepository<Mes_Package_Gather> mes_Package_Gather_Rep
        )
    {
        _rep = rep;
        _mes_Package_Gather_Rep = mes_Package_Gather_Rep;
    }

    [HttpPost]
    [ApiDescriptionSettings(Name = "GetBatchOrderUPIList")]
    [UnitOfWork]
    [AllowAnonymous]
    public async Task GetBatchOrderUPIList(List<Mes_BatchOrderUPI_New> input)
    {
        if (input?.Count <= 0)
        {
            throw Oops.Oh($"数据不能为空");
        }
        //校验upi是否重复 ã€Editby shaocx,2022-12-13】
        var myList = input.Select(x => x.UPI).ToList();
        var result = myList.GroupBy(x => x)
             .Where(g => g.Count() > 1)
             .ToDictionary(x => x.Key, x => x.Count());
        if (result != null && result.Count > 0)
        {
            var dit = result.First();
            throw Oops.Oh("本次有重复的UPI！重复号为:" + dit.Key + ",重复条数:" + dit.Value);
        }

        List<string> packageList = new List<string>();
        input.ForEach(x => packageList.Add(x.PackageCode));//upis是传过来的upi字段集合

        var batchOrderUPIs = await _rep.AsQueryable().Where(x => packageList.Contains(x.PackageCode)).ToListAsync();//batchOrderUPIs是重复的upi集合
        //批量删除
        await _rep.DeleteAsync(batchOrderUPIs);

        //批量删除
        await _mes_Package_Gather_Rep.DeleteAsync(x => packageList.Contains(x.PackageCode));

        foreach (var item in input)
        {
            item.AreaCode = AreaCodeEnum.无区域;
            item.UpiStatus = UpiStatusEnum.初始;
        }
        List<Mes_Package_Gather> addGatherList = new List<Mes_Package_Gather>();
        var groups = input.GroupBy(x => x.PackageCode);
        foreach (var group in groups)
        {
            var first = group.ToList().First();
            Mes_Package_Gather newGather = first.Adapt<Mes_Package_Gather>();
            newGather.AreaCode = AreaCodeEnum.无区域;
            newGather.UpiStatus = UpiStatusEnum.初始;
            addGatherList.Add(newGather);
        }
        await _mes_Package_Gather_Rep.InsertRangeAsync(addGatherList);

        await _rep.InsertRangeAsync(input);
    }

}


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs

ÎļþÒÑɾ³ý

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs

@@ -9,14 +9,9 @@
    public class Mes_BatchOrderUPI_NewBaseInput
    {
        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// éƒ¨ä»¶æ¡ç 
        /// </summary>
        public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        public virtual string UPI { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
@@ -29,9 +24,19 @@
        public virtual string OrderId { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶æ¡ç 
        /// ç”Ÿäº§å•å·
        /// </summary>
        public virtual string UPI { get; set; }
        public virtual string Info5 { get; set; }
        
        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
@@ -54,29 +59,9 @@
        public virtual float Thk { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶çº¹ç†
        /// </summary>
        public virtual string Matgrid { get; set; }
        
        /// <summary>
        /// æ˜¯å¦å°è¾¹
        /// </summary>
        public virtual int? IsEB { get; set; }
        
        /// <summary>
        /// æ‰“孔设备编号
        /// </summary>
        public virtual int? DRNum { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ä¼˜åŒ–包装
        /// </summary>
        public virtual int? IsPA { get; set; }
        
        /// <summary>
        /// é”¯åˆ‡å›¾å·
        /// </summary>
        public virtual int? MaterialIndeX { get; set; }
        
        /// <summary>
        /// åŒ…装号
@@ -109,11 +94,6 @@
        public virtual int? Shelf { get; set; }
        
        /// <summary>
        /// è½¬å‘角度
        /// </summary>
        public virtual float? Rotation { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public virtual float? Info1 { get; set; }
@@ -132,11 +112,6 @@
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        public virtual string Info4 { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public virtual string Info5 { get; set; }
        
        /// <summary>
        /// ç¬¬å‡ åŒ…
@@ -194,6 +169,11 @@
        public virtual string Info16 { get; set; }
        
        /// <summary>
        /// æœºæ¢°è‡‚是否旋转
        /// </summary>
        public virtual string Info17 { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public virtual DateTime? CreateTime { get; set; }
@@ -241,14 +221,9 @@
        public string? SearchKey { get; set; }

        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// éƒ¨ä»¶æ¡ç 
        /// </summary>
        public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; }
        public string? UPI { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
@@ -261,9 +236,19 @@
        public string? OrderId { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶æ¡ç 
        /// ç”Ÿäº§å•å·
        /// </summary>
        public string? UPI { get; set; }
        public string? Info5 { get; set; }
        
        /// <summary>
        /// æ‰€åœ¨åŒºåŸŸ
        /// </summary>
        public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
        
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°
@@ -286,29 +271,9 @@
        public float? Thk { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶çº¹ç†
        /// </summary>
        public string? Matgrid { get; set; }
        
        /// <summary>
        /// æ˜¯å¦å°è¾¹
        /// </summary>
        public int? IsEB { get; set; }
        
        /// <summary>
        /// æ‰“孔设备编号
        /// </summary>
        public int? DRNum { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ä¼˜åŒ–包装
        /// </summary>
        public int? IsPA { get; set; }
        
        /// <summary>
        /// é”¯åˆ‡å›¾å·
        /// </summary>
        public int? MaterialIndeX { get; set; }
        
        /// <summary>
        /// åŒ…装号
@@ -341,11 +306,6 @@
        public int? Shelf { get; set; }
        
        /// <summary>
        /// è½¬å‘角度
        /// </summary>
        public float? Rotation { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public float? Info1 { get; set; }
@@ -364,11 +324,6 @@
        /// é”€å”®åˆåŒå•å·
        /// </summary>
        public string? Info4 { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public string? Info5 { get; set; }
        
        /// <summary>
        /// ç¬¬å‡ åŒ…
@@ -425,6 +380,11 @@
        /// </summary>
        public string? Info16 { get; set; }
        
        /// <summary>
        /// æœºæ¢°è‡‚是否旋转
        /// </summary>
        public string? Info17 { get; set; }
        
    }

    /// <summary>
@@ -433,10 +393,10 @@
    public class AddMes_BatchOrderUPI_NewInput : Mes_BatchOrderUPI_NewBaseInput
    {
        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// éƒ¨ä»¶æ¡ç 
        /// </summary>
        [Required(ErrorMessage = "板料状态不能为空")]
        public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        [Required(ErrorMessage = "部件条码不能为空")]
        public override string UPI { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å·
@@ -451,10 +411,10 @@
        public override string OrderId { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶æ¡ç 
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required(ErrorMessage = "部件条码不能为空")]
        public override string UPI { get; set; }
        [Required(ErrorMessage = "板料状态不能为空")]
        public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        
        /// <summary>
        /// éƒ¨ä»¶åç§°

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs

@@ -11,14 +11,9 @@
    public long? Id { get; set; }
    
    /// <summary>
    /// æ‰€åœ¨åŒºåŸŸ
    /// éƒ¨ä»¶æ¡ç 
    /// </summary>
    public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
    
    /// <summary>
    /// æ¿æ–™çŠ¶æ€
    /// </summary>
    public Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
    public string UPI { get; set; }
    
    /// <summary>
    /// æ‰¹æ¬¡å·
@@ -31,9 +26,19 @@
    public string OrderId { get; set; }
    
    /// <summary>
    /// éƒ¨ä»¶æ¡ç 
    /// ç”Ÿäº§å•å·
    /// </summary>
    public string UPI { get; set; }
    public string Info5 { get; set; }
    
    /// <summary>
    /// æ‰€åœ¨åŒºåŸŸ
    /// </summary>
    public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
    
    /// <summary>
    /// æ¿æ–™çŠ¶æ€
    /// </summary>
    public Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
    
    /// <summary>
    /// éƒ¨ä»¶åç§°
@@ -56,29 +61,9 @@
    public float Thk { get; set; }
    
    /// <summary>
    /// éƒ¨ä»¶çº¹ç†
    /// </summary>
    public string Matgrid { get; set; }
    
    /// <summary>
    /// æ˜¯å¦å°è¾¹
    /// </summary>
    public int? IsEB { get; set; }
    
    /// <summary>
    /// æ‰“孔设备编号
    /// </summary>
    public int? DRNum { get; set; }
    
    /// <summary>
    /// æ˜¯å¦ä¼˜åŒ–包装
    /// </summary>
    public int? IsPA { get; set; }
    
    /// <summary>
    /// é”¯åˆ‡å›¾å·
    /// </summary>
    public int? MaterialIndeX { get; set; }
    
    /// <summary>
    /// åŒ…装号
@@ -111,11 +96,6 @@
    public int? Shelf { get; set; }
    
    /// <summary>
    /// è½¬å‘角度
    /// </summary>
    public float? Rotation { get; set; }
    
    /// <summary>
    /// çº¸ç®±é•¿
    /// </summary>
    public float? Info1 { get; set; }
@@ -134,11 +114,6 @@
    /// é”€å”®åˆåŒå•å·
    /// </summary>
    public string Info4 { get; set; }
    
    /// <summary>
    /// ç”Ÿäº§å•å·
    /// </summary>
    public string Info5 { get; set; }
    
    /// <summary>
    /// ç¬¬å‡ åŒ…
@@ -196,6 +171,11 @@
    public string Info16 { get; set; }
    
    /// <summary>
    /// æœºæ¢°è‡‚是否旋转
    /// </summary>
    public string Info17 { get; set; }
    
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    /// </summary>
    public DateTime? CreateTime { get; set; }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs

@@ -4,9 +4,6 @@
using System.Data;
using System.Web;
using System.Text;
using Furion.DatabaseAccessor;
using Admin.NET.Application.Service.WmsOrder.Mes_BatchOrderUPI_New.Dto;

namespace Admin.NET.Application;
/// <summary>
/// æ‰¹æ¬¡æ•°æ®æœåŠ¡
@@ -154,32 +151,27 @@
                                      
                           var addItem = new Mes_BatchOrderUPI_New();
                          #region å®šä¹‰å˜é‡
                           var _AreaCode = "";//所在区域
                           var _UpiStatus = "";//板料状态
                           var _UPI = "";//部件条码
                           var _PlanNo = "";//批次号
                           var _OrderId = "";//订单号
                           var _UPI = "";//部件条码
                           var _Info5 = "";//生产单号
                           var _AreaCode = "";//所在区域
                           var _UpiStatus = "";//板料状态
                           var _DetailName = "";//部件名称
                           var _Length = "";//长
                           var _Width = "";//宽
                           var _Thk = "";//厚
                           var _Matgrid = "";//部件纹理
                           var _IsEB = "";//是否封边
                           var _DRNum = "";//打孔设备编号
                           var _IsPA = "";//是否优化包装
                           var _MaterialIndeX = "";//锯切图号
                           var _PackageCode = "";//包装号
                           var _MachineXCenter = "";//包装X坐标
                           var _MachineYCenter = "";//包装Y坐标
                           var _MachineZCenter = "";//包装Z坐标
                           var _Sequence = "";//层数
                           var _Shelf = "";//次序
                           var _Rotation = "";//转向角度
                           var _Info1 = "";//纸箱长
                           var _Info2 = "";//纸箱宽
                           var _Info3 = "";//纸箱高
                           var _Info4 = "";//销售合同单号
                           var _Info5 = "";//生产单号
                           var _Info6 = "";//第几包
                           var _Info7 = "";//经销店名称
                           var _Info8 = "";//产品名称
@@ -191,36 +183,32 @@
                           var _Info14 = "";//部件名称
                           var _Info15 = "";//部件数量
                           var _Info16 = "";//部件尺寸
                           var _Info17 = "";//机械臂是否旋转
                          #endregion
                          
                          
                          #region å–值
                           _AreaCode = row["所在区域"]?.ToString() ;
                           _UpiStatus = row["板料状态"]?.ToString() ;
                           _UPI = row["部件条码"]?.ToString() ;
                           _PlanNo = row["批次号"]?.ToString() ;
                           _OrderId = row["订单号"]?.ToString() ;
                           _UPI = row["部件条码"]?.ToString() ;
                           _Info5 = row["生产单号"]?.ToString() ;
                           _AreaCode = row["所在区域"]?.ToString() ;
                           _UpiStatus = row["板料状态"]?.ToString() ;
                           _DetailName = row["部件名称"]?.ToString() ;
                           _Length = row["长"]?.ToString() ;
                           _Width = row["宽"]?.ToString() ;
                           _Thk = row["厚"]?.ToString() ;
                           _Matgrid = row["部件纹理"]?.ToString() ;
                           _IsEB = row["是否封边"]?.ToString() ;
                           _DRNum = row["打孔设备编号"]?.ToString() ;
                           _IsPA = row["是否优化包装"]?.ToString() ;
                           _MaterialIndeX = row["锯切图号"]?.ToString() ;
                           _PackageCode = row["包装号"]?.ToString() ;
                           _MachineXCenter = row["包装X坐标"]?.ToString() ;
                           _MachineYCenter = row["包装Y坐标"]?.ToString() ;
                           _MachineZCenter = row["包装Z坐标"]?.ToString() ;
                           _Sequence = row["层数"]?.ToString() ;
                           _Shelf = row["次序"]?.ToString() ;
                           _Rotation = row["转向角度"]?.ToString() ;
                           _Info1 = row["纸箱长"]?.ToString() ;
                           _Info2 = row["纸箱宽"]?.ToString() ;
                           _Info3 = row["纸箱高"]?.ToString() ;
                           _Info4 = row["销售合同单号"]?.ToString() ;
                           _Info5 = row["生产单号"]?.ToString() ;
                           _Info6 = row["第几包"]?.ToString() ;
                           _Info7 = row["经销店名称"]?.ToString() ;
                           _Info8 = row["产品名称"]?.ToString() ;
@@ -232,10 +220,45 @@
                           _Info14 = row["部件名称"]?.ToString() ;
                           _Info15 = row["部件数量"]?.ToString() ;
                           _Info16 = row["部件尺寸"]?.ToString() ;
                           _Info17 = row["机械臂是否旋转"]?.ToString() ;
                          #endregion
                          
                          
                          #region éªŒè¯
                          
                          if (string.IsNullOrEmpty(_UPI))
                          {
                            throw Oops.Oh($"第{index}行[部件条码]{_UPI}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_UPI))
                          {
                                addItem.UPI = (string)(_UPI.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_PlanNo))
                          {
                            throw Oops.Oh($"第{index}行[批次号]{_PlanNo}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_PlanNo))
                          {
                                addItem.PlanNo = (string)(_PlanNo.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_OrderId))
                          {
                            throw Oops.Oh($"第{index}行[订单号]{_OrderId}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_OrderId))
                          {
                                addItem.OrderId = (string)(_OrderId.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info5))
                          {
                                addItem.Info5 = (string)(_Info5.Trim());
                           }
                          if(!string.IsNullOrEmpty(_AreaCode))
                          {
                          Admin.NET.Application.AreaCodeEnum  enumAreaCode = default(Admin.NET.Application.AreaCodeEnum);
@@ -271,36 +294,6 @@
                          
                           }
                          
                          if (string.IsNullOrEmpty(_PlanNo))
                          {
                            throw Oops.Oh($"第{index}行[批次号]{_PlanNo}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_PlanNo))
                          {
                                addItem.PlanNo = (string)(_PlanNo.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_OrderId))
                          {
                            throw Oops.Oh($"第{index}行[订单号]{_OrderId}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_OrderId))
                          {
                                addItem.OrderId = (string)(_OrderId.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_UPI))
                          {
                            throw Oops.Oh($"第{index}行[部件条码]{_UPI}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_UPI))
                          {
                                addItem.UPI = (string)(_UPI.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_DetailName))
                          {
                            throw Oops.Oh($"第{index}行[部件名称]{_DetailName}不能为空！");
@@ -316,66 +309,13 @@
                            throw Oops.Oh($"第{index}行[长]{_Length}不能为空！");
                          }
                          
                          //if(!string.IsNullOrEmpty(_Length))
                          //{
                          //      addItem.Length = (float)(_Length.Trim());
                          // }
                          
                          //if (string.IsNullOrEmpty(_Width))
                          //{
                          //  throw Oops.Oh($"第{index}行[宽]{_Width}不能为空！");
                          //}
                          
                          //if(!string.IsNullOrEmpty(_Width))
                          //{
                          //      addItem.Width = (float)(_Width.Trim());
                          // }
                          
                          //if (string.IsNullOrEmpty(_Thk))
                          //{
                          //  throw Oops.Oh($"第{index}行[厚]{_Thk}不能为空！");
                          //}
                          
                          //if(!string.IsNullOrEmpty(_Thk))
                          //{
                          //      addItem.Thk = (float)(_Thk.Trim());
                          // }
                          if(!string.IsNullOrEmpty(_Matgrid))
                          if (string.IsNullOrEmpty(_Thk))
                          {
                                addItem.Matgrid = (string)(_Matgrid.Trim());
                           }
                          if(!string.IsNullOrEmpty(_IsEB))
                          {
                              if (!int.TryParse(_IsEB, out int outIsEB)&&!string.IsNullOrEmpty(_IsEB))
                              {
                                 throw Oops.Oh($"第{index}行[是否封边]{_IsEB}值不正确！");
                              }
                              if (outIsEB <= 0&&!string.IsNullOrEmpty(_IsEB))
                              {
                                 throw Oops.Oh($"第{index}行[是否封边]{_IsEB}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.IsEB = outIsEB;
                            throw Oops.Oh($"第{index}行[厚]{_Thk}不能为空！");
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_DRNum))
                          {
                              if (!int.TryParse(_DRNum, out int outDRNum)&&!string.IsNullOrEmpty(_DRNum))
                              {
                                 throw Oops.Oh($"第{index}行[打孔设备编号]{_DRNum}值不正确！");
                              }
                              if (outDRNum <= 0&&!string.IsNullOrEmpty(_DRNum))
                              {
                                 throw Oops.Oh($"第{index}行[打孔设备编号]{_DRNum}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.DRNum = outDRNum;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_IsPA))
                          {
                              if (!int.TryParse(_IsPA, out int outIsPA)&&!string.IsNullOrEmpty(_IsPA))
@@ -389,22 +329,6 @@
                              else
                              {
                                 addItem.IsPA = outIsPA;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_MaterialIndeX))
                          {
                              if (!int.TryParse(_MaterialIndeX, out int outMaterialIndeX)&&!string.IsNullOrEmpty(_MaterialIndeX))
                              {
                                 throw Oops.Oh($"第{index}行[锯切图号]{_MaterialIndeX}值不正确！");
                              }
                              if (outMaterialIndeX <= 0&&!string.IsNullOrEmpty(_MaterialIndeX))
                              {
                                 throw Oops.Oh($"第{index}行[锯切图号]{_MaterialIndeX}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.MaterialIndeX = outMaterialIndeX;
                              }
                          
                          }
@@ -452,18 +376,6 @@
                          
                          }
                         
                          if(!string.IsNullOrEmpty(_Info4))
                          {
                                addItem.Info4 = (string)(_Info4.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info5))
                          {
                                addItem.Info5 = (string)(_Info5.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info6))
                          {
                                addItem.Info6 = (string)(_Info6.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info7))
                          {
                                addItem.Info7 = (string)(_Info7.Trim());
@@ -516,6 +428,10 @@
                          {
                                addItem.Info16 = (string)(_Info16.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info17))
                          {
                                addItem.Info17 = (string)(_Info17.Trim());
                           }
                          #endregion
                          

@@ -553,14 +469,13 @@
    {
        var query = _rep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
                u.PlanNo.Contains(input.SearchKey.Trim())
                u.UPI.Contains(input.SearchKey.Trim())
                || u.PlanNo.Contains(input.SearchKey.Trim())
                || u.OrderId.Contains(input.SearchKey.Trim())
                || u.UPI.Contains(input.SearchKey.Trim())
                || u.Info5.Contains(input.SearchKey.Trim())
                || u.DetailName.Contains(input.SearchKey.Trim())
                || u.Matgrid.Contains(input.SearchKey.Trim())
                || u.PackageCode.Contains(input.SearchKey.Trim())
                || u.Info4.Contains(input.SearchKey.Trim())
                || u.Info5.Contains(input.SearchKey.Trim())
                || u.Info6.Contains(input.SearchKey.Trim())
                || u.Info7.Contains(input.SearchKey.Trim())
                || u.Info8.Contains(input.SearchKey.Trim())
@@ -571,25 +486,22 @@
                || u.Info13.Contains(input.SearchKey.Trim())
                || u.Info14.Contains(input.SearchKey.Trim())
                || u.Info16.Contains(input.SearchKey.Trim())
                || u.Info17.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
            .WhereIF(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode)
            .WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus)
            .WhereIF(!string.IsNullOrWhiteSpace(input.UPI), u => u.UPI.Contains(input.UPI.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.UPI), u => u.UPI.Contains(input.UPI.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
            .WhereIF(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode)
            .WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus)
            .WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.DetailName.Contains(input.DetailName.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Matgrid), u => u.Matgrid.Contains(input.Matgrid.Trim()))
            .WhereIF(input.IsEB>0, u => u.IsEB == input.IsEB)
            .WhereIF(input.DRNum>0, u => u.DRNum == input.DRNum)
            .WhereIF(input.IsPA>0, u => u.IsPA == input.IsPA)
            .WhereIF(input.MaterialIndeX>0, u => u.MaterialIndeX == input.MaterialIndeX)
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .WhereIF(input.Sequence>0, u => u.Sequence == input.Sequence)
            .WhereIF(input.Shelf>0, u => u.Shelf == input.Shelf)
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info8), u => u.Info8.Contains(input.Info8.Trim()))
@@ -601,6 +513,7 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim()))
            .WhereIF(input.Info15>0, u => u.Info15 == input.Info15)
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info17), u => u.Info17.Contains(input.Info17.Trim()))
            .Select<Mes_BatchOrderUPI_NewOutput>();
        return query;
       }
@@ -648,25 +561,6 @@
           
        }
    #endregion


    [HttpPost]
    [ApiDescriptionSettings(Name = "GetBatchOrderUPIList")]
    [UnitOfWork]
    [AllowAnonymous]
    public async Task GetBatchOrderUPIList(List<GetBatchOrderUPIInput> input)
    {
        List<Mes_BatchOrderUPI_New> list = new List<Mes_BatchOrderUPI_New>();
        foreach (var item in input)
        {
            Mes_BatchOrderUPI_New task = new Mes_BatchOrderUPI_New();
            task = item.Adapt<Mes_BatchOrderUPI_New>();
            task.AreaCode = AreaCodeEnum.无区域;
            task.UpiStatus = UpiStatusEnum.初始;
            list.Add(task);
        }
        await _rep.InsertRangeAsync(list);
    }

}


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs

@@ -232,4 +232,8 @@
    /// éƒ¨ä»¶åç§°
    /// </summary>
    public string DetailName { get; set; }

    public string? Info5 { get; set; }
    public string? Info16 { get; set; }

}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs

@@ -371,6 +371,52 @@
        };
    }


    /// <summary>
    /// åˆ†é¡µæŸ¥è¯¢ç¼ºæ–™æ¸…单 ä¸é½åŒ… -按照生产单号分组 
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "ShortagePageGroupByInfo5")]
    [Description("WmsStockQuan/ShortagePageGroupByInfo5")]
    public async Task<SqlSugarPagedList<WmsShortageListOutput>> ShortagePageGroupByInfo5(KittingListInput input)
    {
        var listRes = await GetShortageListCore(input);

        // æŒ‰ç…§å­—段 Info5 åˆ†ç»„
        var groupedList = listRes
            .GroupBy(x => x.Info5) // æ ¹æ® Info5 å­—段进行分组
            .Select(g => new WmsShortageListOutput // å‡è®¾æ‚¨å°†åˆ†ç»„后的结果转换为 WmsShortageListOutput
            {
                Info5 = g.Key,
                ShortageCount = g.Count(),
            })
            .ToList();

        // è¿›è¡Œåˆ†é¡µå¤„理
        var totalCount = groupedList.Count; // èŽ·å–总数
        var pagedList = groupedList
            //.OrderBy(x => x.Id) // æ ¹æ®éœ€è¦è¿›è¡ŒæŽ’序
            .Skip((input.Page - 1) * input.PageSize)
            .Take(input.PageSize)
            .ToList();

        // æž„造并返回分页结果
        return new SqlSugarPagedList<WmsShortageListOutput>
        {
            Page = input.Page,
            PageSize = input.PageSize,
            Total = totalCount,
            TotalPages = (int)Math.Ceiling((double)totalCount / input.PageSize),
            Items = pagedList,
            HasPrevPage = input.Page > 1,
            HasNextPage = input.Page < ((int)Math.Ceiling((double)totalCount / input.PageSize))
        };
    }



    /// <summary>
    /// ç¼ºåŒ…数据
    /// </summary>
@@ -400,7 +446,9 @@
                    PackageCode = item.PackageCode,
                    DetailName = item.DetailName,
                    OrderId = item.OrderId,
                    PlanNo = item.PlanNo
                    PlanNo = item.PlanNo,
                    Info5= item.Info5,
                    Info16 = item.Info16,
                });
            }
        }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/Åú´ÎÊý¾Ýµ¼ÈëÄ£°å.xlsx

Binary files differ

 LuLiScreen/.vscode/launch.json

 LuLiScreen/config.js

 LuLiScreen/css/font/icomoon/Read Me.txt

 LuLiScreen/css/font/icomoon/demo-files/demo.css

 LuLiScreen/css/font/icomoon/demo-files/demo.js

 LuLiScreen/css/font/icomoon/demo.html

 LuLiScreen/css/font/icomoon/fonts/icomoon.eot

Binary files differ

 LuLiScreen/css/font/icomoon/fonts/icomoon.svg

 LuLiScreen/css/font/icomoon/fonts/icomoon.ttf

Binary files differ

 LuLiScreen/css/font/icomoon/fonts/icomoon.woff

Binary files differ

 LuLiScreen/css/font/icomoon/selection.json

 LuLiScreen/css/font/icomoon/style.css

 LuLiScreen/css/font/webfontkit1/generator_config.txt

 LuLiScreen/css/font/webfontkit1/specimen_files/grid_12-825-55-15.css

 LuLiScreen/css/font/webfontkit1/specimen_files/specimen_stylesheet.css

 LuLiScreen/css/font/webfontkit1/stylesheet.css

 LuLiScreen/css/font/webfontkit1/yj_1-demo.html

 LuLiScreen/css/font/webfontkit1/yj_1-webfont.woff

Binary files differ

 LuLiScreen/css/font/webfontkit1/yj_1-webfont.woff2

Binary files differ

 LuLiScreen/css/font/webfontkit2/generator_config.txt

 LuLiScreen/css/font/webfontkit2/specimen_files/grid_12-825-55-15.css

 LuLiScreen/css/font/webfontkit2/specimen_files/specimen_stylesheet.css

 LuLiScreen/css/font/webfontkit2/stylesheet.css

 LuLiScreen/css/font/webfontkit2/w9p-demo.html

 LuLiScreen/css/font/webfontkit2/w9p-webfont.woff

Binary files differ

 LuLiScreen/css/font/webfontkit2/w9p-webfont.woff2

Binary files differ

 LuLiScreen/css/font/webfontkit3/_ttf-demo.html

 LuLiScreen/css/font/webfontkit3/_ttf-webfont.woff

Binary files differ

 LuLiScreen/css/font/webfontkit3/_ttf-webfont.woff2

Binary files differ

 LuLiScreen/css/font/webfontkit3/generator_config.txt

 LuLiScreen/css/font/webfontkit3/specimen_files/grid_12-825-55-15.css

 LuLiScreen/css/font/webfontkit3/specimen_files/specimen_stylesheet.css

 LuLiScreen/css/font/webfontkit3/stylesheet.css

 LuLiScreen/css/font/webfontkit4/_-demo.html

 LuLiScreen/css/font/webfontkit4/_-webfont.woff

Binary files differ

 LuLiScreen/css/font/webfontkit4/_-webfont.woff2

Binary files differ

 LuLiScreen/css/font/webfontkit4/generator_config.txt

 LuLiScreen/css/font/webfontkit4/specimen_files/grid_12-825-55-15.css

 LuLiScreen/css/font/webfontkit4/specimen_files/specimen_stylesheet.css

 LuLiScreen/css/font/webfontkit4/stylesheet.css

 LuLiScreen/css/liMarquee.css

 LuLiScreen/css/style.css

 LuLiScreen/css/style_new20241126.css

ÎļþÃû´Ó makino-bigScreen/css/style_new20241126.css ÐÞ¸Ä
@@ -218,8 +218,10 @@
}

.box-center .center-top {
    padding-top: 11px;
    padding-bottom: 30px;
    width: 100%;
    height: 8.8%;
    height: 9%;
    position: relative;
    background: url(../images/title_border.png) center center no-repeat;
}
@@ -242,7 +244,7 @@
    margin: 0 auto;
    height: 110px;
    width: 98%;
    margin-top: 5%;
    margin-top: 4%;
    margin-bottom: 25px;
    display: flex;
    justify-content: space-between;
@@ -251,7 +253,7 @@
.con_div .con_div_text {
    height: 100%;
    background-color: #034c6a;
    width: 20%;
    width: 24%;
    display: flex;
    justify-content: center;
    align-items: center;
@@ -271,12 +273,13 @@
}

.text01_div p:nth-child(1) {
    font-size: 13px;
    font-size: 18px;
    font-weight: 600;
    color: #ffffff;
}

.text01_div p:nth-child(2) {
    font-size: 28px;
    font-size: 35px;
    color: #ffff43;
    font-weight: 600;

@@ -318,7 +321,7 @@
    top: -15px;
    color: #ffffff;
    font-weight: bold;
    font-size: 16px;
    font-size: 18px;
    text-align: center;
    display: flex;
    align-items: center;
@@ -359,7 +362,8 @@
}

.table_p .dowebok{
    height: 300px;
    /* border: 1px solid red; */
    height: 420px;
    color: #ffffff;
    font-size: 13px;
    /* border: 1px solid red; */
@@ -402,4 +406,40 @@
    width:14.28%;
}

@media screen and (max-height: 610px) {}

.box_up{
    width: 98%;
    margin-top: 10px;
    margin-left: 1%;
    display: flex;
        justify-content: space-between;
}
.box_up_left{
    width: 49%;
}
.box_up_right{
    width: 49%;

}
.div_any_child.div_any_child2 {
    width: 100%;
}
.table_p.table_p_my3 .dowebok{
    height: 60px;
}
.titleHt{
    color: white;
    position: absolute;
    position: absolute;
    top: 12px;
    font-size: 15px;
}
.titleHt span{
    font-weight: 700;
}
.title_lt{
    left: 10px;
}
.title_rt{
    right: 10px;
}

 LuLiScreen/images/arrow.png

 LuLiScreen/images/bg_img03.png

 LuLiScreen/images/bg_img04.png

 LuLiScreen/images/border_bg01.png

 LuLiScreen/images/box_title.png

 LuLiScreen/images/chart_icon.png

 LuLiScreen/images/chart_icon_on.png

 LuLiScreen/images/close.png

 LuLiScreen/images/close_icon.png

 LuLiScreen/images/data_icon.png

 LuLiScreen/images/data_icon_on.png

 LuLiScreen/images/fangda.png

 LuLiScreen/images/img/info_1.png

 LuLiScreen/images/img/info_2.png

 LuLiScreen/images/img/info_4.png

 LuLiScreen/images/img/info_5.png

 LuLiScreen/images/img/title_4.png

 LuLiScreen/images/index_bg.png

 LuLiScreen/images/index_bg_2.jpg

 LuLiScreen/images/jian.png

 LuLiScreen/images/line-blue.png

 LuLiScreen/images/line_bg.png

 LuLiScreen/images/line_img.png

 LuLiScreen/images/menu_btn.png

 LuLiScreen/images/menu_on.png

 LuLiScreen/images/next.png

 LuLiScreen/images/people_iocn.png

 LuLiScreen/images/plus.png

 LuLiScreen/images/popUP_bg.png

 LuLiScreen/images/prev.png

 LuLiScreen/images/select_icon.png

 LuLiScreen/images/select_icon_on.png

 LuLiScreen/images/selsct_time.png

 LuLiScreen/images/settings_icon.png

 LuLiScreen/images/settings_icon_on.png

 LuLiScreen/images/teacher_icon.png

 LuLiScreen/images/title_bg01.png

 LuLiScreen/images/title_border.png

 LuLiScreen/images/title_line.png

 LuLiScreen/images/weather/weather_img01.png

 LuLiScreen/images/weather/ÖÐÓê.png

 LuLiScreen/images/weather/ÖÐÓêת´óÓê.png

 LuLiScreen/images/weather/ÖÐÑ©.png

 LuLiScreen/images/weather/ÖÐѩת´óÑ©.png

 LuLiScreen/images/weather/¶³Óê.png

 LuLiScreen/images/weather/¶àÔÆ.png

 LuLiScreen/images/weather/´ó±©Óê.png

 LuLiScreen/images/weather/´ó±©Ñ©.png

 LuLiScreen/images/weather/´óÓê.png

 LuLiScreen/images/weather/´óÓêת±©Óê.png

 LuLiScreen/images/weather/´óÑ©.png

 LuLiScreen/images/weather/´óѩת±©Ñ©.png

 LuLiScreen/images/weather/СÓê.png

 LuLiScreen/images/weather/СÓêתÖÐÓê.png

 LuLiScreen/images/weather/Сѩ.png

 LuLiScreen/images/weather/СѩתÖÐÑ©.png

 LuLiScreen/images/weather/ǿɳ³¾±©.png

 LuLiScreen/images/weather/Ñïɳ.png

 LuLiScreen/images/weather/Çç.png

 LuLiScreen/images/weather/±©Óê.png

 LuLiScreen/images/weather/±©Óêת´ó±©Óê.png

 LuLiScreen/images/weather/±©Ñ©.png

 LuLiScreen/images/weather/ɳ³¾±©.png

 LuLiScreen/images/weather/¸¡³¾.png

 LuLiScreen/images/weather/ÌØ´ó±©Óê.png

 LuLiScreen/images/weather/Òõ.png

 LuLiScreen/images/weather/ÕóÓê.png

 LuLiScreen/images/weather/ÕóÑ©.png

 LuLiScreen/images/weather/Óê¼ÓÑ©.png

 LuLiScreen/images/weather/À×ÕóÓê.png

 LuLiScreen/images/weather/À×ÕóÓê¼Ó±ù±¢.png

 LuLiScreen/images/weather/Îí.png

 LuLiScreen/images/weather/ö².png

 LuLiScreen/index.html

 LuLiScreen/index2.html

 LuLiScreen/index3 copy.html

ÎļþÃû´Ó makino-bigScreen/index3.html ÐÞ¸Ä
@@ -15,54 +15,96 @@
    <link rel="stylesheet" href="./css//font/icomoon/style.css">
    <link rel="stylesheet" href="./css/liMarquee.css">
    <link rel="stylesheet" href="./css/style_new20241126.css">
    <title>牧野武汉机床备件中心-首页</title>
    <title>鲁丽木业包装线</title>
</head>

<body>
    <div class="container-flex" tabindex="0" hidefocus="true">
        <div class="box-center">
            <p class="titleHt title_lt">当前登陆人: åˆ˜å·¥</p>
            <p class="titleHt title_rt">登录时间: 2024-01-05</p>
            <div class="center-top">
                <h1>牧野武汉机床备件中心</h1>
                <h1>鲁丽木业包装线</h1>
            </div>
        </div>


        <div class="box_up">
            <div class="box_up_left">
        <!--数据总概-->
        <div class="con_div">
            <div class="con_div_text">
                <img src="./images/img/info_1.png" class=" text01_img">
                <div class=" text01_div">
                    <p>当前登陆人</p>
                    <p>12356</p>
                </div>
            </div>
            <div class="con_div_text">
                <img src="./images/img/info_2.png" class=" text01_img">
                <div class=" text01_div">
                    <p>登录时间</p>
                    <p>12356</p>
                </div>
            </div>
            <div class="con_div_text">
                <img src="./images/img/info_1.png" class=" text01_img">
                <div class=" text01_div">
                    <p>总订单数</p>
                    <p>12356</p>
                            <p>55</p>
                </div>
            </div>
            <div class="con_div_text">
                <img src="./images/img/info_2.png" class=" text01_img">
                <div class=" text01_div">
                    <p>当前件号</p>
                    <p>12356</p>
                            <p>总面积数</p>
                            <p>55</p>
                        </div>
                    </div>
                    <div class="con_div_text">
                        <img src="./images/img/info_2.png" class=" text01_img">
                        <div class=" text01_div">
                            <p>总包数</p>
                            <p>66</p>
                        </div>
                    </div>
                    <div class="con_div_text">
                        <img src="./images/img/info_2.png" class=" text01_img">
                        <div class=" text01_div">
                            <p>工作时长(h)</p>
                            <p>44</p>
                </div>
            </div>
        </div>
            </div>

            <div class="box_up_right">
                <div class=" div_table_box">
                    <div class="div_any_child div_any_child2">
                        <div class="div_any_title"><img src="./images/img/title_4.png">当前产线工件列表 </div>
                        <div class="table_p table_p_my3">
                            <div class="tt">
                                <span>订单号</span>
                                <span>工件数</span>
                                <span>还差数</span>
                                <span>下线数</span>
                                <span>总面积</span>
                                <span>当前面积</span>
                                <span>下线面积</span>
                            </div>
                            <div class="dowebok">
                                <ul>
                                    <li>
                                        <span>订单号11</span>
                                        <span>工件数22</span>
                                        <span>还差数33</span>
                                        <span>下线数44</span>
                                        <span>总面积55</span>
                                        <span>当前面积66</span>
                                        <span>下线面积77</span>
                                    </li>
                                </ul>
                            </div>
                        </div>
                    </div>
                </div>
    
            </div>
        </div>


        <!-- è¡¨æ ¼ -->
        <div class="div_table">

            <div class=" div_table_box">
                <div class="div_any_child">
                    <div class="div_any_title"><img src="./images/img/title_4.png">行驶里程排名前5位 </div>
                    <div class="div_any_title"><img src="./images/img/title_4.png">历史产线工件列表 </div>
                    <div class="table_p">


@@ -201,7 +243,7 @@
                </div>

                <div class="div_any_child">
                    <div class="div_any_title"><img src="./images/img/title_4.png">行驶里程排名前5位 </div>
                    <div class="div_any_title"><img src="./images/img/title_4.png">计划产线件号列表 </div>
                    <div class="table_p">


@@ -349,11 +391,13 @@
    <script>
        $(function () {
            $('.dowebok1').liMarquee({
                direction: 'up'
                direction: 'up',
                scrollamount:20
            });

            $('.dowebok2').liMarquee({
                direction: 'up'
                direction: 'up',
                scrollamount:20
            });
        });
    </script>

 LuLiScreen/index3.html

copy from makino-bigScreen/index3.html
copy to LuLiScreen/index3.html
Îļþ´Ó makino-bigScreen/index3.html ¸´ÖÆ
@@ -15,54 +15,103 @@
    <link rel="stylesheet" href="./css//font/icomoon/style.css">
    <link rel="stylesheet" href="./css/liMarquee.css">
    <link rel="stylesheet" href="./css/style_new20241126.css">
    <title>牧野武汉机床备件中心-首页</title>
    <title>鲁丽木业包装线</title>
</head>

<body>
    <div class="container-flex" tabindex="0" hidefocus="true">
        <div class="box-center">
            <p class="titleHt title_lt">当前登陆人: 
                <span>刘工 </span>
                
            </p>
            <p class="titleHt title_rt">登录时间: 
                <span> 2024-01-05 </span>
              
            
            </p>
            <div class="center-top">
                <h1>牧野武汉机床备件中心</h1>
                <h1>鲁丽木业包装线</h1>
            </div>
        </div>


        <div class="box_up">
            <div class="box_up_left">
        <!--数据总概-->
        <div class="con_div">
            <div class="con_div_text">
                <img src="./images/img/info_1.png" class=" text01_img">
                <div class=" text01_div">
                    <p>当前登陆人</p>
                    <p>12356</p>
                </div>
            </div>
            <div class="con_div_text">
                <img src="./images/img/info_2.png" class=" text01_img">
                <div class=" text01_div">
                    <p>登录时间</p>
                    <p>12356</p>
                </div>
            </div>
            <div class="con_div_text">
                <img src="./images/img/info_1.png" class=" text01_img">
                <div class=" text01_div">
                    <p>总订单数</p>
                    <p>12356</p>
                            <p>55</p>
                </div>
            </div>
            <div class="con_div_text">
                <img src="./images/img/info_2.png" class=" text01_img">
                <div class=" text01_div">
                    <p>当前件号</p>
                    <p>12356</p>
                            <p>总面积数</p>
                            <p>55</p>
                        </div>
                    </div>
                    <div class="con_div_text">
                        <img src="./images/img/info_2.png" class=" text01_img">
                        <div class=" text01_div">
                            <p>总包数</p>
                            <p>66</p>
                        </div>
                    </div>
                    <div class="con_div_text">
                        <img src="./images/img/info_2.png" class=" text01_img">
                        <div class=" text01_div">
                            <p>工作时长(h)</p>
                            <p>44</p>
                </div>
            </div>
        </div>
            </div>

            <div class="box_up_right">
                <div class=" div_table_box">
                    <div class="div_any_child div_any_child2">
                        <div class="div_any_title"><img src="./images/img/title_4.png">当前产线工件列表 </div>
                        <div class="table_p table_p_my3">
                            <div class="tt">
                                <span>订单号</span>
                                <span>工件数</span>
                                <span>还差数</span>
                                <span>下线数</span>
                                <span>总面积</span>
                                <span>当前面积</span>
                                <span>下线面积</span>
                            </div>
                            <div class="dowebok">
                                <ul>
                                    <li>
                                        <span>订单号11</span>
                                        <span>工件数22</span>
                                        <span>还差数33</span>
                                        <span>下线数44</span>
                                        <span>总面积55</span>
                                        <span>当前面积66</span>
                                        <span>下线面积77</span>
                                    </li>
                                </ul>
                            </div>
                        </div>
                    </div>
                </div>
    
            </div>
        </div>


        <!-- è¡¨æ ¼ -->
        <div class="div_table">

            <div class=" div_table_box">
                <div class="div_any_child">
                    <div class="div_any_title"><img src="./images/img/title_4.png">行驶里程排名前5位 </div>
                    <div class="div_any_title"><img src="./images/img/title_4.png">历史产线工件列表 </div>
                    <div class="table_p">


@@ -195,13 +244,49 @@
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                            </ul>
                        </div>
                    </div>
                </div>

                <div class="div_any_child">
                    <div class="div_any_title"><img src="./images/img/title_4.png">行驶里程排名前5位 </div>
                    <div class="div_any_title"><img src="./images/img/title_4.png">计划产线件号列表 </div>
                    <div class="table_p">


@@ -334,6 +419,24 @@
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                            </ul>
                        </div>
                    </div>
@@ -349,11 +452,15 @@
    <script>
        $(function () {
            $('.dowebok1').liMarquee({
                direction: 'up'
                direction: 'up',
                scrollamount:20,
                runshort: false
            });

            $('.dowebok2').liMarquee({
                direction: 'up'
                direction: 'up',
                scrollamount:20,
                runshort: false
            });
        });
    </script>

 LuLiScreen/js/base.js

 LuLiScreen/js/china.js

 LuLiScreen/js/data/city.json

 LuLiScreen/js/data/guangdong.js

 LuLiScreen/js/echarts.min.js

 LuLiScreen/js/jquery-1.8.3.min.js

 LuLiScreen/js/jquery-3.3.1.min.js

 LuLiScreen/js/jquery.liMarquee.js

 LuLiScreen/js/layer/extend/layer.ext.js

 LuLiScreen/js/layer/laydate/laydate.js

 LuLiScreen/js/layer/laydate/need/laydate.css

 LuLiScreen/js/layer/laydate/skins/danlan/icon.png

 LuLiScreen/js/layer/laydate/skins/danlan/laydate.css

 LuLiScreen/js/layer/laydate/skins/default/icon.png

 LuLiScreen/js/layer/laydate/skins/default/laydate.css

 LuLiScreen/js/layer/layer.min.js

 LuLiScreen/js/layer/layim/data/chatlog.json

 LuLiScreen/js/layer/layim/data/friend.json

 LuLiScreen/js/layer/layim/data/group.json

 LuLiScreen/js/layer/layim/data/groups.json

 LuLiScreen/js/layer/layim/layim.css

 LuLiScreen/js/layer/layim/layim.js

 LuLiScreen/js/layer/layim/loading.gif

 LuLiScreen/js/layer/skin/default/icon-ext.png

 LuLiScreen/js/layer/skin/default/icon.png

 LuLiScreen/js/layer/skin/default/icon_ext.png

 LuLiScreen/js/layer/skin/default/loading-0.gif

 LuLiScreen/js/layer/skin/default/loading-1.gif

 LuLiScreen/js/layer/skin/default/loading-2.gif

 LuLiScreen/js/layer/skin/default/textbg.png

 LuLiScreen/js/layer/skin/default/xubox_ico0.png

 LuLiScreen/js/layer/skin/default/xubox_loading0.gif

 LuLiScreen/js/layer/skin/default/xubox_loading1.gif

 LuLiScreen/js/layer/skin/default/xubox_loading2.gif

 LuLiScreen/js/layer/skin/default/xubox_loading3.gif

 LuLiScreen/js/layer/skin/default/xubox_title0.png

 LuLiScreen/js/layer/skin/layer.css

 LuLiScreen/js/layer/skin/layer.ext.css

 LuLiScreen/js/layer/skin/moon/default.png

 LuLiScreen/js/layer/skin/moon/style.css

 LuLiScreen/js/pop_base.js

 LuLiScreen/js/rem.js