完成打印服务

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/MenBanReports/MenBanPackingListDto.cs

@@ -30,7 +30,7 @@ namespace WY.NewJit.Extends
         /// <summary>
         /// 左或右
         /// </summary>
-        public string BillLocation { get; set; }
+        public string VehicleModel { get; set; }
 
 
         /// <summary>

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/MenBanReports/MenBanPackingRecDto.cs

@@ -15,6 +15,9 @@ namespace WY.NewJit.Extends
     /// </summary>
     public class MenBanPackingRecDto
     {
+
+        public Guid M100BillId { get; set; }
+
         /// <summary>
         /// 装箱单号（对应主表)
         /// </summary>
@@ -39,49 +42,40 @@ namespace WY.NewJit.Extends
         /// <summary>
         /// 车型门板代码 门板代号：是零件关键件，从汇总excel中取
         /// </summary>
-        public virtual string VehicleModel_DoorPlankCode { get; set; }
+        public virtual string PartCode1 { get; set; }
 
-        /// <summary>
-        /// 上箱位号
-        /// </summary>
-        public virtual string TopBoxPositionNum { get; set; }
 
         /// <summary>
         /// 上箱位 SAP物料号
         /// </summary>
-        public string TopSAPMaterialNum { get; set; }
+        public string PartCode2 { get; set; }
 
         /// <summary>
         /// 上箱位 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲）
         /// </summary>
-        public string TopMaterialDescription { get; set; }
-
-
-
-        /// <summary>
-        /// 下箱位号
-        /// </summary>
-        //public virtual string BelowBoxPositionNum { get; set; }
+        public string PartCode3 { get; set; }
 
         /// <summary>
         /// 下箱位 SAP物料号
         /// </summary>
-        public string BelowSAPMaterialNum { get; set; }
+        public string PartCode4 { get; set; }
 
         /// <summary>
         /// 下箱位 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲）
         /// </summary>
-        public string BelowMaterialDescription { get; set; }
+        public string PartCode5 { get; set; }
 
         /// <summary>
         /// 用于报表排序
         /// </summary>
-        public int sn { get; set; }
+        //public int sn { get; set; }
 
-        public Guid M100BillId { get; set; }
+        /// <summary>
+        /// 上箱位号
+        /// </summary>
+        public virtual string SN { get; set; }
 
 
-       
 
 
     }

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Interfaces/IBillM100AppService.cs

@@ -81,21 +81,21 @@ namespace WY.NewJit.MsgCheck
         /// </summary>
         /// <param name="input"></param>
         /// <returns>断号时Item不为空</returns>
-        Task<ListResultDto<string>> CheckZHBHostSNBreakNum(ZhuHuBanPrintInputDto input);
+        //Task<ListResultDto<string>> CheckZHBHostSNBreakNum(ZhuHuBanPrintInputDto input);
 
         /// <summary>
         /// 打印门板装箱单
         /// </summary>
         /// <param name="input"></param>
         /// <returns>执行成功返回真</returns>
-        Task<ObjectResultDto<MenBanPrintResultDto>> PrintMenBanPackingList(MenBanPrintInputDto input);
+        //Task<ObjectResultDto<MenBanPrintResultDto>> PrintMenBanPackingList(MenBanPrintInputDto input);
 
         /// <summary>
         /// 打印柱护板装箱单
         /// </summary>
         /// <param name="input"></param>
         /// <returns>执行成功返回真</returns>
-        Task<ObjectResultDto<ZhuHuBanPrintResultDto>> PrintZhuHuBanPackingList(ZhuHuBanPrintInputDto input);
+        //Task<ObjectResultDto<ZhuHuBanPrintResultDto>> PrintZhuHuBanPackingList(ZhuHuBanPrintInputDto input);
 
 
         #endregion
@@ -107,7 +107,7 @@ namespace WY.NewJit.MsgCheck
         /// <returns>生产线超时情况</returns>
         Task<ListResultDto<TimeOutRemindResultDto>> ProductLineTimeoutRemind(TimeOutRemindInputDto input);
 
