From 4f8cbd783208925be8ccbfed198b86e20523ec0e Mon Sep 17 00:00:00 2001 From: chenyong <chenyong@hnkhzn.com> Date: 星期一, 09 六月 2025 19:26:06 +0800 Subject: [PATCH] 更新最新代码 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 48 ++++++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 26 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs index 86d8a12..8cfd6d0 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs @@ -636,7 +636,6 @@ case (int)TaskOutboundTypeEnum.OutTray: case (int)TaskOutboundTypeEnum.Outbound: case (int)TaskOutboundTypeEnum.OutNG: - case (int)TaskOutboundTypeEnum.OutQuality: LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", ""); return await CompleteStackTaskAsync(task, stock); @@ -905,8 +904,8 @@ // 鑾峰彇缁勭洏淇℃伅 private DtBoxingInfo CreateBoxingInfo(ResultTrayCellsStatus result, string palletCode) - { - var boxing=_boxingInfoRepository.QueryFirst(x=>x.PalletCode== palletCode); + { + var boxing=_boxingInfoRepository.QueryFirst(x=>x.PalletCode == palletCode); if (boxing == null) { return new DtBoxingInfo @@ -925,8 +924,7 @@ }).ToList() }; } - else - { + else { _boxingInfoRepository.DeleteData(boxing); return new DtBoxingInfo { @@ -934,16 +932,17 @@ IsFull = true, ProcessCode = result.ProcessCode, ProductionLine = result.ProductionLine, - BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail + BoxingInfoDetails = result.SerialNos.Select(seriaINoObj => new DtBoxingInfoDetail { - SerialNumber = serialNoObj.SerialNo, - OrderNo = serialNoObj.PositionNo.ToString(), - Status = serialNoObj.SerialNoStatus, + SerialNumber = seriaINoObj.SerialNo, + OrderNo = seriaINoObj.PositionNo.ToString(), + Status = seriaINoObj.SerialNoStatus, MaterielCode = result.BindCode, Remark = result.TrayBarcodePropertys.ToJsonString(), }).ToList() }; } + } // 鑾峰彇宸ヨ壓鐢宠 @@ -981,7 +980,6 @@ DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound ? areaCode != "CWSC1" ? await QueryStockInfoForRealTrayAsync(areaCode, areaCodes, productionLine) : await QueryStockInfoForRealTrayCWAsync(areaCodes, productionLine) : await QueryStockInfoForEmptyTrayAsync(areaCode, position); - if (stockInfo == null) { return content.Error("搴撳瓨淇℃伅涓嶅瓨鍦�"); @@ -1314,7 +1312,7 @@ } else { - task = CreateTask(stockInfo, "1049-1", taskType); + task = CreateTask(stockInfo, "1049-8", taskType); } } @@ -1740,23 +1738,21 @@ // 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷 try { - foreach (object item in key) + Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == Convert.ToInt32(key[0])); + if (task == null) { - Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == Convert.ToInt32(key)); - if (task == null) - { - return content.Error("鏈壘鍒颁换鍔′俊鎭�!"); - } - var taskHtyNG = CreateHistoricalTask(task, true); - - // 鎵ц鏁版嵁搴撲簨鍔� - - // 娣诲姞鍘嗗彶浠诲姟 - var isTaskHtyAdd = _task_HtyRepository.AddData(taskHtyNG) > 0; - - // 鍒犻櫎浠诲姟鏁版嵁 - var isTaskDelete = BaseDal.Delete(task.TaskId); + return content.Error("鏈壘鍒颁换鍔′俊鎭�!"); } + var taskHtyNG = CreateHistoricalTask(task, true); + + // 鎵ц鏁版嵁搴撲簨鍔� + + // 娣诲姞鍘嗗彶浠诲姟 + var isTaskHtyAdd = _task_HtyRepository.AddData(taskHtyNG) > 0; + + // 鍒犻櫎浠诲姟鏁版嵁 + var isTaskDelete = BaseDal.Delete(task.TaskId); + return content.OK("鍒犻櫎鎴愬姛!"); } catch (Exception ex) -- Gitblit v1.9.3