From 0e9655786c0bed174a463f536cbddec8b0a8130a Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Wed, 12 Feb 2025 08:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=5FproviderCode2=20=3D=20"100?= =?UTF-8?q?053";=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MenBanReports/MenBanPackingRecDto.cs | 5 ++ .../WY.NewJit.Application.Contracts.xml | 5 ++ .../PrintTable/WaitPrintAppService.cs | 87 ++++++++----------- .../PrintTable/WaitPrintAppService_ZHB.cs | 2 +- .../WY.NewJit.Application.xml | 10 +++ .../PaiGe/MenBanReports/MenBanPackingRec.cs | 5 ++ 6 files changed, 61 insertions(+), 53 deletions(-) diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/MenBanReports/MenBanPackingRecDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/MenBanReports/MenBanPackingRecDto.cs index 98deb0b..c427982 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/MenBanReports/MenBanPackingRecDto.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Extends/MenBanReports/MenBanPackingRecDto.cs @@ -41,6 +41,11 @@ namespace WY.NewJit.Extends /// public virtual string VehicleModel_DoorPlankCode { get; set; } + /// + /// 车型门板代码(后门) + /// + public virtual string VehicleModel_DoorPlankCode2 { get; set; } + /// /// 上箱位号 /// diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml index 5038af0..6d70b10 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml @@ -714,6 +714,11 @@ 车型门板代码 门板代号：是零件关键件，从汇总excel中取 + + + 车型门板代码(后门) + + 上箱位号 diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs index ebc41c6..df03c34 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs @@ -43,7 +43,15 @@ namespace WY.NewJit.PrintTable } } - private const string _providerCode = "LAJ46"; //0709FAW-VW7XH + /// + /// 红旗主机厂给派格命的名 + /// + private const string _providerCode = "LAJ46"; //0709FAW-VW7XH + + /// + /// 派格给红旗主机厂命的名，用于传给WMS + /// + private const string _providerCode2 = "100053"; /// /// 柱护板缓存列表（打印柱护板时用到） @@ -446,8 +454,8 @@ namespace WY.NewJit.PrintTable posNum++; promMsg = ""; //取物料信息 - MaterialExt leftObj = null; - MaterialExt rightObj = null; + MaterialExt backObj = null; + MaterialExt frontObj = null; if (billObj.AssemblyID != null) { //取单据包含的ERP总成列表 @@ -468,21 +476,21 @@ namespace WY.NewJit.PrintTable if (curPageLst[0].VehicleModelCode == "C8") { //C8 分为左前、右后 一组 右前、左后 一组，以前门为主，前门是右， 单子是右 - if (rightOrLeft == "右") - { - rightObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains("右前")); - leftObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains("左后")); - } - else //左 - { - rightObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains("左前")); - leftObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains("右后")); - } + //if (rightOrLeft == "右") + //{ + // frontObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains("右前")); + // backObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains("左后")); + //} + //else //左 + //{ + // frontObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains("左前")); + // backObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains("右后")); + //} } else { - leftObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains(rightOrLeft + "后")); - rightObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains(rightOrLeft + "前")); + backObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains(rightOrLeft + "后")); + frontObj = materialExtLst.FirstOrDefault(itm => itm.MaterialDescription.Contains(rightOrLeft + "前")); } } @@ -495,11 +503,11 @@ namespace WY.NewJit.PrintTable mbRec.HostSN = billObj.HostSN.ToString(); //大众顺序号 mbRec.HostSN2 = billObj.HostSN2; mbRec.TopBoxPositionNum = posNum.ToString().PadLeft(2, '0'); //上箱位号 - if (leftObj != null) //右后 + if (frontObj != null) //上前 { - mbRec.VehicleModel_DoorPlankCode = leftObj.MaterialMemo; //车型门板代码 - mbRec.TopSAPMaterialNum = leftObj.MaterialNum; //上箱位 SAP物料号 - mbRec.TopMaterialDescription = leftObj.MaterialDescription2.IsNullOrEmpty() ? leftObj.MaterialDescription : leftObj.MaterialDescription2; //上箱位 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲） + mbRec.VehicleModel_DoorPlankCode = frontObj.MaterialMemo; //车型门板代码 + mbRec.TopSAPMaterialNum = frontObj.MaterialNum; //上箱位 SAP物料号 + mbRec.TopMaterialDescription = frontObj.MaterialDescription2.IsNullOrEmpty() ? frontObj.MaterialDescription : frontObj.MaterialDescription2; //上箱位 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲） } else { @@ -517,16 +525,17 @@ namespace WY.NewJit.PrintTable } } - if (rightObj != null) //右前 + if (backObj != null) //下后 { - mbRec.BelowSAPMaterialNum = rightObj.MaterialNum; //下箱位 SAP物料号 - mbRec.BelowMaterialDescription = rightObj.MaterialDescription2.IsNullOrEmpty() ? rightObj.MaterialDescription : rightObj.MaterialDescription2; //下箱位 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲） + mbRec.VehicleModel_DoorPlankCode2 = backObj.MaterialMemo; //车型门板代码 + mbRec.BelowSAPMaterialNum = backObj.MaterialNum; //下箱位 SAP物料号 + mbRec.BelowMaterialDescription = backObj.MaterialDescription2.IsNullOrEmpty() ? backObj.MaterialDescription : backObj.MaterialDescription2; //下箱位 物料描述（大小量纲、物料描述字段值同时存在时，优先显示大小量纲） } else { if (billObj.VIN == null) { - mbRec.TopMaterialDescription += "*断号*"; + mbRec.BelowMaterialDescription += "*断号*"; } else if (billObj.AssemblyID == null) { @@ -608,7 +617,7 @@ namespace WY.NewJit.PrintTable targetMain.BillTime = sourceObj.PrintDate; //单据时间 targetMain.OperName = sourceObj.CreatorId.ToString(); //操作员 targetMain.DetailQty = 0; //明细数量 - targetMain.CustId = _providerCode; //供应商编号 + targetMain.CustId = _providerCode2; //供应商编号 //targetMain.ProjectId = sourceObj.PartType == null ? null : sourceObj.PartType.Replace(" DP", ""); //添加车型 //targetMain.DockCode = sourceObj.BillLocation; @@ -626,7 +635,7 @@ namespace WY.NewJit.PrintTable idx2++; if (sourceRec.TopSAPMaterialNum.IsNullOrEmpty() == false) { - var materialObj = _materialExtRepository.FirstOrDefault(itm => itm.MaterialNum == sourceRec.TopSAPMaterialNum && itm.MaterialType == "1"); + var materialObj = _materialExtRepository.FirstOrDefault(itm => itm.MaterialNum == sourceRec.TopSAPMaterialNum ); //&& itm.MaterialType == "1" idx++; FisTS_SORT_DETAIL targetDetail = new FisTS_SORT_DETAIL(); targetDetail.BillNum = sourceObj.BillNum; //单据编号 通过该字段和主表弱连接 @@ -650,7 +659,7 @@ namespace WY.NewJit.PrintTable } if (sourceRec.BelowSAPMaterialNum.IsNullOrEmpty() == false) { - var materialObj = _materialExtRepository.FirstOrDefault(itm => itm.MaterialNum == sourceRec.BelowSAPMaterialNum && itm.MaterialType == "1"); + var materialObj = _materialExtRepository.FirstOrDefault(itm => itm.MaterialNum == sourceRec.BelowSAPMaterialNum); // && itm.MaterialType == "1" idx++; FisTS_SORT_DETAIL targetDetail = new FisTS_SORT_DETAIL(); @@ -1141,32 +1150,6 @@ namespace WY.NewJit.PrintTable continue; reportMainObj.Details = recLst.OrderBy(itm => itm.HostSN2).ToList(); - //bool has1999 = recLst.Any(itm => itm.HostSN.Contains("1999") || itm.HostSN.Contains("1998") || itm.HostSN.Contains("1997") - // || itm.HostSN.Contains("1996") || itm.HostSN.Contains("1995") || itm.HostSN.Contains("1994") - // || itm.HostSN.Contains("1993") || itm.HostSN.Contains("1992") || itm.HostSN.Contains("1991") - // || itm.HostSN.Contains("1990") || itm.HostSN.Contains("1989") || itm.HostSN.Contains("1988") - // || itm.HostSN.Contains("1987") || itm.HostSN.Contains("1986") || itm.HostSN.Contains("1985") - // || itm.HostSN.Contains("1984") || itm.HostSN.Contains("1983") || itm.HostSN.Contains("1982") - // || itm.HostSN.Contains("1981") || itm.HostSN.Contains("1980") || itm.HostSN.Contains("1979") - // || itm.HostSN.Contains("1978") || itm.HostSN.Contains("1977") || itm.HostSN.Contains("1976") - // ); - //bool has0001 = recLst.Any(itm => itm.HostSN.Contains("0001") || itm.HostSN.Contains("0002") || itm.HostSN.Contains("0003") - // || itm.HostSN.Contains("0004") || itm.HostSN.Contains("0005") || itm.HostSN.Contains("0006") - // || itm.HostSN.Contains("0007") || itm.HostSN.Contains("0008") || itm.HostSN.Contains("0009") - // || itm.HostSN.Contains("0010") || itm.HostSN.Contains("0011") || itm.HostSN.Contains("0012") - // || itm.HostSN.Contains("0013") || itm.HostSN.Contains("0014") || itm.HostSN.Contains("0015") - // || itm.HostSN.Contains("0016") || itm.HostSN.Contains("0017") || itm.HostSN.Contains("0018") - // || itm.HostSN.Contains("0019") || itm.HostSN.Contains("0020") || itm.HostSN.Contains("0021") - // || itm.HostSN.Contains("0022") || itm.HostSN.Contains("0023") || itm.HostSN.Contains("0024") - // ); - //if (has1999 && has0001) - //{ - // reportMainObj.Details = recLst.OrderBy(itm => (itm.HostSN.TryToIntZero() % 10000) < 240 ? (itm.HostSN.TryToIntZero() % 10000 + 1999) : (itm.HostSN.TryToIntZero() % 10000)).ToList(); - //} - //else - //{ - // reportMainObj.Details = recLst.OrderBy(itm => itm.HostSN).ToList(); - //} } #region 格式转换 diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs index c13ab25..fc5b2c1 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs @@ -610,7 +610,7 @@ namespace WY.NewJit.PrintTable targetMain.BillTime = sourceObj.PrintDate; //单据时间 targetMain.OperName = sourceObj.CreatorId.ToString(); //操作员 targetMain.DetailQty = 0; //明细数量 - targetMain.CustId = _providerCode; //供应商编号 + targetMain.CustId = _providerCode2; //供应商编号 //targetMain.ProjectId = sourceObj.PartType == null ? null : sourceObj.PartType.Replace(" DP", ""); //添加车型 targetMain.GateName = sourceObj.BillSerialNum; //顺序号 diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml index fb60a60..3d76aab 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml @@ -2120,6 +2120,16 @@ 错误信息前缀 + + + 红旗主机厂给派格命的名 + + + + + 派格给红旗主机厂命的名，用于传给WMS + + 柱护板缓存列表（打印柱护板时用到） diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/Extends/PaiGe/MenBanReports/MenBanPackingRec.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/Extends/PaiGe/MenBanReports/MenBanPackingRec.cs index fddd088..b40476b 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/Extends/PaiGe/MenBanReports/MenBanPackingRec.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/Extends/PaiGe/MenBanReports/MenBanPackingRec.cs @@ -33,6 +33,11 @@ namespace WY.NewJit.Extends /// public virtual string VehicleModel_DoorPlankCode { get; set; } + /// + /// 车型门板代码(后门) + /// + public virtual string VehicleModel_DoorPlankCode2 { get; set; } + /// /// 上箱位号 ///