-        Task<PagedResultDto<ResultBillM100Dto>> GetReplenishPrintListAsync(QueryBillM100Dto input);
+        //Task<PagedResultDto<ResultBillM100Dto>> GetReplenishPrintListAsync(QueryBillM100Dto input);
 
 
 

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml

@@ -19,7 +19,7 @@
             
             </summary>
         </member>
-        <member name="P:WY.NewJit.Extends.MenBanPackingListDto.BillLocation">
+        <member name="P:WY.NewJit.Extends.MenBanPackingListDto.VehicleModel">
             <summary>
             左或右
             </summary>
@@ -149,39 +149,34 @@
             大众顺序号
             </summary>
         </member>
-        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.VehicleModel_DoorPlankCode">
+        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.PartCode1">
             <summary>
             车型门板代码 门板代号：是零件关键件，从汇总excel中取
             </summary>
         </member>
-        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.TopBoxPositionNum">
-            <summary>
-            上箱位号
-            </summary>
-        </member>
-        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.TopSAPMaterialNum">
+        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.PartCode2">
             <summary>
             上箱位 SAP物料号
             </summary>
         </member>
-        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.TopMaterialDescription">
+        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.PartCode3">
             <summary>
             上箱位 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲）
             </summary>
         </member>
-        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.BelowSAPMaterialNum">
+        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.PartCode4">
             <summary>
             下箱位 SAP物料号
             </summary>
         </member>
-        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.BelowMaterialDescription">
+        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.PartCode5">
             <summary>
             下箱位 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲）
             </summary>
         </member>
-        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.sn">
+        <member name="P:WY.NewJit.Extends.MenBanPackingRecDto.SN">
             <summary>
-            用于报表排序
+            上箱位号
             </summary>
         </member>
         <member name="P:WY.NewJit.Extends.MenBanPrintInputDto.PrintType">
@@ -1929,27 +1924,6 @@
             <param name="input"></param>
             <returns>断号时Item不为空</returns>
         </member>
