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
This commit is contained in:
马健
2024-10-31 14:21:52 +08:00
parent 448cc1464c b750f2a981
commit 5d6f328aa9
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
View File

@@ -2168,6 +2168,13 @@ namespace Tnb.WarehouseMgr
throw new AppFriendlyException($"【CallRackToProductionLine】不存在料架号为{input.carry_code}的料架！", 500);
}
//如果料架是暂控，不允许齐套呼叫
if(wmsCarryH.is_check== ((int)EnumCheckConclusion.暂控).ToString())
{
Logger.LogWarning($"【CallRackToProductionLine】料架号为{input.carry_code}的料架状态为暂控，不允许呼叫");
throw new AppFriendlyException($"【CallRackToProductionLine】料架号为{input.carry_code}的料架状态为暂控，不允许呼叫！", 500);
}
// 获取产线
OrganizeEntity organizeEntityCX = _db.Queryable<OrganizeEntity>().Where(r => r.Id == organizeEntity.ParentId).First();
if (organizeEntityCX == null)

4
WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceDService.cs
View File

@@ -361,8 +361,8 @@ namespace Tnb.WarehouseMgr
thirdWebapiRecord.third_name = WmsWareHouseConst.BIP;
thirdWebapiRecord.name = "委外加工入库";
thirdWebapiRecord.method = "POST";
thirdWebapiRecord.url = config.value + "uapws/rest/subcontIn/save";
//thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/subcontIn/save";
//thirdWebapiRecord.url = config.value + "uapws/rest/subcontIn/save";
thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/subcontIn/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
thirdWebapiRecord.create_time = DateTime.Now;
thirdWebapiRecord.remark = "【WmsOutsourceDService SaveCheckResult】委外收货单号:" + (wmsOutsourceH?.outsource_order ?? "")+ ",erp委外订单号:" + (wmsPurchaseOrderH?.erp_bill_code ?? "");