From 44d586e85b95b20b22af41b72cf271f1bbdf01de Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Wed, 17 Jul 2024 14:10:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E5=AE=9A=E7=82=B9=E9=85=8D?= =?UTF-8?q?=E9=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsPurchaseService.cs | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs index 7d2837bc..c15eef6c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs @@ -10,6 +10,7 @@ using JNPF.Common.Security; using JNPF.DependencyInjection; using JNPF.FriendlyException; using JNPF.Logging; +using JNPF.Systems.Entitys.System; using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; using Mapster; @@ -29,6 +30,8 @@ using Tnb.WarehouseMgr.Entities.Consts; using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Interfaces; +using Tnb.BasicData; +using Tnb.ProductionMgr.Entities.Entity; namespace Tnb.WarehouseMgr { @@ -103,6 +106,110 @@ namespace Tnb.WarehouseMgr instockD.org_id = _userManager.User.OrganizeId; }); await _db.Insertable(instockDs).ExecuteCommandAsync(); + + var purchase = await _db.Queryable().FirstAsync(it => it.id == purchaseDs.First().bill_id); + List dList = await _db.Queryable().Where(x=>x.bill_id==purchaseDs.First().bill_id).OrderBy(x=>x.id).ToListAsync(); + List materialIds = purchaseDs.Select(x=>x.material_id).Distinct().ToList(); + List unitCodes = purchaseDs.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(_userManager.UserId); + ids.Add(WmsWareHouseConst.AdministratorOrgId); + ids.Add(purchase.warehouse_id); + 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==_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("approver",erpCreateId); + erpRequestData.Add("billmaker",erpCreateId); + erpRequestData.Add("bisback",false); + erpRequestData.Add("creationtime",nowStr); + erpRequestData.Add("creator",erpCreateId); + erpRequestData.Add("ctrantypeid",""); + erpRequestData.Add("dbilldate",""); + erpRequestData.Add("dmakedate",nowStr); + erpRequestData.Add("ntotalastnum",purchaseDs.Sum(x=>x.purchase_arriveqty)); + erpRequestData.Add("pk_arriveorder",""); + erpRequestData.Add("pk_dept","1001A1100000000JRLI1A100"); + erpRequestData.Add("pk_dept_v","0001A11000000007GGO8"); + erpRequestData.Add("pk_org",erpOrg.pk_org); + erpRequestData.Add("pk_org_v",erpOrg.pk_org_v); + erpRequestData.Add("pk_group",erpOrg.pk_group); + erpRequestData.Add("pk_pupsndoc",""); + erpRequestData.Add("pk_purchaseorg",erpOrg.pk_org); + erpRequestData.Add("pk_purchaseorg_v",erpOrg.pk_org_v); + erpRequestData.Add("pk_supplier","1001A110000000000ZDB");//先写死 + erpRequestData.Add("pk_supplier_v","1001A110000000000ZDB");//先写死 + erpRequestData.Add("vbillcode",purchase.bill_code); + erpRequestData.Add("vmemo",purchase.remark); + erpRequestData.Add("vtrantypecode",""); + + List> erpRequestDataDetails = new List>(); + foreach(WmsPurchaseD item in dList) + { + erpRequestDataDetails.Add(new Dictionary() + { + ["castunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "", + ["cfirstbid"] = "", + ["cfirstid"] = "", + ["cfirsttypecode"] = "", + ["crececountryid"] = "0001Z010000000079UJJ", + ["crowno"] = (dList.FindIndex(x=>x.id==item.id)+1) * 10, + ["csendcountryid"] = "0001Z010000000079UJJ", + ["csourcetypecode"] = "", + ["ctaxcountryid"] = "0001Z010000000079UJJ", + ["cunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "", + ["dbilldate"] = "", + ["dplanreceivedate"] = "", + ["dproducedate"] = "", + ["fbuysellflag"] = 2, + ["fproductclass"] = 1, + ["naccumchecknum"] = 0, + // ["nastnum"] = 0, + ["nnum"] = item.purchase_arriveqty, + // ["nplanastnum"] = 0, + ["nplannum"] = item.purchase_qty, + ["apfinanceorg"] = erpOrg.pk_org, + ["pk_apfinanceorg_v"] = erpOrg.pk_org_v, + ["pk_arriveorder"] = "", + ["pk_arriveorder_b"] = "", + ["pk_group"] = "", + ["pk_material"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "", + ["pk_order"] = purchase.erp_bill_code, + // ["pk_order_b"] = "", + ["pk_org"] = erpOrg.pk_org, + ["pk_org_v"] = erpOrg.pk_org_v, + ["pk_psfinanceorg"] = erpOrg.pk_org_v, + ["pk_psfinanceorg_v"] = erpOrg.pk_org_v, + ["pk_receivestore"] = erpExtendFields.Find(x=>x.table_id==purchase.warehouse_id)?.cotherwhid ?? "", + ["pk_reqstoorg"] = erpOrg.pk_org, + ["pk_reqstoorg_v"] = erpOrg.pk_org_v, + }); + } + erpRequestData.Add("ArriveItemVODtl",erpRequestDataDetails); + requestData.Add(erpRequestData); + + 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.request_data = JsonConvert.SerializeObject(erpRequestData); + thirdWebapiRecord.create_time = DateTime.Now; + + await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); } //通知Mes接口 //_ = SyncMesData(instock.id, instockDs.Select(x => x.material_id).ToList(), EnumTriggerEvent.入厂检按物料编号);