wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除引用

Browse Source
This commit is contained in:
周科达
2024-07-25 10:24:12 +08:00
parent 94b495a658
commit 65eed56fad
2 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
system/Tnb.Systems/Common/TestService.cs
View File

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

1
system/Tnb.Systems/Tnb.Systems.csproj
View File

@@ -15,7 +15,6 @@
<ProjectReference Include="..\..\EquipMgr\Tnb.EquipMgr.Interfaces\Tnb.EquipMgr.Interfaces.csproj" /> <ProjectReference Include="..\..\EquipMgr\Tnb.EquipMgr.Interfaces\Tnb.EquipMgr.Interfaces.csproj" />
<ProjectReference Include="..\..\message\Tnb.Message.Interfaces\Tnb.Message.Interfaces.csproj" /> <ProjectReference Include="..\..\message\Tnb.Message.Interfaces\Tnb.Message.Interfaces.csproj" />
<ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" /> <ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
<ProjectReference Include="..\..\WarehouseMgr\Tnb.WarehouseMgr.Entities\Tnb.WarehouseMgr.Entities.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>