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

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

@@ -298,7 +298,7 @@ namespace Tnb.QcMgr
#region 质检结论不合格， 需要记录暂控时间区间，并且记录载具信息
if (CheckTaskInput.result == "no")//质检结论不合格，记录暂控时间
{
if (CheckTaskInput.startEndTime == null || CheckTaskInput.startEndTime.Length <= 1)
if(CheckTaskInput.startEndTime==null || CheckTaskInput.startEndTime.Length <= 1)
{
throw Oops.Bah("不合格时，请选择时间区间");
}
@@ -406,10 +406,9 @@ namespace Tnb.QcMgr
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;
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;
if (rqty > Decimal.Parse(QcCheckExecH.checknum))
{
@@ -430,200 +429,197 @@ namespace Tnb.QcMgr
pqty = pqty,
rqty = rqty,
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();
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 ? "首检不合格" : "末检不合格";
await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
{
TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
Behavior = "Pause",
PauseReeson = pauseReason
}, db);
TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
Behavior = "Pause",
PauseReeson = pauseReason
}, db);
#region 没看懂逻辑，暂时注释
//await _prdMoTaskService.SelfTestScrapped2(new SelfTestScrappedInput()
//{
// mo_task_id = prdMoTask.id,
// scrap_qty = rqty,
// remark = "抽样不合格报废",
// categoryItems = new List<SelfTestScrappedInputItem>()
// {
// new SelfTestScrappedInputItem()
// {
// category_id = "25574005966629",
// items = new List<defectItem>()
// {
// new defectItem()
// {
// defective_item = "抽样不合格报废",
// defective_item_qty = rqty
// }
// }
// }
// }
//}, db);
#endregion
#region 没看懂逻辑，暂时注释
//await _prdMoTaskService.SelfTestScrapped2(new SelfTestScrappedInput()
//{
// mo_task_id = prdMoTask.id,
// scrap_qty = rqty,
// remark = "抽样不合格报废",
// categoryItems = new List<SelfTestScrappedInputItem>()
// {
// new SelfTestScrappedInputItem()
// {
// category_id = "25574005966629",
// items = new List<defectItem>()
// {
// new defectItem()
// {
// defective_item = "抽样不合格报废",
// defective_item_qty = rqty
// }
// }
// }
// }
//}, db);
#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();
if (prdReports != null)
//载具需要在中储仓和暂存仓才需要暂控
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)
{
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)
{
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)
var basMaterial = await db.Queryable<BasMaterial>().Where(r => r.id == prdMoTask.material_id).FirstAsync();
string outWHid = ""; string inWHid = "";
if (basMaterial.category_id.Contains("DGJCJ") || basMaterial.category_id.Contains("ZSJ"))
{
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();
string outWHid = ""; string inWHid = "";
if (basMaterial.category_id.Contains("DGJCJ") || basMaterial.category_id.Contains("ZSJ"))
{
outWHid = WmsWareHouseConst.WAREHOUSE_ZC_ID;
inWHid = "中储不合格品仓id";
}
else if (basMaterial.category_id.Contains("CGJCJ"))
{
outWHid = WmsWareHouseConst.WAREHOUSE_HCC_ID;
inWHid = "长管不合格品仓id";
}
var carryIds = await db.Queryable<WmsCarryH>().Where(r => carryCodes.Contains(r.carry_code)).Select(r => r.id).ToListAsync();
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 qcTempControlH = new QcTempControlH()
{
id = SnowflakeIdHelper.NextId(),
bill_code = await _billRullService.GetBillNumber(CodeTemplateConst.QCCONTROLTEMP_CODE),
source_code = QcCheckExecH.bill_code,
pro_task_code = QcCheckExecH.mo_task_code,
out_warehouse_id = outWHid,
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();
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 qcTempControlH = new QcTempControlH()
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()
{
id = SnowflakeIdHelper.NextId(),
bill_code = await _billRullService.GetBillNumber(CodeTemplateConst.QCCONTROLTEMP_CODE),
source_code = QcCheckExecH.bill_code,
pro_task_code = QcCheckExecH.mo_task_code,
out_warehouse_id = outWHid,
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(),
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 = "未呼叫"
};
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();
qcTempControlDs.Add(qcTempConD);
}
#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.Insertable(qcTempControlDs).ExecuteCommandAsync();
}
#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)
{
await db.Ado.RollbackTranAsync();
JNPF.Logging.Log.Error(e.Message, e);
throw Oops.Oh("执行失败:" + e.Message);
JNPF.Logging.Log.Error(e.Message,e);
throw Oops.Oh("执行失败:"+e.Message);
}
finally
{
finally{
prdreportSemaphore.Release();
}
}

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

@@ -2,19 +2,19 @@
"Cache": {
"CacheType": "RedisCache", //MemoryCache
"ip": "127.0.0.1",
"port": 6378,
"port": 6379,
"password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0"
},
"Redis": {
"ip": "127.0.0.1",
"port": 6378,
"port": 6379,
"password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0"
},
"Redis2": {
"ip": "127.0.0.1",
"port": 6378,
"port": 6379,
"password": "05jWEoJa8v",
"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;
//"Host": "192.168.11.109",
"Host": "127.0.0.1",
"Port": "5431",
"Port": "5432",
//"DBName": "tianyi_db",
//"UserName": "postgres",
//"Password": "pass@word123",
"DBName": "tianyi_cwk2",
"UserName": "totong",
"Password": "IPANyxGSKxIXg0dBM",
"DBName": "tianyi",
"UserName": "postgres",
"Password": "pass@word123",
//SqlServer
//"DefaultConnection": "server={0},{1};database={2};uid={3};pwd={4};MultipleActiveResultSets=true"
//Kdbndp