From b535ee7eed36724a88e2105383e8f3f20c2eb5bb Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Tue, 24 Sep 2024 11:50:35 +0800 Subject: [PATCH] BUG --- .../Dto/PrdManage/PackSechelToBeIssueListOutput.cs | 2 ++ ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs | 1 + WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs | 6 ++++++ .../Tnb.WarehouseMgr/WmsRawmatOutstockService.cs | 9 +++++++-- .../Tnb.WarehouseMgr/WmsTransferInstockService.cs | 9 +++++---- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs index 51dd742d..c502f0d0 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs @@ -113,6 +113,8 @@ /// 物料型号 /// public string? material_standard { get; set; } + + public string batch { get; set; } } } diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 3bfb29ff..966dce0f 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -484,6 +484,7 @@ namespace Tnb.ProductionMgr workline_code = c.EnCode, workline_name = c.FullName, mo_task_status = a.mo_task_status, + batch = a.batch, workstation_name = f.FullName, // worker_name = g.RealName, scheduled_qty = a.scheduled_qty, diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs index 639901b3..69fb5cc5 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs @@ -101,6 +101,12 @@ namespace Tnb.WarehouseMgr } #endregion + + //自制的采购入库 不在质检保存里调用erp接口 + if (string.IsNullOrEmpty(wmsPurchaseH.erp_bill_code)) + { + return "保存成功"; + } List wmsOutinStockDetails = await _db.Queryable() .Where(x => x.source_detail_id == wmsPurchaseD.id && x.source_type == WmsWareHouseConst.BIZTYPE_WMSINSTOCK_ID) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs index 014f8782..1fc4358f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs @@ -9,6 +9,7 @@ using JNPF.Common.Dtos.VisualDev; using JNPF.Common.Enums; using JNPF.Common.Security; using JNPF.FriendlyException; +using JNPF.Systems.Entitys.Permission; using JNPF.Systems.Entitys.System; using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; @@ -104,12 +105,14 @@ namespace Tnb.WarehouseMgr .Where((x, y) => x.EnCode == DictConst.TransactionType && wmsRawmatOutstockH.outstock_type==y.EnCode) .Select((x, y) => y) .FirstAsync(); + OrganizeEntity dept = await _db.Queryable().Where(x=>x.EnCode==wmsRawmatOutstockH.department).FirstAsync(); string supplierId = WmsWareHouseConst.TIANYIGONGYINGSHANG_ID; List tableIds = new List(); tableIds.Add(WmsWareHouseConst.AdministratorOrgId); tableIds.AddRange(materialIds); tableIds.Add(supplierId); + tableIds.Add(dept?.Id); tableIds.Add(tranTypeDataEntity?.Id); tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); @@ -129,8 +132,10 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("cdrawcalbodyoid", erpOrg.pk_org); erpRequestData.Add("cdrawcalbodyvid", erpOrg.pk_org_v); // erpRequestData.Add("cdrawwarehouseid", null); - erpRequestData.Add("cfanaceorgoid", erpOrg.pk_org); - erpRequestData.Add("cfanaceorgvid", erpOrg.pk_org_v); + erpRequestData.Add("cdptid", erpExtendFields.Find(x=>x.table_id==dept?.Id)?.cdptid ?? ""); + erpRequestData.Add("cdptvid", erpExtendFields.Find(x=>x.table_id==dept?.Id)?.cdptvid ?? ""); + erpRequestData.Add("cfanaceorgoid", erpOrg.corpoid); + erpRequestData.Add("cfanaceorgvid", erpOrg.corpvid); erpRequestData.Add("corpoid", erpOrg.corpoid); erpRequestData.Add("corpvid", erpOrg.corpvid); erpRequestData.Add("creationtime", nowStr); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs index 584843cc..6f699fdd 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs @@ -145,6 +145,7 @@ namespace Tnb.WarehouseMgr List> erpRequestDataDetails = new List>(); foreach (WmsTransferInstockD item in allInstockDetails) { + string date = wmsTransferInstockH.create_time!=null ? wmsTransferInstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : wmsTransferInstockH.bill_date!=null ? wmsTransferInstockH.bill_date.Value.ToString("yyyy-MM-dd HH:mm:ss") : DateTime.Now.ToString(); erpRequestDataDetails.Add(new Dictionary() { ["cbodytranstypecode"] = "4E-01", @@ -154,15 +155,15 @@ namespace Tnb.WarehouseMgr ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "", ["corpoid"] = erpOrg.corpoid, ["corpvid"] = erpOrg.corpvid, - ["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, + ["crowno"] = item.lineno, ["csourcebillhid"] = wmsTransferInstockH?.erp_pk ?? "", ["csourcebillbid"] = wmsTransferInstockD?.erp_line_pk ?? "", ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", - ["dbizdate"] = wmsTransferInstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"), - ["dplanarrivedate"] = wmsTransferInstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"), - ["dplanoutdate"] = wmsTransferInstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"), + ["dbizdate"] = date, + ["dplanarrivedate"] = date, + ["dplanoutdate"] = date, // ["nnum"] = item.qty, // ["nshouldnum"] = item.pr_qty, ["nnum"] = qty,