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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source 
Conflicts:
	ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
This commit is contained in:
马健
2024-06-27 11:22:26 +08:00
parent 8177d05cd2 bccf2bca5a
commit e0aa944d7d
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
View File

@@ -426,6 +426,22 @@ namespace Tnb.ProductionMgr
status = "0",
use_num = 0,
});
Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result = await _wmsCarryUnbindService.CarryUnbind(new CarryBindInput()
{
org = prdFeedingH.org_id,
create_id = prdFeedingH.create_id,
carry_id = prdFeedingH.carry_id,
carry_code = prdFeedingH.carry_code,
carrystd_id = carry.carrystd_id,
membercarry_code = detail.member_carry_code,
membercarry_id = detail.member_carry_id,
});
if (result.code != JNPF.Common.Enums.HttpStatusCode.OK)
{
throw Oops.Bah(result.msg);
}
if (detail != null)
{
@@ -451,6 +467,7 @@ namespace Tnb.ProductionMgr
{
throw new Exception("没有签收单，无法投料");
}
}
}
else

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

@@ -290,7 +290,9 @@ namespace Tnb.ProductionMgr
if (await _db.Queryable<WmsPretaskH>().AnyAsync(x =>
x.endlocation_id == equipment.upmat_location_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)
))
{
Log.Error($"{equipment.name}存在待下发的任务");
continue;