From c3eb35bfd2f1e00289820348c2d01b521ab22e82 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Fri, 30 Aug 2024 17:33:06 +0800 Subject: [PATCH] bug --- .../Tnb.ProductionMgr.Entities/Entity/PrdReport.cs | 4 ++-- ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs | 13 +++++++++++-- .../Tnb.WarehouseMgr/WmsPrdInstockHService.cs | 10 +++++----- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs index 3500a358..7f12b6ba 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs @@ -161,11 +161,11 @@ public partial class PrdReport : BaseEntity public string check_result { get; set; } /// - /// 表头主键 + /// 生产报告表头主键 /// public string erp_pk_wr { get; set; } /// - /// 表体主键 + /// 生产报告表体主键 /// public string erp_pk_wr_product { get; set; } diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 83ebe8fc..48d2a743 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -2452,18 +2452,25 @@ namespace Tnb.ProductionMgr { throw Oops.Bah(result2.msg !=null ? result2.msg : "生产入库接口报错"); } + List unitDatas = await db.Queryable() + .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) + .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode==report.unit_id) + .Select((x, y) => y) + .ToListAsync(); List erpExtendIds = new List(); erpExtendIds.Add(_userManager.UserId); erpExtendIds.Add(WmsWareHouseConst.AdministratorOrgId); erpExtendIds.Add(report.material_id); erpExtendIds.Add(report.unit_id); + erpExtendIds.AddRange(unitDatas.Select(x => x.Id).ToList()); List erpExtendFields = await _db.Queryable().Where(x=>erpExtendIds.Contains(x.table_id)).ToListAsync(); string erpCreateId = erpExtendFields.Find(x=>x.table_id==_userManager.UserId)?.user_id ?? ""; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + List> requestData = new List>(); Dictionary erpRequestData = new Dictionary(); erpRequestData.Add("auditer",erpCreateId); @@ -2495,8 +2502,10 @@ namespace Tnb.ProductionMgr ["cbmaterialvid"] = erpExtendFields.Find(x=>x.table_id==report.material_id)?.cmaterialvid ?? "", ["cbmobid"] = prdMo.erp_line_pk, ["cbmoid"] = prdMo.erp_mo_pk, - ["cbunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", - ["cbastunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", + // ["cbunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", + // ["cbastunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", + ["cbunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == report.unit_id)?.Id ?? ""))?.cunitid ?? "", + ["cbastunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == report.unit_id)?.Id ?? ""))?.cunitid ?? "", ["nbplanwrnum"] = report.reported_qty, ["nbwrnum"] = report.reported_qty, ["tbendtime"] = nowStr, diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs index 9303fbf3..ebfe6278 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs @@ -347,8 +347,8 @@ namespace Tnb.WarehouseMgr WmsPrdInstockD wmsPrdInstockD = await _db.Queryable().SingleAsync(x=>x.id==input.requireId); WmsPrdInstockH instock = await _db.Queryable().SingleAsync(x=>x.id==wmsPrdInstockD.prd_instock_id); - BasWarehouse scWarehouse = await _db.Queryable().SingleAsync(x=>x.id==wmsPrdInstockD.scwarehouse_id); - BasWarehouse kcWarehouse = await _db.Queryable().SingleAsync(x=>x.id==wmsPrdInstockD.warehouse_id); + // BasWarehouse scWarehouse = await _db.Queryable().SingleAsync(x=>x.id==wmsPrdInstockD.scwarehouse_id); + // BasWarehouse kcWarehouse = await _db.Queryable().SingleAsync(x=>x.id==wmsPrdInstockD.warehouse_id); PrdReport prdReport = await _db.Queryable().SingleAsync(x => x.id == instock.prd_report_id); List allInstockDetails = await _db.Queryable().Where(it => it.prd_instock_id == instock.id).ToListAsync(); @@ -386,8 +386,8 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("creationtime", nowStr); erpRequestData.Add("creator", erpCreateId); erpRequestData.Add("ctrantypeid", "0001H11000000000D30X");//先写死 - erpRequestData.Add("cprowarehouseid", erpWarehouserelaHs.Find(x=>x.wms_warehousecode==scWarehouse.whcode)?.erp_warehouseid ?? "");//先写死 - erpRequestData.Add("cwarehouseid", erpWarehouserelaHs.Find(x=>x.wms_warehousecode==kcWarehouse.whcode)?.erp_warehouseid ?? "");//先写死 + erpRequestData.Add("cprowarehouseid", wmsPrdInstockD.scwarehouse_id); + erpRequestData.Add("cwarehouseid", wmsPrdInstockD.warehouse_id);//先写死 erpRequestData.Add("cwhsmanagerid", null); erpRequestData.Add("dbilldate", nowStr); erpRequestData.Add("dmakedate", nowStr); @@ -407,7 +407,7 @@ namespace Tnb.WarehouseMgr erpRequestDataDetails.Add(new Dictionary() { ["cbodytranstypecode"] = "46-01", - ["cbodywarehouseid"] = erpWarehouserelaHs.Find(x=>x.wms_warehousecode==kcWarehouse.whcode)?.erp_warehouseid ?? "", + ["cbodywarehouseid"] = wmsPrdInstockD.warehouse_id, ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == instock.material_id)?.cmaterialoid ?? "", ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == instock.material_id)?.cmaterialvid ?? "", ["corpoid"] = erpOrg.corpoid,