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

bug

Browse Source
This commit is contained in:
周科达
2024-06-27 16:23:40 +08:00
parent ea93613c82
commit 323d18c374
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs
View File

@@ -442,7 +442,7 @@ namespace Tnb.ProductionMgr
num = item.codeqty, num = item.codeqty,
batch = item.code_batch, batch = item.code_batch,
unit_id = item.unit_id, unit_id = item.unit_id,
carry_id = item.member_carryid, carry_id = carry.id,
barcode = item.barcode, barcode = item.barcode,
is_all_feeding = 0, is_all_feeding = 0,
member_carry_id = item.member_carryid, member_carry_id = item.member_carryid,

2
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -2050,7 +2050,7 @@ namespace Tnb.ProductionMgr
bindCarryCodeInput.material_name = basMaterial.name; bindCarryCodeInput.material_name = basMaterial.name;
bindCarryCodeInput.location_id = location.id; bindCarryCodeInput.location_id = location.id;
bindCarryCodeInput.location_code = location.location_code; bindCarryCodeInput.location_code = location.location_code;
bindCarryCodeInput.code_batch = prdMoTask.batch; bindCarryCodeInput.code_batch = report.batch;
bindCarryCodeInput.create_id = _userManager?.UserId ?? WmsWareHouseConst.AdministratorUserId; bindCarryCodeInput.create_id = _userManager?.UserId ?? WmsWareHouseConst.AdministratorUserId;
Log.Information($"载具绑定参数:${JsonConvert.SerializeObject(bindCarryCodeInput)}"); Log.Information($"载具绑定参数:${JsonConvert.SerializeObject(bindCarryCodeInput)}");

7
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -111,7 +111,7 @@ namespace Tnb.ProductionMgr
// bool cs01Flag = _redisData.Get<bool>("YTCS_CallCtuEmptyIn_CS01_flag"); // bool cs01Flag = _redisData.Get<bool>("YTCS_CallCtuEmptyIn_CS01_flag");
// bool cs03Flag = _redisData.Get<bool>("YTCS_CallCtuEmptyIn_CS03_flag"); // bool cs03Flag = _redisData.Get<bool>("YTCS_CallCtuEmptyIn_CS03_flag");
// bool cs06Flag = _redisData.Get<bool>("YTCS_CallCtuEmptyIn_CS06_flag"); // bool cs06Flag = _redisData.Get<bool>("YTCS_CallCtuEmptyIn_CS06_flag");
List<String> statusList = new List<string>(){WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,WmsWareHouseConst.PRETASK_BILL_STATUS_YXF_ID}; List<String> statusList = new List<string>(){WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,WmsWareHouseConst.PRETASK_BILL_STATUS_YXF_ID,WmsWareHouseConst.PRETASK_BILL_STATUS_START_ID};
bool cs01Flag = await _db.Queryable<WmsPretaskH>().AnyAsync(x => x.endlocation_code == "SSX-021-001" && statusList.Contains(x.status) ); bool cs01Flag = await _db.Queryable<WmsPretaskH>().AnyAsync(x => x.endlocation_code == "SSX-021-001" && statusList.Contains(x.status) );
bool cs03Flag = await _db.Queryable<WmsPretaskH>().AnyAsync(x => x.endlocation_code == "SSX-021-003" && statusList.Contains(x.status) ); bool cs03Flag = await _db.Queryable<WmsPretaskH>().AnyAsync(x => x.endlocation_code == "SSX-021-003" && statusList.Contains(x.status) );
bool cs06Flag = await _db.Queryable<WmsPretaskH>().AnyAsync(x => x.endlocation_code == "SSX-011-006" && statusList.Contains(x.status) ); bool cs06Flag = await _db.Queryable<WmsPretaskH>().AnyAsync(x => x.endlocation_code == "SSX-011-006" && statusList.Contains(x.status) );
@@ -286,12 +286,13 @@ namespace Tnb.ProductionMgr
Log.Error($"{equipment.name}未配置上料库位"); Log.Error($"{equipment.name}未配置上料库位");
continue; continue;
} }
if (await _db.Queryable<WmsPretaskH>().AnyAsync(x => if (await _db.Queryable<WmsPretaskH>().AnyAsync(x =>
x.endlocation_id == equipment.upmat_location_id && x.endlocation_id == equipment.upmat_location_id &&
x.biz_type == WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID && x.biz_type == WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID &&
(x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID (x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID
|| x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_YXF_ID) || x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_YXF_ID
|| x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_START_ID
)
)) ))
{ {
Log.Error($"{equipment.name}存在待下发的任务"); Log.Error($"{equipment.name}存在待下发的任务");