diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index fa1adb3a..c436b501 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -2500,7 +2500,7 @@ namespace Tnb.ProductionMgr .ToListAsync(); List erpExtendIds = new List(); - erpExtendIds.Add(_userManager.UserId); + erpExtendIds.Add(report.create_id); erpExtendIds.Add(WmsWareHouseConst.AdministratorOrgId); erpExtendIds.Add(report.material_id); // erpExtendIds.Add(report.unit_id); @@ -2508,7 +2508,7 @@ namespace Tnb.ProductionMgr 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 ?? ""; + string erpCreateId = erpExtendFields.Find(x => x.table_id == report.create_id)?.user_id ?? ""; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs index 3ee31125..47497814 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs @@ -132,16 +132,16 @@ namespace Tnb.WarehouseMgr string supplierId = wmsPurchaseOrderH?.supplier_id ?? ""; List tableIds = new List(); tableIds.Add(_userManager.UserId); + tableIds.Add(wmsPurchaseH.create_id); tableIds.Add(WmsWareHouseConst.AdministratorOrgId); - tableIds.Add(instock.warehouse_id); - tableIds.Add("1001A11000000002OOGU"); + tableIds.Add(instock.warehouse_id);// 1001A11000000002OOGU tableIds.AddRange(materialIds); tableIds.Add(supplierId); tableIds.Add(tranTypeId); tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); - string erpCreateId = erpExtendFields.Find(x => x.table_id == instock.create_id)?.user_id ?? ""; + string erpCreateId = erpExtendFields.Find(x => x.table_id == wmsPurchaseH.create_id)?.user_id ?? ""; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs index d748bc87..89ea6991 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs @@ -74,21 +74,22 @@ namespace Tnb.WarehouseMgr } Logger.Information($"进入原材料调拨入库单上传BIP逻辑"); - List wmsCarryCodes = await _db.Queryable().Where(r => r.carry_id == input.carryIds[0]).ToListAsync(); + WmsTempCode wmsTempCode = await _db.Queryable() + .LeftJoin((a, b) => a.barcode == b.barcode) + .Where((a, b) => a.carry_id == input.wmsDistaskH.carry_id) + .Select((a, b) => b) + .FirstAsync(); + string rawmatTransferinstockDId = wmsTempCode?.require_id ?? ""; + WmsRawmatTransferinstockD wmsRawmatTransferinstockD = await _db.Queryable().SingleAsync(x => x.id == rawmatTransferinstockDId); + List wmsCarryCodes = await _db.Queryable().Where(r => r.carry_id == input.carryIds[0]) + .Where(r => r.material_id == wmsRawmatTransferinstockD.matcode_id && r.code_batch == wmsRawmatTransferinstockD.code_batch).ToListAsync(); await _db.Updateable().SetColumns(it => new WmsRawmatTransferinstockD { actual_qty = it.actual_qty + wmsCarryCodes.Sum(r => r.codeqty) }) .Where(it => it.id == input.wmsDistaskH.source_id).ExecuteCommandHasChangeAsync(); WmsInstockH instock = await _db.Queryable().SingleAsync(x => x.id == input.requireId); List allInstockDetails = await _db.Queryable().Where(it => it.bill_id == input.requireId).ToListAsync(); - WmsTempCode wmsTempCode = await _db.Queryable() - .LeftJoin((a, b) => a.barcode == b.barcode) - .Where((a, b) => a.carry_id == input.wmsDistaskH.carry_id) - .Select((a, b) => b) - .FirstAsync(); - string rawmatTransferinstockDId = wmsTempCode?.require_id ?? ""; - WmsRawmatTransferinstockD wmsRawmatTransferinstockD = await _db.Queryable().SingleAsync(x => x.id == rawmatTransferinstockDId); string rawmatTransferinstockHId = wmsRawmatTransferinstockD?.bill_id ?? ""; WmsRawmatTransferinstockH wmsRawmatTransferinstockH = await _db.Queryable().SingleAsync(x => x.id == rawmatTransferinstockHId); @@ -116,7 +117,9 @@ namespace Tnb.WarehouseMgr tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); - string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; + // 暂时传 1001A110000000003NBJ 陈书会 + //string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; + string erpCreateId = "1001A110000000003NBJ"; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); @@ -144,8 +147,9 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("ctrantypeid", "0001H11000000000D31E");//先写死 erpRequestData.Add("vtrantypecode", "4E-01");//先写死 erpRequestData.Add("csourcebillhid", wmsRawmatTransferinstockH?.erp_pk ?? ""); - + + decimal qty = wmsCarryCodes.Sum(r => r.codeqty); List> erpRequestDataDetails = new List>(); foreach (WmsInstockD item in allInstockDetails) { @@ -169,8 +173,8 @@ namespace Tnb.WarehouseMgr ["dplanoutdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"), // ["nnum"] = item.qty, // ["nshouldnum"] = item.pr_qty, - ["nnum"] = wmsRawmatTransferinstockD.actual_qty, - ["nshouldnum"] = wmsRawmatTransferinstockD.actual_qty, + ["nnum"] = qty, + ["nshouldnum"] = qty, ["pk_group"] = erpOrg.pk_group, ["pk_org"] = erpOrg.pk_org, ["pk_org_v"] = erpOrg.pk_org_v,