代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/546a11e0-2bd3-4903-841b-15b52533e4a5.vsidxBinary files differ
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b3ff8cae-0d0c-44b1-81c8-76364bcbcc59.vsidxBinary files differ
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d3040580-b0c0-4b7f-9042-dbd4f6a9f170.vsidxBinary files differ
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f92882d8-4e0e-4795-94b2-8f092cc43277.vsidxBinary files differ
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/02143a0b-3339-4244-b940-0fc56a40a2ae.vsidxBinary files differ
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ad44b81-9ed8-4255-81aa-b4f028e8b1a1.vsidxBinary files differ
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/95dfa365-884c-4ece-a3ca-62ce53715147.vsidxBinary files differ
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/98ed975f-9c5d-4415-a74e-4ea6f143bac6.vsidxBinary files differ
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cbb2749c-e26a-40e0-8942-21d353d51a87.vsidxBinary files differ
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/QMSReceiveCheckModel.cs
@@ -8,6 +8,7 @@ { public class QMSReceiveCheckModel { public string UniqueTag { get; set; } /// <summary> /// 鏀惰揣鍗曞彿 /// </summary> 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs
@@ -329,10 +329,22 @@ } _inboundRepository.ReceiveOrderRepository.UpdateData(receiveOrder); _inboundRepository.PurchaseOrderDetailRepository.UpdateData(purchaseOrderDetail); if (materielInfo.IsCheck == WhetherEnum.True) { Dt_CheckOrder checkOrder = _mapper.Map<Dt_CheckOrder>(receiveOrderDetail); checkOrder.ReceiveOrderNo = receiveOrder.ReceiveOrderNo; checkOrder.Result = CheckAcceptEnum.NotCheckAccept.ToString(); checkOrder.QualifiedQuantity = 0; checkOrder.ReceiveDetailRowNo = receiveOrderDetail.RowNo; checkOrder.WarehouseId = receiveOrder.WarehouseId; checkOrder.ScrappedQuantity = 0; checkOrder.MaterielSpec = materielInfo.MaterielSpec; checkOrder.ReturnQuantity = 0; checkOrder.DefectedQuantity = 0; int id = _checkOrderRepository.AddData(checkOrder); QMSReceiveCheckModel qMSReceiveCheck = new QMSReceiveCheckModel() { UniqueTag = id.ToString(), EntryNumber=receiveOrder.ReceiveOrderNo, MaterialCode=receiveOrderDetail.MaterielCode, MaterialName=receiveOrderDetail.MaterielName, @@ -353,28 +365,15 @@ { throw new Exception(mesResponseContent.StrMsg); } ReceiveResultDTO receiveResult = JsonConvert.DeserializeObject<ReceiveResultDTO>(mesResponseContent.Content.ToString()); ReceiveResultDTO? receiveResult = JsonConvert.DeserializeObject<ReceiveResultDTO>(mesResponseContent.Content.ToString()); if (receiveResult==null) { throw new Exception("鎺ユ敹QMS缁撴灉澶辫触"); } #region 娉ㄩ噴 if (materielInfo.IsCheck == WhetherEnum.True) { Dt_CheckOrder checkOrder = _mapper.Map<Dt_CheckOrder>(receiveOrderDetail); checkOrder.CheckOrderNo = receiveResult.InspectionNumber; checkOrder.ReceiveOrderNo = receiveOrder.ReceiveOrderNo; checkOrder.Result = CheckAcceptEnum.NotCheckAccept.ToString(); checkOrder.QualifiedQuantity = 0; checkOrder.ReceiveDetailRowNo = receiveOrderDetail.RowNo; checkOrder.WarehouseId = receiveOrder.WarehouseId; checkOrder.ScrappedQuantity = 0; checkOrder.MaterielSpec = materielInfo.MaterielSpec; checkOrder.ReturnQuantity = 0; checkOrder.DefectedQuantity = 0; _checkOrderRepository.AddData(checkOrder); Dt_CheckOrder _CheckOrder = _checkOrderRepository.QueryFirst(x => x.CheckOrderId == id); _CheckOrder.CheckOrderNo = receiveResult.InspectionNumber; _checkOrderRepository.UpdateData(_CheckOrder); } #endregion _unitOfWorkManage.CommitTran(); }
@@ -94,7 +94,10 @@ TaskStatus = 0, TaskType = TaskTypeEnum.Relocation.ObjToInt() }; if (stockInfo.StockLength>0) { newTask.TaskLength = stockInfo.StockLength; } _unitOfWorkManage.BeginTran(); Repository.AddData(newTask); { 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs
@@ -254,9 +254,9 @@ /// <param name="model"></param> /// <returns></returns> [HttpPost, Route("CheckResultReturn"), AllowAnonymous, MethodParamsValidate] public MesResponseContent CheckResultReturn([FromBody] ERPCheckModel model) public MesResponseContent CheckResultReturn([FromBody] Root<ERPCheckModel> model) { string content = _invokeERPService.InvokeCheckOrderApi(model); string content = _invokeERPService.InvokeCheckOrderApi(model.Content); ErpRequestContent requestContent = content.DeserializeObject<ErpRequestContent>(); if (requestContent.res != 1) {
