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

1

Browse Source
This commit is contained in:
周科达
2023-11-23 14:41:06 +08:00
parent 23ab9fa523
commit 6840cfcbb1
4 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs
View File

@@ -199,7 +199,7 @@ namespace Tnb.ProductionMgr
});
}
// string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
string domain = "http://tnb.tuotong-tech.com";
string domain = _userManager.Domain;
Dictionary<string, object> header = new()
{
["Authorization"] = App.HttpContext.Request.Headers["Authorization"]
@@ -397,7 +397,7 @@ namespace Tnb.ProductionMgr
});
// string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
// string domain = "http://localhost:9232";
string domain = "http://tnb.tuotong-tech.com";
string domain = _userManager.Domain;
Dictionary<string, object> header = new()
{
// ["Authorization"] = App.HttpContext.Request.Headers["Authorization"]
@@ -508,7 +508,7 @@ namespace Tnb.ProductionMgr
// codeqty = (int)prdReport.reported_qty,
// });
// // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
// string domain = "http://tnb.tuotong-tech.com";
// string domain = _userManager.Domain;
// Dictionary<string, object> header = new()
// {
// // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"]
@@ -588,7 +588,8 @@ namespace Tnb.ProductionMgr
string location_code = basLocation.location_code;
PrdReport prdReport = await db.Queryable<PrdReport>()
.Where(x => x.equip_id == equipment.id && x.status == 0).OrderByDescending(x => x.create_time)
.LeftJoin<BasMaterial>((x,y)=>x.material_id==y.id)
.Where((x,y) => y.category_id.Contains("\"DGJCJ\"") && x.status == 0).OrderByDescending(x => x.create_time)
.FirstAsync();
BasMaterial basMaterial = await db.Queryable<BasMaterial>().SingleAsync(x => x.id == prdReport.material_id);
@@ -653,7 +654,7 @@ namespace Tnb.ProductionMgr
material_id = prdReport.material_id,
material_code = basMaterial.code,
unit_id = prdReport.unit_id,
code_batch = prdReport.barcode,
code_batch = prdReport.mo_task_code,
pr_qty = (int)prdReport.reported_qty,
});
@@ -667,7 +668,9 @@ namespace Tnb.ProductionMgr
codeqty = (int)prdReport.reported_qty,
});
// string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
string domain = "http://tnb.tuotong-tech.com";
// string domain = _userManager.Domain;
// string domain = "http://localhost:9232";
string domain = _userManager.Domain;
Dictionary<string, object> header = new()
{
// ["Authorization"] = App.HttpContext.Request.Headers["Authorization"]
@@ -781,7 +784,7 @@ namespace Tnb.ProductionMgr
codeqty = (int)prdReport.reported_qty,
});
// string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
string domain = "http://tnb.tuotong-tech.com";
string domain = _userManager.Domain;
// string domain = "http://localhost:9232";
Dictionary<string, object> header = new()
{
@@ -971,7 +974,7 @@ namespace Tnb.ProductionMgr
}
// string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
string domain = "http://tnb.tuotong-tech.com";
string domain = _userManager.Domain;
Dictionary<string, object> header = new()
{
// ["Authorization"] = App.HttpContext.Request.Headers["Authorization"]