打印前

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/Extends/PaiGe/MenBanReports/MenBanPackingRec2.cs

@@ -1,84 +0,0 @@
-using JetBrains.Annotations;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Entities.Auditing;
-
-namespace WY.NewJit.Extends
-{
-    /// <summary>
-    /// 生产线管理
-    /// </summary>
-    public class MenBanPackingRec2 : FullAuditedAggregateRoot<Guid>
-    {
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column00 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column01 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column02 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column03 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column04 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column05 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column06 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column07 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column08 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column09 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column10 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column11 { get; set; }
-
-        /// <summary>
-        /// 列N
-        /// </summary>
-        public virtual string Column12 { get; set; }
-
-
-
-    }
-}

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContext.cs

@@ -114,7 +114,7 @@ namespace WY.NewJit.EntityFrameworkCore
 
         public DbSet<MenBanPackingRec> menBanPackingRec { get; set; }
 
-        public DbSet<MenBanPackingRec2> menBanPackingRec2 { get; set; }
+        //public DbSet<MenBanPackingRec2> menBanPackingRec2 { get; set; }
 
 
         public DbSet<MaterialExt> materialExt { get; set; }

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs

@@ -417,11 +417,11 @@ namespace WY.NewJit.EntityFrameworkCore
                 b.ConfigureByConvention();//配置/映射继承的属性,应始终对你所有的实体使用它
             });
 
