diff --git a/system/Tnb.Systems/Common/TestService.cs b/system/Tnb.Systems/Common/TestService.cs index d0900970..bbe98096 100644 --- a/system/Tnb.Systems/Common/TestService.cs +++ b/system/Tnb.Systems/Common/TestService.cs @@ -19,7 +19,6 @@ using Tnb.BasicData.Entities; using Tnb.ProductionMgr.Entities.Entity; using Tnb.ProductionMgr.Entities.Entity.ErpEntity; using Tnb.WarehouseMgr.Entities.Entity; -using Tnb.WarehouseMgr.Entities.Consts; using Tnb.BasicData; using Tnb.WarehouseMgr.Entities; @@ -111,87 +110,87 @@ public class TestService : IDynamicApiController, ITransient [AllowAnonymous] public async Task test2() { - WmsMaterialTransferD wmsMaterialTransferd = await _sugar.Queryable().Where(r => r.id == "35610026468885").SingleAsync(); - WmsMaterialTransfer wmsMaterialTransfer = await _sugar.Queryable().SingleAsync(x => x.id == wmsMaterialTransferd.bill_id); - List dList = await _sugar.Queryable().Where(x => x.bill_id == wmsMaterialTransferd.bill_id).OrderBy(x=>x.id).ToListAsync(); - DictionaryDataEntity unitData = await _sugar.Queryable() - .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) - .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode == wmsMaterialTransferd.unit_id) - .Select((x,y)=>y) - .FirstAsync(); - List ids = new List(); - ids.Add(wmsMaterialTransfer.create_id); - ids.Add(WmsWareHouseConst.AdministratorOrgId); - ids.Add(wmsMaterialTransfer.warehouse_outstock); - ids.Add(wmsMaterialTransfer.warehouse_instock); - ids.Add(wmsMaterialTransferd.material_id); - if (unitData != null) - { - ids.Add(unitData.Id); - } - List erpExtendFields = await _sugar.Queryable().Where(x=>ids.Contains(x.table_id)).ToListAsync(); - - 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 ?? ""; - - List> requestData = new List>(); - Dictionary erpRequestData = new Dictionary(); - string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - erpRequestData.Add("billmaker",erpCreateId); - erpRequestData.Add("cdptid","1001A1100000000JRLI1");// 先写死 - erpRequestData.Add("cdptvid","0001A11000000007GGO8");// 先写死 - erpRequestData.Add("corpoid",erpOrg.corpoid); - erpRequestData.Add("corpvid",erpOrg.corpoid); - erpRequestData.Add("cothercalbodyoid",erpOrg.pk_org); - erpRequestData.Add("cotherwhid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); - erpRequestData.Add("creationtime",nowStr); - erpRequestData.Add("creator",erpCreateId); - erpRequestData.Add("ctrantypeid","0001H11000000000D31W"); - erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? ""); - erpRequestData.Add("dbilldate",nowStr); - erpRequestData.Add("dmakedate",nowStr); - erpRequestData.Add("ntotalnum",20); - 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","4I-01");//其他出库 先写死 - List> erpRequestDataDetails = new List>(); - erpRequestDataDetails.Add(new Dictionary() - { - ["cbodytranstypecode"] = "4I-01", - ["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? "", - ["cmaterialoid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransferd.material_id)?.cmaterialoid ?? "", - ["cmaterialvid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransferd.material_id)?.cmaterialvid ?? "", - ["corpoid"] = erpOrg.corpoid, - ["corpvid"] = erpOrg.corpvid, - ["crowno"] = wmsMaterialTransferd.lineno, - ["csourcebillbid"] = wmsMaterialTransferd.erp_line_pk, - ["csourcebillhid"] = wmsMaterialTransfer.erp_pk, - ["cunitid"] = erpExtendFields.Find(x=>x.table_id==unitData.Id)?.cunitid ?? "", - ["cvendorid"] = "", - ["cvendorvid"] = "", - ["dbizdate"] = nowStr, - ["nnum"] = 20, - ["nshouldnum"] = wmsMaterialTransferd.qty, - ["pk_group"] = erpOrg.pk_group, - ["pk_org"] = erpOrg.pk_org, - ["pk_org_v"] = erpOrg.pk_org_v, - ["vbatchcode"] = wmsMaterialTransferd.code_batch, - }); - erpRequestData.Add("dtls",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/generalout/save"; - thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); - thirdWebapiRecord.create_time = DateTime.Now; - - await _sugar.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); + // WmsMaterialTransferD wmsMaterialTransferd = await _sugar.Queryable().Where(r => r.id == "35610026468885").SingleAsync(); + // WmsMaterialTransfer wmsMaterialTransfer = await _sugar.Queryable().SingleAsync(x => x.id == wmsMaterialTransferd.bill_id); + // List dList = await _sugar.Queryable().Where(x => x.bill_id == wmsMaterialTransferd.bill_id).OrderBy(x=>x.id).ToListAsync(); + // DictionaryDataEntity unitData = await _sugar.Queryable() + // .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) + // .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode == wmsMaterialTransferd.unit_id) + // .Select((x,y)=>y) + // .FirstAsync(); + // List ids = new List(); + // ids.Add(wmsMaterialTransfer.create_id); + // ids.Add(WmsWareHouseConst.AdministratorOrgId); + // ids.Add(wmsMaterialTransfer.warehouse_outstock); + // ids.Add(wmsMaterialTransfer.warehouse_instock); + // ids.Add(wmsMaterialTransferd.material_id); + // if (unitData != null) + // { + // ids.Add(unitData.Id); + // } + // List erpExtendFields = await _sugar.Queryable().Where(x=>ids.Contains(x.table_id)).ToListAsync(); + // + // 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 ?? ""; + // + // List> requestData = new List>(); + // Dictionary erpRequestData = new Dictionary(); + // string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + // erpRequestData.Add("billmaker",erpCreateId); + // erpRequestData.Add("cdptid","1001A1100000000JRLI1");// 先写死 + // erpRequestData.Add("cdptvid","0001A11000000007GGO8");// 先写死 + // erpRequestData.Add("corpoid",erpOrg.corpoid); + // erpRequestData.Add("corpvid",erpOrg.corpoid); + // erpRequestData.Add("cothercalbodyoid",erpOrg.pk_org); + // erpRequestData.Add("cotherwhid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); + // erpRequestData.Add("creationtime",nowStr); + // erpRequestData.Add("creator",erpCreateId); + // erpRequestData.Add("ctrantypeid","0001H11000000000D31W"); + // erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? ""); + // erpRequestData.Add("dbilldate",nowStr); + // erpRequestData.Add("dmakedate",nowStr); + // erpRequestData.Add("ntotalnum",20); + // 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","4I-01");//其他出库 先写死 + // List> erpRequestDataDetails = new List>(); + // erpRequestDataDetails.Add(new Dictionary() + // { + // ["cbodytranstypecode"] = "4I-01", + // ["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? "", + // ["cmaterialoid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransferd.material_id)?.cmaterialoid ?? "", + // ["cmaterialvid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransferd.material_id)?.cmaterialvid ?? "", + // ["corpoid"] = erpOrg.corpoid, + // ["corpvid"] = erpOrg.corpvid, + // ["crowno"] = wmsMaterialTransferd.lineno, + // ["csourcebillbid"] = wmsMaterialTransferd.erp_line_pk, + // ["csourcebillhid"] = wmsMaterialTransfer.erp_pk, + // ["cunitid"] = erpExtendFields.Find(x=>x.table_id==unitData.Id)?.cunitid ?? "", + // ["cvendorid"] = "", + // ["cvendorvid"] = "", + // ["dbizdate"] = nowStr, + // ["nnum"] = 20, + // ["nshouldnum"] = wmsMaterialTransferd.qty, + // ["pk_group"] = erpOrg.pk_group, + // ["pk_org"] = erpOrg.pk_org, + // ["pk_org_v"] = erpOrg.pk_org_v, + // ["vbatchcode"] = wmsMaterialTransferd.code_batch, + // }); + // erpRequestData.Add("dtls",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/generalout/save"; + // thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); + // thirdWebapiRecord.create_time = DateTime.Now; + // + // await _sugar.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); return "123"; } diff --git a/system/Tnb.Systems/Tnb.Systems.csproj b/system/Tnb.Systems/Tnb.Systems.csproj index 21adaf26..ef1765d0 100644 --- a/system/Tnb.Systems/Tnb.Systems.csproj +++ b/system/Tnb.Systems/Tnb.Systems.csproj @@ -15,7 +15,6 @@ -