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

Revert "质检"

Browse Source 
This reverts commit 4eba341642.
This commit is contained in:
陈文凯
2024-11-11 09:17:26 +08:00
parent 4eba341642
commit 4fa5b0a87a
3 changed files with 175 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
View File

@@ -298,7 +298,7 @@ namespace Tnb.QcMgr
#region 质检结论不合格， 需要记录暂控时间区间，并且记录载具信息 #region 质检结论不合格， 需要记录暂控时间区间，并且记录载具信息
if (CheckTaskInput.result == "no")//质检结论不合格，记录暂控时间 if (CheckTaskInput.result == "no")//质检结论不合格，记录暂控时间
{ {
if (CheckTaskInput.startEndTime == null || CheckTaskInput.startEndTime.Length <= 1) if(CheckTaskInput.startEndTime==null || CheckTaskInput.startEndTime.Length <= 1)
{ {
throw Oops.Bah("不合格时，请选择时间区间"); throw Oops.Bah("不合格时，请选择时间区间");
} }
@@ -406,10 +406,9 @@ namespace Tnb.QcMgr
mesCheckdCallbackUpinput.maintableid = QcCheckExecH.extras; mesCheckdCallbackUpinput.maintableid = QcCheckExecH.extras;
mesCheckdCallbackUpinput.check_conclusion = dic.Where(p => p.Key == CheckTaskInput.result).Any() ? dic.Where(p => p.Key == CheckTaskInput.result).First().Value : 0; mesCheckdCallbackUpinput.check_conclusion = dic.Where(p => p.Key == CheckTaskInput.result).Any() ? dic.Where(p => p.Key == CheckTaskInput.result).First().Value : 0;
await _wmsPurchaseService.MesCheckdPurchaseCallback(mesCheckdCallbackUpinput); await _wmsPurchaseService.MesCheckdPurchaseCallback(mesCheckdCallbackUpinput);
} }else if (QcCheckExecH.checktype == WmsWareHouseConst.LINGBUJIANZUIZHONGJIANYAN_ID)
else if (QcCheckExecH.checktype == WmsWareHouseConst.LINGBUJIANZUIZHONGJIANYAN_ID)
{ {
PrdReport prdReport = await db.Queryable<PrdReport>().SingleAsync(x => x.id == QcCheckExecH.report_id); PrdReport prdReport = await db.Queryable<PrdReport>().SingleAsync(x=>x.id==QcCheckExecH.report_id);
decimal pqty = prdReport.reported_qty.Value - rqty; decimal pqty = prdReport.reported_qty.Value - rqty;
if (rqty > Decimal.Parse(QcCheckExecH.checknum)) if (rqty > Decimal.Parse(QcCheckExecH.checknum))
{ {
@@ -430,10 +429,9 @@ namespace Tnb.QcMgr
pqty = pqty, pqty = pqty,
rqty = rqty, rqty = rqty,
check_result = ((EnumCheckConclusion)dic[CheckTaskInput.result]).ToString(), check_result = ((EnumCheckConclusion)dic[CheckTaskInput.result]).ToString(),
}, prdReport, db); },prdReport,db);
} }
} }else if (QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID || QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID || QcCheckExecH.checktype == WmsWareHouseConst.MOJIAN_ID )
else if (QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID || QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID || QcCheckExecH.checktype == WmsWareHouseConst.MOJIAN_ID)
{ {
PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().Where(x => x.mo_task_code == QcCheckExecH.mo_task_code && x.id != null).FirstAsync(); PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().Where(x => x.mo_task_code == QcCheckExecH.mo_task_code && x.id != null).FirstAsync();
if (CheckTaskInput.result == "no") if (CheckTaskInput.result == "no")
@@ -608,22 +606,20 @@ namespace Tnb.QcMgr
{ {
TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id), TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
Behavior = "Compled", Behavior = "Compled",
}, db); },db);
} }
} }
} }
await db.Ado.CommitTranAsync(); await db.Ado.CommitTranAsync();
} }
}
catch (Exception e) catch (Exception e)
{ {
await db.Ado.RollbackTranAsync(); await db.Ado.RollbackTranAsync();
JNPF.Logging.Log.Error(e.Message, e); JNPF.Logging.Log.Error(e.Message,e);
throw Oops.Oh("执行失败:" + e.Message); throw Oops.Oh("执行失败:"+e.Message);
} }
finally finally{
{
prdreportSemaphore.Release(); prdreportSemaphore.Release();
} }
} }

6
apihost/Tnb.API.Entry/Configurations/Cache.json
View File

@@ -2,19 +2,19 @@
"Cache": { "Cache": {
"CacheType": "RedisCache", //MemoryCache "CacheType": "RedisCache", //MemoryCache
"ip": "127.0.0.1", "ip": "127.0.0.1",
"port": 6378, "port": 6379,
"password": "05jWEoJa8v", "password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0" "RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0"
}, },
"Redis": { "Redis": {
"ip": "127.0.0.1", "ip": "127.0.0.1",
"port": 6378, "port": 6379,
"password": "05jWEoJa8v", "password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0" "RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0"
}, },
"Redis2": { "Redis2": {
"ip": "127.0.0.1", "ip": "127.0.0.1",
"port": 6378, "port": 6379,
"password": "05jWEoJa8v", "password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=1" "RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=1"
} }

8
apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json
View File

@@ -4,13 +4,13 @@
"DBType": "PostgreSQL", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite; "DBType": "PostgreSQL", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite;
//"Host": "192.168.11.109", //"Host": "192.168.11.109",
"Host": "127.0.0.1", "Host": "127.0.0.1",
"Port": "5431", "Port": "5432",
//"DBName": "tianyi_db", //"DBName": "tianyi_db",
//"UserName": "postgres", //"UserName": "postgres",
//"Password": "pass@word123", //"Password": "pass@word123",
"DBName": "tianyi_cwk2", "DBName": "tianyi",
"UserName": "totong", "UserName": "postgres",
"Password": "IPANyxGSKxIXg0dBM", "Password": "pass@word123",
//SqlServer //SqlServer
//"DefaultConnection": "server={0},{1};database={2};uid={3};pwd={4};MultipleActiveResultSets=true" //"DefaultConnection": "server={0},{1};database={2};uid={3};pwd={4};MultipleActiveResultSets=true"
//Kdbndp //Kdbndp