-            builder.Entity<MenBanPackingRec2>(b =>
+            //builder.Entity<MenBanPackingRec2>(b =>
-            {
+            //{
-                b.ToTable(NewJitConsts.DbTablePrefix + nameof(MenBanPackingRec2)); //将Book实体映射到数据库表XXXBooks
+            //    b.ToTable(NewJitConsts.DbTablePrefix + nameof(MenBanPackingRec2)); //将Book实体映射到数据库表XXXBooks
-                b.ConfigureByConvention();//配置/映射继承的属性,应始终对你所有的实体使用它
+            //    b.ConfigureByConvention();//配置/映射继承的属性,应始终对你所有的实体使用它
-            });
+            //});
 
 
             builder.Entity<MaterialExt>(b =>

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/Services/FileParse.cs

@@ -253,47 +253,47 @@ namespace WY.NewJit.Job.ConsoleBatchImportBrokenNum.Services
         /// <param name="importInfoObj"></param>
         public virtual void ParseOneEdiFile(string fileName, ImportVinInfo importVinObj)
         {
-            BillM100 billObj = null;
+            //BillM100 billObj = null;
-            try
+            //try
-            {
+            //{
-                #region 格式转换
+            //    #region 格式转换
-                errorHeader = "格式转换";
+            //    errorHeader = "格式转换";
-                //将报文内容转换成BillR100或BillM100
+            //    //将报文内容转换成BillR100或BillM100
-                billObj = ConvertToBill(importVinObj);
+            //    billObj = ConvertToBill(importVinObj);
-                billObj.NeedReplenishPrint = 1;
+            //    billObj.NeedReplenishPrint = 1;
-
+
-                //更新车型、生产线
+            //    //更新车型、生产线
-                errorHeader = "格式转换-更新车型、生产线";
+            //    errorHeader = "格式转换-更新车型、生产线";
-                UpdateProductLine(billObj);
+            //    UpdateProductLine(billObj);
-
+
-                if (billObj != null)
+            //    if (billObj != null)
-                {
+            //    {
-                    billObj.SerialNumStr = ServerHelper.ToSerialNumStr(billObj.OnlineTime, billObj.HostSN, "m100", billObj.ProductLine);
+            //        billObj.SerialNumStr = ServerHelper.ToSerialNumStr(billObj.OnlineTime, billObj.HostSN, "m100", billObj.ProductLine);
-                }
+            //    }
-
+
-
+
-                //区分门板和柱护板
+            //    //区分门板和柱护板
-                errorHeader = "格式转换-区分门板和柱护板";
+            //    errorHeader = "格式转换-区分门板和柱护板";
-                DifferenceMenBan_ZhuHuBan(billObj);
+            //    DifferenceMenBan_ZhuHuBan(billObj);
-
+
-                //KNR前缀加两位年、预批量
+            //    //KNR前缀加两位年、预批量
-                errorHeader = "格式转换-KNR前缀加两位年、预批量";
+            //    errorHeader = "格式转换-KNR前缀加两位年、预批量";
-                UpdatePrebatch(billObj);
+            //    UpdatePrebatch(billObj);
-                #endregion
+            //    #endregion
-
+
-                #region BOM匹配
+            //    #region BOM匹配
-                errorHeader = "BOM匹配";
+            //    errorHeader = "BOM匹配";
-                var resu = _m100CheckDomainService.DoCheckM100Bill(fileName, billObj);
+            //    var resu = _m100CheckDomainService.DoCheckM100Bill(fileName, billObj);
-                if (resu.Status == false)
+            //    if (resu.Status == false)
-                {
+            //    {
-                    throw new Exception(resu.Message);
+            //        throw new Exception(resu.Message);
-                }
+            //    }
-                #endregion
+            //    #endregion
-            }
+            //}
-            catch (Exception ex)
+            //catch (Exception ex)
-            {
+            //{
-                throw new Exception($"调用ParseOneEdiFile方法时报错-[{fileName}-{billObj?.VIN}-{errorHeader}]：" + ex.Message);
+            //    throw new Exception($"调用ParseOneEdiFile方法时报错-[{fileName}-{billObj?.VIN}-{errorHeader}]：" + ex.Message);
-            }
+            //}
         }
 
         #endregion

Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec

@@ -5,7 +5,7 @@
     <version>2.0.0</version>
     <authors>Win.Sfs.Shared</authors>
     <description>Package Description</description>
-    <repository type="git" commit="2092a38cbb13c5193009595ba12aecd716ddc879" />
+    <repository type="git" commit="32f3c7c4f91a6e47f64ef11cb91719a67226370a" />
     <dependencies>
       <group targetFramework="net5.0">
         <dependency id="Win.Utils" version="2.0.0" exclude="Build,Analyzers" />

Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Win.Sfs.Shared")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+2092a38cbb13c5193009595ba12aecd716ddc879")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+32f3c7c4f91a6e47f64ef11cb91719a67226370a")]
 [assembly: System.Reflection.AssemblyProductAttribute("Win.Sfs.Shared")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Win.Sfs.Shared")]
 [assembly: System.Reflection.AssemblyVersionAttribute("2.0.0.0")]

Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.AssemblyInfoInputs.cache

@@ -1 +1 @@
-6d2fe8ec5bc907c024a5ddabfd324b4824f304459352f78a7d89e3d9cfbe6252
+a40819ce8066d3478da910d1582b68a0b9e81b931d4dc46fb251c28adc396dd7

Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec

@@ -5,7 +5,7 @@
     <version>2.0.0</version>
     <authors>Win.Utils</authors>
     <description>Package Description</description>
-    <repository type="git" commit="2092a38cbb13c5193009595ba12aecd716ddc879" />
+    <repository type="git" commit="32f3c7c4f91a6e47f64ef11cb91719a67226370a" />
     <dependencies>
       <group targetFramework="net5.0">
         <dependency id="NPOI" version="2.5.2" exclude="Build,Analyzers" />

Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Win.Utils")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+2092a38cbb13c5193009595ba12aecd716ddc879")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+32f3c7c4f91a6e47f64ef11cb91719a67226370a")]
 [assembly: System.Reflection.AssemblyProductAttribute("Win.Utils")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Win.Utils")]
 [assembly: System.Reflection.AssemblyVersionAttribute("2.0.0.0")]

Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfoInputs.cache

@@ -1 +1 @@
-a97332eadfccd04ca5a3d2e104ed3aa27eb952b00af14d48bb16c021e7e8e0e6
+b809d5ff0b4e2ed0d2cfb967cbf1ed268b666995e296a8a123408bdd3804a21c