-        <member name="M:WY.NewJit.MsgCheck.IBillM100AppService.CheckZHBHostSNBreakNum(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
-            <summary>
-            打印前检查柱护板大众顺序号是否断号
-            </summary>
-            <param name="input"></param>
-            <returns>断号时Item不为空</returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.IBillM100AppService.PrintMenBanPackingList(WY.NewJit.Extends.MenBanPrintInputDto)">
-            <summary>
-            打印门板装箱单
-            </summary>
-            <param name="input"></param>
-            <returns>执行成功返回真</returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.IBillM100AppService.PrintZhuHuBanPackingList(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
-            <summary>
-            打印柱护板装箱单
-            </summary>
-            <param name="input"></param>
-            <returns>执行成功返回真</returns>
-        </member>
         <member name="M:WY.NewJit.MsgCheck.IBillM100AppService.ProductLineTimeoutRemind(WY.NewJit.MsgCheck.TimeOutRemindInputDto)">
             <summary>
             生产线超时提醒

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml

@@ -988,7 +988,7 @@
             柱护板缓存列表（打印柱护板时用到）
             </summary>
         </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.#ctor(Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgCheck.BillM100,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgCheck.BillM100Part,System.Guid},Microsoft.Extensions.Logging.ILogger{WY.NewJit.MsgCheck.BillM100AppService},WY.NewJit.EntityFrameworkCore.NewJitDapperRepository,Volo.Abp.BlobStoring.IBlobContainer{WY.NewJit.Common.OurFileContainer},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.MenBanPackingList,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.ZhuHuBanPackingList,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgBaseData.AssemblyCfgErp,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgBaseData.AssemblyCfgVehicle,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgBaseData.PartCfg,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.PaiGe.MaterialExt,System.Guid},WY.NewJit.EntityFrameworkCore.WMSDapperRepository,Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.MenBanPackingRec,System.Guid},WY.NewJit.MsgBaseData.LineSNDomianService,Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.ZhuHuBanPackingRec,System.Guid},WY.NewJit.Commons.SequenceDomainService,Microsoft.Extensions.Configuration.IConfiguration,Volo.Abp.Uow.IUnitOfWorkManager,Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.PaiGe.WMS.FisTB_BILL},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.PaiGe.WMS.FisTS_SORT_DETAIL},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.PaiGe.WMS.FisTB_BILL_HIS},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.PaiGe.WMS.FisTS_SORT_DETAIL_HIS},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgBaseData.PrintTemplateConfiguration,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgCheck.ZHBPrintStatus,System.Guid})">
+        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.#ctor(Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgCheck.BillM100,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgCheck.BillM100Part,System.Guid},Microsoft.Extensions.Logging.ILogger{WY.NewJit.MsgCheck.BillM100AppService},WY.NewJit.EntityFrameworkCore.NewJitDapperRepository,Volo.Abp.BlobStoring.IBlobContainer{WY.NewJit.Common.OurFileContainer},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.MenBanPackingList,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.ZhuHuBanPackingList,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgBaseData.AssemblyCfgErp,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgBaseData.AssemblyCfgVehicle,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgBaseData.PartCfg,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.PaiGe.MaterialExt,System.Guid},WY.NewJit.EntityFrameworkCore.WMSDapperRepository,Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.MenBanPackingRec,System.Guid},WY.NewJit.MsgBaseData.LineSNDomianService,Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.ZhuHuBanPackingRec,System.Guid},WY.NewJit.Commons.SequenceDomainService,Microsoft.Extensions.Configuration.IConfiguration,Volo.Abp.Uow.IUnitOfWorkManager,Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.PaiGe.WMS.FisTB_BILL},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.PaiGe.WMS.FisTS_SORT_DETAIL},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.PaiGe.WMS.FisTB_BILL_HIS},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.Extends.PaiGe.WMS.FisTS_SORT_DETAIL_HIS},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgBaseData.PrintTemplateConfiguration,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgCheck.ZHBPrintStatus,System.Guid},Volo.Abp.Domain.Repositories.IRepository{WY.NewJit.MsgBaseData.DicItem})">
             <summary>
             构造函数
             </summary>
@@ -1001,17 +1001,17 @@
             <param name="page"></param>
             <returns></returns>
         </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.QueryByConditionAsync(WY.NewJit.MsgCheck.QueryBillM100Dto,WY.NewJit.Common.PagedAndSortedBase)">
+        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetMenBanLastPrintNum(WY.NewJit.Extends.MenBanPrintInputDto)">
             <summary>
-            根据筛选条件获取实体列表
+            从M100中取当前产线、已经打印的最大大众顺序号
             </summary>
+            <param name="input"></param>
+            <returns></returns>
         </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetErpAssemblyListByBill(System.Guid)">
+        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.QueryByConditionAsync(WY.NewJit.MsgCheck.QueryBillM100Dto,WY.NewJit.Common.PagedAndSortedBase)">
             <summary>
-            取单据包含的ERP总成列表
+            根据筛选条件获取实体列表
             </summary>
-            <param name="vehicleAssemblyId"></param>
-            <returns></returns>
         </member>
         <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetMBReportDetailList(WY.NewJit.Extends.MenBanPrintInputDto,System.Boolean)">
             <summary>
@@ -1031,115 +1031,17 @@
             <param name="billLst"></param>
             <returns></returns>
         </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetBillNum(System.Int64)">
-            <summary>
-            取新的装箱单号
-            </summary>
-            <param name="newSN">加1后的序号</param>
-            <returns></returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.DoMBPrint(WY.NewJit.Extends.MenBanPrintInputDto,System.Int32,System.Double@,System.Double,System.DateTime,System.Collections.Generic.List{WY.NewJit.MsgCheck.BillM100},System.String)">
+        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.DoMBPrint(WY.NewJit.Extends.MenBanPrintInputDto,System.Int32,System.Double,System.Collections.Generic.List{WY.NewJit.MsgCheck.BillM100},System.String,System.String[])">
             <summary>
             打印左侧或右侧门板
             </summary>
             <param name="input"></param>
-            <param name="pageCnt"></param>
+            <param name="pageIdx"></param>
             <param name="maxBillNum"></param>
             <param name="maxSN"></param>
             <param name="printTime"></param>
             <param name="billLst"></param>
-            <param name="rightOrLeft"></param>
-            <returns></returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetTopBoxPositionNumPrefix(System.String)">
-            <summary>
-            上箱位号加前缀
-            KNR前4位 大于等于 2402的 属于新发货状态， 不加前缀；
-            小于 2402的 属于老发货状态， 加前缀
-            </summary>
-            <param name="knr"></param>
-            <param name="curTime"></param>
-            <returns></returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.CallWMSInterface_MB(System.Collections.Generic.List{WY.NewJit.Extends.MenBanPackingList})">
-            <summary>
-            打印门板装箱单时调用库存系统接口
-            </summary>
-            <param name="input"></param>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetZHBReportDetailList(WY.NewJit.Extends.ZhuHuBanPrintInputDto,System.Boolean)">
-            <summary>
-            根据条件取用于打印的柱护板单据列表
-            </summary>
-            <param name="input"></param>
-            <param name="isFillBreakNum"></param>
-            <returns></returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.DoZHBPrint_3x8_LRMerge(System.String,WY.NewJit.Extends.ZhuHuBanPrintInputDto,System.Int64,System.Double,System.DateTime,System.Collections.Generic.List{WY.NewJit.MsgCheck.BillM100},System.String)">
-            <summary>
-            打印柱护板（3*8 左右合并成一个单元格）A上C上
-            </summary>
-            <param name="zhbPartType"></param>
-            <param name="input"></param>
-            <param name="maxBillNum"></param>
-            <param name="maxSN"></param>
-            <param name="printTime"></param>
-            <param name="billLst"></param>
-            <param name="rightOrLeft"></param>
-            <returns></returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.DoZHBPrint_3x8_LR(System.String,WY.NewJit.Extends.ZhuHuBanPrintInputDto,System.Int64,System.Double,System.DateTime,System.Collections.Generic.List{WY.NewJit.MsgCheck.BillM100},System.String)">
-            <summary>
-            打印柱护板（3*8 分左右）A柱下A中
-            </summary>
-            <param name="zhbPartType"></param>
-            <param name="input"></param>
-            <param name="maxBillNum"></param>
-            <param name="maxSN"></param>
-            <param name="printTime"></param>
-            <param name="billLst"></param>
-            <param name="rightOrLeft"></param>
-            <returns></returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.DoZHBPrint_4x6_LR(System.String,WY.NewJit.Extends.ZhuHuBanPrintInputDto,System.Int64,System.Double,System.DateTime,System.Collections.Generic.List{WY.NewJit.MsgCheck.BillM100},System.String)">
-            <summary>
-            打印柱护板（4*6 分左右）B柱上；B柱下；后轮上装饰板
-            </summary>
-            <param name="zhbPartType"></param>
-            <param name="input"></param>
-            <param name="maxBillNum"></param>
-            <param name="maxSN"></param>
-            <param name="printTime"></param>
-            <param name="billLst"></param>
-            <param name="rightOrLeft"></param>
-            <returns></returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.DoZHBPrint_4x3(System.String,WY.NewJit.Extends.ZhuHuBanPrintInputDto,System.Int64,System.Double,System.DateTime,System.Collections.Generic.List{WY.NewJit.MsgCheck.BillM100},System.String)">
-            <summary>
-            打印柱护板（4*3 左右相邻）D柱
-            </summary>
-            <param name="zhbPartType"></param>
-            <param name="input"></param>
-            <param name="maxBillNum"></param>
-            <param name="maxSN"></param>
-            <param name="printTime"></param>
-            <param name="billLst"></param>
-            <param name="rightOrLeft"></param>
-            <returns></returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.CallWMSInterface_ZHB(System.Collections.Generic.List{WY.NewJit.Extends.ZhuHuBanPackingList})">
-            <summary>
-            打印柱护板装箱单时调用库存系统接口
-            </summary>
-            <param name="input"></param>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetZhuHuBanByType(System.String,System.String,WY.NewJit.MsgCheck.BillM100)">
-            <summary>
-            查找M100结算件中是否包含指定类型（如D柱）的柱护板
-            </summary>
-            <param name="p_materialType2"></param>
-            <param name="p_materialType3"></param>
-            <param name="p_billM100"></param>
+            <param name="partLargeType"></param>
             <returns></returns>
         </member>
         <member name="M:WY.NewJit.MsgCheck.BillM100AppService.CheckMBHostSNBreakNum(WY.NewJit.Extends.MenBanPrintInputDto)">
@@ -1149,14 +1051,6 @@
             <param name="input"></param>
             <returns>断号时Item不为空</returns>
         </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.CheckZHBHostSNBreakNum(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
-            <summary>
-            打印前检查大众顺序号是否断号
-            </summary>
-            <param name="input"></param>
-            <param name="isZhuHuBan">是否柱护板</param>
-            <returns>断号时Item不为空</returns>
-        </member>
         <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetPrintStartHostSN2(System.String,System.String,System.String)">
             <summary>
             根据生产线获取正常打印单据的起始大众顺序号2
@@ -1166,34 +1060,6 @@
             <param name="groupName">柱护板分组类型</param>
             <returns>起始大众顺序号</returns>
         </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.PrintMenBanPackingList(WY.NewJit.Extends.MenBanPrintInputDto)">
-            <summary>
-            打印门板装箱单
-            </summary>
-            <param name="input"></param>
-            <returns>执行成功返回真</returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.PrintZhuHuBanPackingList(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
-            <summary>
-            打印柱护板装箱单
-            </summary>
-            <param name="input"></param>
-            <returns>执行成功返回真</returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetReplenishPrintListAsync(WY.NewJit.MsgCheck.QueryBillM100Dto)">
-            <summary>
-            取门板补打列表(IsNeedReplenishPrint=true、单据状态BillStatus是未打印)
-            </summary>
-            <param name="input">输入查询条件</param>
-            <returns>返回符合条件的排序分页列表</returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetReplenishPrintZHBListAsync(WY.NewJit.MsgCheck.QueryBillM100Dto)">
-            <summary>
-            取柱护板补打列表(IsNeedReplenishPrint=true、单据状态BillStatus是未打印)
-            </summary>
-            <param name="input">输入查询条件</param>
-            <returns>返回符合条件的排序分页列表</returns>
-        </member>
         <member name="M:WY.NewJit.MsgCheck.BillM100AppService.GetListAsync(WY.NewJit.MsgCheck.QueryBillM100Dto)">
             <summary>
             根据筛选条件获取分页实体列表
@@ -1252,40 +1118,6 @@
             <param name="input">生产线编号列表</param>
             <returns>生产线超时情况</returns>
         </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.PrintGroupZhuHuBanPackingList(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
-            <summary>
-            打印柱护板装箱单
-            </summary>
-            <param name="input"></param>
-            <returns>执行成功返回真</returns>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.SaveGroupZhuHuBanReport(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
-            <summary>
-            保存柱护板装箱单报表
-            </summary>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.SaveZhuHuBanReport(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
-            <summary>
-            保存柱护板装箱单报表
-            </summary>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.LoadZhuHuBanReport(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
-            <summary>
-            加载柱护板装箱单报表【仅ReportIdList、DataResultType参数有效】
-            </summary>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.SaveMiddleTable_MB(System.Collections.Generic.List{WY.NewJit.Extends.MenBanPackingList})">
-            <summary>
-            保存门板信息到中间表，中间表是位于FIS库，和WMS中间表结构相同
-            </summary>
-            <param name="input"></param>
-        </member>
-        <member name="M:WY.NewJit.MsgCheck.BillM100AppService.SaveMiddleTable_ZHB(System.Collections.Generic.List{WY.NewJit.Extends.ZhuHuBanPackingList})">
-            <summary>
-            保存柱护板信息到中间表，中间表是位于FIS库，和WMS中间表结构相同
-            </summary>
-            <param name="input"></param>
-        </member>
         <member name="T:WY.NewJit.MsgCheck.NewM100AppService">
             <summary>
             M100单据管理应用服务实现

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

@@ -26,9 +26,9 @@ namespace WY.NewJit.Extends
         public string BillSerialNum { get; set; }
 
         /// <summary>
-        /// 左 或 右
+        /// 车型
         /// </summary>
-        public string BillLocation { get; set; }
+        public string VehicleModel { get; set; }
 
 
         /// <summary>

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

@@ -13,6 +13,8 @@ namespace WY.NewJit.Extends
     /// </summary>
     public class MenBanPackingRec : FullAuditedAggregateRoot<Guid>
     {
+        public Guid? M100BillId { get; set; }
+
         /// <summary>
         /// KNR订单号
         /// </summary>
@@ -31,42 +33,37 @@ namespace WY.NewJit.Extends
         /// <summary>
         /// 车型门板代码 门板代号：是零件关键件，从汇总excel中取
         /// </summary>
-        public virtual string VehicleModel_DoorPlankCode { get; set; }
+        public virtual string PartCode1 { get; set; }
 
-        /// <summary>
-        /// 上箱位号
-        /// </summary>
-        public virtual string TopBoxPositionNum { get; set; }
 
         /// <summary>
         /// 上箱位 SAP物料号
         /// </summary>
-        public string TopSAPMaterialNum { get; set; }
+        public string PartCode2 { get; set; }
 
         /// <summary>
         /// 上箱位 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲）
         /// </summary>
-        public string TopMaterialDescription { get; set; }
+        public string PartCode3 { get; set; }
 
 
 
-        /// <summary>
-        /// 下箱位号
-        /// </summary>
-        //public virtual string BelowBoxPositionNum { get; set; }
 
         /// <summary>
         /// 下箱位 SAP物料号
         /// </summary>
-        public string BelowSAPMaterialNum { get; set; }
+        public string PartCode4 { get; set; }
 
         /// <summary>
         /// 下箱位 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲）
         /// </summary>
-        public string BelowMaterialDescription { get; set; }
+        public string PartCode5 { get; set; }
+
+        /// <summary>
+        /// 上箱位号
+        /// </summary>
+        public virtual string SN { get; set; }
 
- 
-        public Guid? M100BillId { get; set; }
 
 
         public void SetId(Guid id)

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/DicItem.cs

@@ -28,22 +28,22 @@ namespace WY.NewJit.MsgBaseData
         public virtual string DicItemName { get; protected set; }
 
         /// <summary>
-        /// 分类1
+        /// 分类1（零件大类对应分组）
         /// </summary>
         public virtual string DicItemSort1 { get; set; }
 
         /// <summary>
-        /// 分类2
+        /// 分类2 （零件大类对应产线）
         /// </summary>
         public virtual string DicItemSort2 { get; set; }
 
         /// <summary>
-        /// 分类3
+        /// 分类3（零件大类对应车型）
         /// </summary>
         public virtual string DicItemSort3{ get; set; }
 
         /// <summary>
-        /// 分类4
+        /// 分类4（零件大类对应打印报表的三位零件大类）
         /// </summary>
         public virtual string DicItemSort4 { get; set; }
 

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

@@ -0,0 +1,83 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace WY.NewJit.Migrations
+{
+    public partial class _2025072201 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "VehicleModel_DoorPlankCode",
+                table: "FisMenBanPackingRec",
+                newName: "SN");
+
+            migrationBuilder.RenameColumn(
+                name: "TopSAPMaterialNum",
+                table: "FisMenBanPackingRec",
+                newName: "PartCode5");
+
+            migrationBuilder.RenameColumn(
+                name: "TopMaterialDescription",
+                table: "FisMenBanPackingRec",
+                newName: "PartCode4");
+
+            migrationBuilder.RenameColumn(
+                name: "TopBoxPositionNum",
+                table: "FisMenBanPackingRec",
+                newName: "PartCode3");
+
+            migrationBuilder.RenameColumn(
+                name: "BelowSAPMaterialNum",
+                table: "FisMenBanPackingRec",
+                newName: "PartCode2");
+
+            migrationBuilder.RenameColumn(
+                name: "BelowMaterialDescription",
+                table: "FisMenBanPackingRec",
+                newName: "PartCode1");
+
+            migrationBuilder.RenameColumn(
+                name: "BillLocation",
+                table: "FisMenBanPackingList",
+                newName: "VehicleModel");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "SN",
+                table: "FisMenBanPackingRec",
+                newName: "VehicleModel_DoorPlankCode");
+
+            migrationBuilder.RenameColumn(
+                name: "PartCode5",
+                table: "FisMenBanPackingRec",
+                newName: "TopSAPMaterialNum");
+
+            migrationBuilder.RenameColumn(
+                name: "PartCode4",
+                table: "FisMenBanPackingRec",
+                newName: "TopMaterialDescription");
+
+            migrationBuilder.RenameColumn(
+                name: "PartCode3",
+                table: "FisMenBanPackingRec",
+                newName: "TopBoxPositionNum");
+
+            migrationBuilder.RenameColumn(
+                name: "PartCode2",
+                table: "FisMenBanPackingRec",
+                newName: "BelowSAPMaterialNum");
+
+            migrationBuilder.RenameColumn(
+                name: "PartCode1",
+                table: "FisMenBanPackingRec",
+                newName: "BelowMaterialDescription");
+
+            migrationBuilder.RenameColumn(
+                name: "VehicleModel",
+                table: "FisMenBanPackingList",
+                newName: "BillLocation");
+        }
+    }
+}

Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/Messages/MsgTransmissionService.cs

@@ -598,11 +598,13 @@ namespace WY.NewJit.Job.ConsoleApp.Messages
                 }
                 #endregion
 
+                UpdateVehicleModel(billResObj); //更新车型
+
                 #region 更新三个零件类别，有不识别零件时直接中断程序
                 string unknowPartCode = UpdatePartLargeType(billResObj); 
                 if (unknowPartCode.HasValue()) //有不识别零件
                 {
-                    msgReceiveObj.ErrorCount = 3;
+                    msgReceiveObj.ErrorCount = 4;
                     msgReceiveObj.ErrorMessage = $"存在不识别的零件{unknowPartCode}";
                     _messageReceiveRepository.UpdateAsync(msgReceiveObj).GetAwaiter().GetResult();
 
@@ -761,11 +763,12 @@ namespace WY.NewJit.Job.ConsoleApp.Messages
             string ret = "";
             if (billResObj.R100Bill != null)
             {
+                var bill = billResObj.R100Bill;
                 var billPartLst = billResObj.R100Bill.BillR100Parts; //包含多个成品件
                 foreach (var billPart in billPartLst)
                 {
                     string partLargeType = billPart.PartCode.Substring(6, 3); //取客户零件代码的7-9位，是零件大类
-                    var partCfgObj = _partLargeTypeList.FirstOrDefault(itm => itm.LargeTypeCode == partLargeType); //是否加车型过滤//??
+                    var partCfgObj = _partLargeTypeList.FirstOrDefault(itm => itm.LargeTypeCode == partLargeType && itm.VehicleModel == bill.VehicleModelCode); //是否加车型过滤//??
                     if (partCfgObj != null)
                     {
                         billPart.PartType = partCfgObj.ProductLine;
@@ -781,11 +784,12 @@ namespace WY.NewJit.Job.ConsoleApp.Messages
             }
             else if (billResObj.M100Bill != null)
             {
+                var bill = billResObj.M100Bill;
                 var billPartLst = billResObj.M100Bill.BillM100Parts; //包含多个成品件
                 foreach (var billPart in billPartLst)
                 {
                     string partLargeType = billPart.PartCode.Substring(6, 3); //取客户零件代码的7-9位，是零件大类
-                    var partCfgObj = _partLargeTypeList.FirstOrDefault(itm => itm.LargeTypeCode == partLargeType); //是否加车型过滤//??
+                    var partCfgObj = _partLargeTypeList.FirstOrDefault(itm => itm.LargeTypeCode == partLargeType && itm.VehicleModel == bill.VehicleModelCode); //是否加车型过滤//??
                     if (partCfgObj != null)
                     {
                         billPart.PartType = partCfgObj.ProductLine;

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="32f3c7c4f91a6e47f64ef11cb91719a67226370a" />
+    <repository type="git" commit="9f1698b0f932dfc3e8d926fe272b9e5c15605da4" />
     <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+32f3c7c4f91a6e47f64ef11cb91719a67226370a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+9f1698b0f932dfc3e8d926fe272b9e5c15605da4")]
 [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 @@
-a40819ce8066d3478da910d1582b68a0b9e81b931d4dc46fb251c28adc396dd7
+d755eed168280a373eeb0870bc5023deded8bf4c7a53f8c511dbfc9601ca31ed