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

340
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))
{ {
@@ -423,207 +422,204 @@ namespace Tnb.QcMgr
.SetColumns(x => x.is_check == isCheck) .SetColumns(x => x.is_check == isCheck)
.Where(x => x.carry_code == prdReport.material_box_code) .Where(x => x.carry_code == prdReport.material_box_code)
.ExecuteCommandAsync(); .ExecuteCommandAsync();
await _prdMoTaskService.ReportInstock(new CheckCompleteInput() await _prdMoTaskService.ReportInstock(new CheckCompleteInput()
{ {
report_id = QcCheckExecH.report_id, report_id = QcCheckExecH.report_id,
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")
{
string pauseReason = QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID ? "巡检不合格" : QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID ? "首检不合格" : "末检不合格";
await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
{ {
string pauseReason = QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID ? "巡检不合格" : QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID ? "首检不合格" : "末检不合格"; TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput() Behavior = "Pause",
{ PauseReeson = pauseReason
TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id), }, db);
Behavior = "Pause",
PauseReeson = pauseReason
}, db);
#region 没看懂逻辑，暂时注释 #region 没看懂逻辑，暂时注释
//await _prdMoTaskService.SelfTestScrapped2(new SelfTestScrappedInput() //await _prdMoTaskService.SelfTestScrapped2(new SelfTestScrappedInput()
//{ //{
// mo_task_id = prdMoTask.id, // mo_task_id = prdMoTask.id,
// scrap_qty = rqty, // scrap_qty = rqty,
// remark = "抽样不合格报废", // remark = "抽样不合格报废",
// categoryItems = new List<SelfTestScrappedInputItem>() // categoryItems = new List<SelfTestScrappedInputItem>()
// { // {
// new SelfTestScrappedInputItem() // new SelfTestScrappedInputItem()
// { // {
// category_id = "25574005966629", // category_id = "25574005966629",
// items = new List<defectItem>() // items = new List<defectItem>()
// { // {
// new defectItem() // new defectItem()
// { // {
// defective_item = "抽样不合格报废", // defective_item = "抽样不合格报废",
// defective_item_qty = rqty // defective_item_qty = rqty
// } // }
// } // }
// } // }
// } // }
//}, db); //}, db);
#endregion #endregion
//载具需要在中储仓和暂存仓才需要暂控 //载具需要在中储仓和暂存仓才需要暂控
List<PrdReport> prdReports = await db.Queryable<PrdReport>().LeftJoin<WmsCarryH>((a, b) => a.material_box_code == b.carry_code).LeftJoin<BasLocation>((a, b, c) => b.location_id == c.id).LeftJoin<BasWarehouse>((a, b, c, d) => c.wh_id == d.id).Where((a, b, c, d) => a.mo_task_id == prdMoTask.id && a.create_time >= CheckTaskInput.startEndTime[0].TimeStampToDateTime() && a.create_time <= CheckTaskInput.startEndTime[1].TimeStampToDateTime() && (c.wh_id == WmsWareHouseConst.WAREHOUSE_ZC_ID || c.wh_id == WmsWareHouseConst.WAREHOUSE_ZCC_ID)).ToListAsync(); List<PrdReport> prdReports = await db.Queryable<PrdReport>().LeftJoin<WmsCarryH>((a, b) => a.material_box_code == b.carry_code).LeftJoin<BasLocation>((a, b, c) => b.location_id == c.id).LeftJoin<BasWarehouse>((a, b, c, d) => c.wh_id == d.id).Where((a, b, c, d) => a.mo_task_id == prdMoTask.id && a.create_time >= CheckTaskInput.startEndTime[0].TimeStampToDateTime() && a.create_time <= CheckTaskInput.startEndTime[1].TimeStampToDateTime() && (c.wh_id == WmsWareHouseConst.WAREHOUSE_ZC_ID || c.wh_id == WmsWareHouseConst.WAREHOUSE_ZCC_ID)).ToListAsync();
if (prdReports != null) if (prdReports != null)
{
var carryCodes = prdReports.Select(r => r.material_box_code).Distinct().ToList();
if (carryCodes != null && carryCodes.Count > 0)
{ {
var carryCodes = prdReports.Select(r => r.material_box_code).Distinct().ToList(); await db.Updateable<WmsCarryH>()
.SetColumns(x => x.is_check == ((int)EnumCheckConclusion.暂控).ToString())
.SetColumns(x => x.carry_status == "6")//把料架状态改为退料状态，会自动触发把料架上的子载具从二楼暂存仓退回一楼中储仓任务
.Where(x => carryCodes.Contains(x.carry_code))
.ExecuteCommandAsync();
#region 记录被暂控的载具信息
//var qcCheckExecCarrys = new List<QcCheckExecCarry>();
//foreach(var carryCode in carryCodes)
//{
// var wmsCarryH = await db.Queryable<WmsCarryH>().Where(r => r.carry_code == carryCode).FirstAsync();
// if (wmsCarryH == null)
// continue;
// WmsCarryCode wmsCarryCode = await db.Queryable<WmsCarryCode>().FirstAsync(x => x.carry_id == wmsCarryH.id);
// BasLocation basLocation = await db.Queryable<BasLocation>().Where(r => r.location_code == wmsCarryH.location_code).FirstAsync();
// WmsCarryMat wmsCarryMat = await db.Queryable<WmsCarryMat>().Where(r => r.carry_id == wmsCarryH.id).FirstAsync();
// var qcCheckExecCarry = new QcCheckExecCarry()
// {
// qc_check_exec_id = QcCheckExecH.id,
// carry_id = wmsCarryH.id,
// carry_code = wmsCarryH.carry_code,
// warehouse_id = basLocation != null ? basLocation.wh_id : "",
// qty = wmsCarryCode != null ? wmsCarryCode.codeqty.ToString() : "",
// status = wmsCarryH.is_check,
// location_id = basLocation != null ? basLocation.id : "",
// location_code = basLocation != null ? basLocation.location_code : "",
// material_id= wmsCarryMat?.material_id,
// create_id = _userManager.UserId,
// create_time = DateTime.Now
// };
// qcCheckExecCarrys.Add(qcCheckExecCarry);
//}
//_ = await db.Insertable(qcCheckExecCarrys).ExecuteCommandAsync();
#endregion
#region 记录暂控处理单主/子表信息
if (carryCodes != null && carryCodes.Count > 0) if (carryCodes != null && carryCodes.Count > 0)
{ {
await db.Updateable<WmsCarryH>()
.SetColumns(x => x.is_check == ((int)EnumCheckConclusion.暂控).ToString())
.SetColumns(x => x.carry_status == "6")//把料架状态改为退料状态，会自动触发把料架上的子载具从二楼暂存仓退回一楼中储仓任务
.Where(x => carryCodes.Contains(x.carry_code))
.ExecuteCommandAsync();
#region 记录被暂控的载具信息 var basMaterial = await db.Queryable<BasMaterial>().Where(r => r.id == prdMoTask.material_id).FirstAsync();
//var qcCheckExecCarrys = new List<QcCheckExecCarry>(); string outWHid = ""; string inWHid = "";
//foreach(var carryCode in carryCodes) if (basMaterial.category_id.Contains("DGJCJ") || basMaterial.category_id.Contains("ZSJ"))
//{
// var wmsCarryH = await db.Queryable<WmsCarryH>().Where(r => r.carry_code == carryCode).FirstAsync();
// if (wmsCarryH == null)
// continue;
// WmsCarryCode wmsCarryCode = await db.Queryable<WmsCarryCode>().FirstAsync(x => x.carry_id == wmsCarryH.id);
// BasLocation basLocation = await db.Queryable<BasLocation>().Where(r => r.location_code == wmsCarryH.location_code).FirstAsync();
// WmsCarryMat wmsCarryMat = await db.Queryable<WmsCarryMat>().Where(r => r.carry_id == wmsCarryH.id).FirstAsync();
// var qcCheckExecCarry = new QcCheckExecCarry()
// {
// qc_check_exec_id = QcCheckExecH.id,
// carry_id = wmsCarryH.id,
// carry_code = wmsCarryH.carry_code,
// warehouse_id = basLocation != null ? basLocation.wh_id : "",
// qty = wmsCarryCode != null ? wmsCarryCode.codeqty.ToString() : "",
// status = wmsCarryH.is_check,
// location_id = basLocation != null ? basLocation.id : "",
// location_code = basLocation != null ? basLocation.location_code : "",
// material_id= wmsCarryMat?.material_id,
// create_id = _userManager.UserId,
// create_time = DateTime.Now
// };
// qcCheckExecCarrys.Add(qcCheckExecCarry);
//}
//_ = await db.Insertable(qcCheckExecCarrys).ExecuteCommandAsync();
#endregion
#region 记录暂控处理单主/子表信息
if (carryCodes != null && carryCodes.Count > 0)
{ {
outWHid = WmsWareHouseConst.WAREHOUSE_ZC_ID;
inWHid = "中储不合格品仓id";
}
else if (basMaterial.category_id.Contains("CGJCJ"))
{
outWHid = WmsWareHouseConst.WAREHOUSE_HCC_ID;
inWHid = "长管不合格品仓id";
}
var basMaterial = await db.Queryable<BasMaterial>().Where(r => r.id == prdMoTask.material_id).FirstAsync(); var carryIds = await db.Queryable<WmsCarryH>().Where(r => carryCodes.Contains(r.carry_code)).Select(r => r.id).ToListAsync();
string outWHid = ""; string inWHid = ""; var wmsCarryCodes = await db.Queryable<WmsCarryCode>().Where(r => carryIds.Contains(r.carry_id) && r.material_id == QcCheckExecH.materialid).ToListAsync();
if (basMaterial.category_id.Contains("DGJCJ") || basMaterial.category_id.Contains("ZSJ")) var codeQty = wmsCarryCodes == null ? 0 : wmsCarryCodes.Sum(r => r.codeqty);
{ var qcTempControlH = new QcTempControlH()
outWHid = WmsWareHouseConst.WAREHOUSE_ZC_ID; {
inWHid = "中储不合格品仓id"; id = SnowflakeIdHelper.NextId(),
} bill_code = await _billRullService.GetBillNumber(CodeTemplateConst.QCCONTROLTEMP_CODE),
else if (basMaterial.category_id.Contains("CGJCJ")) source_code = QcCheckExecH.bill_code,
{ pro_task_code = QcCheckExecH.mo_task_code,
outWHid = WmsWareHouseConst.WAREHOUSE_HCC_ID; out_warehouse_id = outWHid,
inWHid = "长管不合格品仓id"; in_warehouse_id = inWHid,
} material_id = QcCheckExecH.materialid,
material_code = basMaterial.code,
control_lx_qty = carryCodes.Count.ToString(),
control_qty = codeQty.ToString(),
result = "暂控",
loger_id = _userManager.UserId,
confirmer_id = "",
status = ((int)EnumTempControlStatus.待确认).ToString(),
called_box_qty = "0",
called_qty = "0",
leave_call_box_qty = carryCodes.Count.ToString(),
leave_call_qty = codeQty.ToString(),
create_id = _userManager.UserId,
create_time = DateTime.Now,
};
var carryIds = await db.Queryable<WmsCarryH>().Where(r => carryCodes.Contains(r.carry_code)).Select(r => r.id).ToListAsync(); await db.Insertable(qcTempControlH).ExecuteCommandAsync();
var wmsCarryCodes = await db.Queryable<WmsCarryCode>().Where(r => carryIds.Contains(r.carry_id) && r.material_id == QcCheckExecH.materialid).ToListAsync();
var codeQty = wmsCarryCodes == null ? 0 : wmsCarryCodes.Sum(r => r.codeqty); var qcTempControlDs = new List<QcTempControlD>();
var qcTempControlH = new QcTempControlH() foreach (var carryCode in carryCodes)
{
var wmsCarryH = await db.Queryable<WmsCarryH>().Where(r => r.carry_code == carryCode).FirstAsync();
if (wmsCarryH == null)
continue;
WmsCarryCode wmsCarryCode = await db.Queryable<WmsCarryCode>().FirstAsync(x => x.carry_id == wmsCarryH.id);
BasLocation basLocation = await db.Queryable<BasLocation>().Where(r => r.location_code == wmsCarryH.location_code).FirstAsync();
if (basLocation == null)
throw Oops.Bah($"未找到编号为{wmsCarryH.location_code}的库位");
WmsCarryMat wmsCarryMat = await db.Queryable<WmsCarryMat>().Where(r => r.carry_id == wmsCarryH.id).FirstAsync();
BasWarehouse basWarehouse = await db.Queryable<BasWarehouse>().Where(r => r.id == basLocation.wh_id).FirstAsync();
var _prdReports = prdReports.Where(r => r.material_box_code == carryCode).First();
var qcTempConD = new QcTempControlD()
{ {
id = SnowflakeIdHelper.NextId(), bill_id = qcTempControlH.id,
bill_code = await _billRullService.GetBillNumber(CodeTemplateConst.QCCONTROLTEMP_CODE), carry_id = wmsCarryH.id,
source_code = QcCheckExecH.bill_code, carry_code = carryCode,
pro_task_code = QcCheckExecH.mo_task_code, warehouse_id = basLocation?.wh_id,
out_warehouse_id = outWHid, warehouse_code = basWarehouse.whcode,
in_warehouse_id = inWHid, location_code = basLocation?.location_code,
material_id = QcCheckExecH.materialid, location_id = basLocation?.id,
material_code = basMaterial.code, qty = wmsCarryCode?.codeqty.ToString(),
control_lx_qty = carryCodes.Count.ToString(), submiter = _prdReports == null ? null : _prdReports.create_id,
control_qty = codeQty.ToString(), maker_id = "",
result = "暂控",
loger_id = _userManager.UserId,
confirmer_id = "",
status = ((int)EnumTempControlStatus.待确认).ToString(),
called_box_qty = "0",
called_qty = "0",
leave_call_box_qty = carryCodes.Count.ToString(),
leave_call_qty = codeQty.ToString(),
create_id = _userManager.UserId, create_id = _userManager.UserId,
create_time = DateTime.Now, create_time = DateTime.Now,
check_status = "暂控",
call_status = "未呼叫"
}; };
qcTempControlDs.Add(qcTempConD);
await db.Insertable(qcTempControlH).ExecuteCommandAsync();
var qcTempControlDs = new List<QcTempControlD>();
foreach (var carryCode in carryCodes)
{
var wmsCarryH = await db.Queryable<WmsCarryH>().Where(r => r.carry_code == carryCode).FirstAsync();
if (wmsCarryH == null)
continue;
WmsCarryCode wmsCarryCode = await db.Queryable<WmsCarryCode>().FirstAsync(x => x.carry_id == wmsCarryH.id);
BasLocation basLocation = await db.Queryable<BasLocation>().Where(r => r.location_code == wmsCarryH.location_code).FirstAsync();
if (basLocation == null)
throw Oops.Bah($"未找到编号为{wmsCarryH.location_code}的库位");
WmsCarryMat wmsCarryMat = await db.Queryable<WmsCarryMat>().Where(r => r.carry_id == wmsCarryH.id).FirstAsync();
BasWarehouse basWarehouse = await db.Queryable<BasWarehouse>().Where(r => r.id == basLocation.wh_id).FirstAsync();
var _prdReports = prdReports.Where(r => r.material_box_code == carryCode).First();
var qcTempConD = new QcTempControlD()
{
bill_id = qcTempControlH.id,
carry_id = wmsCarryH.id,
carry_code = carryCode,
warehouse_id = basLocation?.wh_id,
warehouse_code = basWarehouse.whcode,
location_code = basLocation?.location_code,
location_id = basLocation?.id,
qty = wmsCarryCode?.codeqty.ToString(),
submiter = _prdReports == null ? null : _prdReports.create_id,
maker_id = "",
create_id = _userManager.UserId,
create_time = DateTime.Now,
check_status = "暂控",
call_status = "未呼叫"
};
qcTempControlDs.Add(qcTempConD);
}
await db.Insertable(qcTempControlDs).ExecuteCommandAsync();
} }
#endregion await db.Insertable(qcTempControlDs).ExecuteCommandAsync();
}
}
else
{
//末检自动完工
if (QcCheckExecH.checktype == WmsWareHouseConst.MOJIAN_ID)
{
await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
{
TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
Behavior = "Compled",
}, db);
} }
#endregion
}
}
else
{
//末检自动完工
if (QcCheckExecH.checktype == WmsWareHouseConst.MOJIAN_ID)
{
await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
{
TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
Behavior = "Compled",
},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