From 3d07942f321e23a347585829b7005f407567c561 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 15 Jul 2024 17:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WareHouseService.cs | 83 +++++++++++++++++++ .../WmsMaterialTransferService.cs | 7 +- 2 files changed, 86 insertions(+), 4 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index df6ad2ec..5c2b5ca4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -18,6 +18,7 @@ using JNPF.Common.Extension; using JNPF.Common.Manager; using JNPF.Common.Security; using JNPF.FriendlyException; +using JNPF.Systems.Entitys.System; using JNPF.Systems.Interfaces.System; using JNPF.VisualDev.Entitys; using JNPF.VisualDev.Interfaces; @@ -40,6 +41,7 @@ using Tnb.Common.Extension; using Tnb.Common.Redis; using Tnb.Common.Utils; using Tnb.ProductionMgr.Entities; +using Tnb.ProductionMgr.Entities.Entity; using Tnb.QcMgr.Entities; using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities.Configs; @@ -52,6 +54,7 @@ using Tnb.WarehouseMgr.Entities.Entity; using Tnb.WarehouseMgr.Entities.Enums; using Tnb.WarehouseMgr.Interfaces; using static NPOI.HSSF.Util.HSSFColor; +using Tnb.BasicData; namespace Tnb.WarehouseMgr { @@ -2342,6 +2345,86 @@ namespace Tnb.WarehouseMgr // require_code是任务单 //string mo_task_code = dt.require_code; } + else if (dt.biz_type == "erp_qtrk") + { + WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable().SingleAsync(x=>x.id==dt.source_id); + List wmsMaterialTransferDs = await _db.Queryable().Where(x=>x.bill_id==dt.source_id).ToListAsync(); + List materialIds = wmsMaterialTransferDs.Select(x=>x.material_id).Distinct().ToList(); + List unitCodes = wmsMaterialTransferDs.Select(x => x.unit_id).Distinct().ToList(); + List unitDatas = await _db.Queryable() + .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) + .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode)) + .Select((x,y)=>y) + .ToListAsync(); + + List ids = new List(); + ids.Add(wmsMaterialTransfer.create_id); + ids.Add(WmsWareHouseConst.AdministratorOrgId); + ids.Add(wmsMaterialTransfer.warehouse_instock); + ids.AddRange(materialIds); + ids.AddRange(unitDatas.Select(x=>x.Id).ToList()); + + List erpExtendFields = await _db.Queryable().Where(x=>ids.Contains(x.table_id)).ToListAsync(); + string erpCreateId = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.create_id)?.user_id ?? ""; + ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId)); + + Dictionary erpRequestData = new Dictionary(); + erpRequestData.Add("approver",erpCreateId); + erpRequestData.Add("billmaker",erpCreateId); + erpRequestData.Add("corpoid",erpOrg.corpoid); + erpRequestData.Add("corpvid",erpOrg.corpvid); + erpRequestData.Add("creationtime",DateTime.Now); + erpRequestData.Add("creator",erpCreateId); + erpRequestData.Add("ctrantypeid","0001H11000000000D30Z"); + erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); + erpRequestData.Add("cwhsmanagerid",""); + erpRequestData.Add("dbilldate",DateTime.Now); + erpRequestData.Add("dmakedate",DateTime.Now); + erpRequestData.Add("ntotalnum",wmsMaterialTransferDs.Sum(x=>x.qty)); + erpRequestData.Add("pk_group",erpOrg.pk_group); + erpRequestData.Add("pk_org",erpOrg.pk_org); + erpRequestData.Add("pk_org_v",erpOrg.pk_org_v); + erpRequestData.Add("vbillcode",wmsMaterialTransfer.bill_code); + erpRequestData.Add("vtrantypecode","4A-01"); + List> erpRequestDataDetails = new List>(); + foreach(WmsMaterialTransferD item in wmsMaterialTransferDs) + { + erpRequestDataDetails.Add(new Dictionary() + { + ["cbodytranstypecode"] = "4A-01", + ["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "", + ["cgeneralbid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "", + ["cgeneralbid"] = item.id, + ["cgeneralhid"] = item.bill_id, + ["cmaterialoid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "", + ["cmaterialvid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialvid ?? "", + ["corpoid"] = erpOrg.corpoid, + ["corpvid"] = erpOrg.corpvid, + ["crowno"] = (wmsMaterialTransferDs.FindIndex(x=>x.id==item.id)+1) * 10, + ["cunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "", + ["cvendorid"] = "", + ["cvendorvid"] = "", + ["dbizdate"] = DateTime.Now, + ["nnum"] = item.qty, + ["pk_group"] = erpOrg.pk_group, + ["pk_org"] = erpOrg.pk_org, + ["pk_org_v"] = erpOrg.pk_org_v, + ["vbatchcode"] = item.code_batch, + }); + } + erpRequestData.Add("dtls",erpRequestDataDetails); + + ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord(); + thirdWebapiRecord.id = SnowflakeIdHelper.NextId(); + thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; + thirdWebapiRecord.name = "其它入库"; + thirdWebapiRecord.method = "POST"; + thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/generalin/save"; + thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData); + thirdWebapiRecord.create_time = DateTime.Now; + + await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); + } #endregion List disTaskCodes = await _db.Queryable().Where(it => it.bill_id == dt.id).ToListAsync(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index f7878298..edd8a89b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -644,9 +644,7 @@ namespace Tnb.WarehouseMgr List erpExtendFields = await _db.Queryable().Where(x=>ids.Contains(x.table_id)).ToListAsync(); - ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.org_id); - if (erpOrg == null) - throw Oops.Bah("未配置erp组织"); + ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId)); string erpCreateId = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.create_id)?.user_id ?? ""; Dictionary erpRequestData = new Dictionary(); @@ -692,13 +690,14 @@ namespace Tnb.WarehouseMgr ["pk_org_v"] = erpOrg.pk_org_v, ["vbatchcode"] = wmsMaterialTransferd.code_batch, }); + erpRequestData.Add("dtls",erpRequestDataDetails); ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord(); thirdWebapiRecord.id = SnowflakeIdHelper.NextId(); thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; thirdWebapiRecord.name = "其它出库"; thirdWebapiRecord.method = "POST"; - thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/purarrvial/save"; + thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/generalout/save"; thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData); thirdWebapiRecord.create_time = DateTime.Now;