From a0adb6373dbe1d37858998c12e206219dc45ac5c Mon Sep 17 00:00:00 2001
From: chenyong <chenyong@hnkhzn.com>
Date: 星期二, 17 三月 2026 15:36:07 +0800
Subject: [PATCH] 修复用户编辑页面下拉框无最近角色选项问题
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 77 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
index 2a6a2fc..936e7bf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
@@ -75,6 +75,83 @@
}
/// <summary>
+ /// 楠岃瘉缁勭洏鏁版嵁
+ /// </summary>
+ /// <param name="materielGroupDTO">鐗╂枡缁勭洏DTO</param>
+ /// <param name="matSerialNumberDTOs">鎵爜搴忓垪鍙�</param>
+ /// <param name="materielInfos">鐗╂枡淇℃伅</param>
+ /// <param name="materielCodes">鐗╂枡缂栧彿</param>
+ /// <param name="inboundOrder">鍏ュ簱鍗曟嵁</param>
+ /// <param name="stockInfo">缁勭洏淇℃伅</param>
+ /// <returns></returns>
+ //public (bool, string, object?) CheckMaterielGroupParam(MaterielGroupDTO materielGroupDTO, List<MatSerialNumberDTO> matSerialNumberDTOs, List<Dt_MaterielInfo> materielInfos, List<string> materielCodes, Dt_InboundOrder inboundOrder, Dt_StockInfo stockInfo)
+ //{
+ // (bool, string, object?) result = ModelValidate.ValidateModelData(materielGroupDTO);
+ // if (!result.Item1) return result;
+
+ // if (_taskRepository.QueryFirst(x => x.PalletCode == materielGroupDTO.PalletCode) != null)
+ // {
+ // return (false, "璇ユ墭鐩樺彿宸叉湁浠诲姟", materielGroupDTO);
+ // }
+
+ // if (stockInfo != null && !string.IsNullOrEmpty(stockInfo.LocationCode) && stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
+ // {
+ // return (false, "宸蹭笂鏋剁殑鎵樼洏涓嶈兘鍐嶆缁勭洏", materielGroupDTO);
+ // }
+
+ // if (_stockService.StockInfoDetailService.ExistSerialNumbers(materielGroupDTO.SerialNumbers))
+ // {
+ // return (false, "鏈夊簭鍒楀彿鍦ㄥ簱瀛樹腑宸插瓨鍦�", materielGroupDTO);
+ // }
+
+ // if (materielInfos.Count != materielCodes.Count)
+ // {
+ // return (false, "鏈夌墿鏂欎俊鎭湭褰曞叆锛岃褰曞叆鐗╂枡淇℃伅", materielGroupDTO);
+ // }
+
+ // if (materielCodes.Count > 1 && materielInfos.FirstOrDefault(x => !x.IsMixMateriel) != null)
+ // {
+ // return (false, "鏈夌墿鏂欎笉鍙贩鏂欑粍鐩�", materielGroupDTO);
+ // }
+
+ // List<string> batchs = matSerialNumberDTOs.GroupBy(x => x.BatchNo).Select(x => x.Key).ToList();
+ // if (batchs.Count > 1 && materielInfos.FirstOrDefault(x => !x.IsMixMateriel) != null)
+ // {
+ // return (false, "鏈夌墿鏂欎笉鍙贩鎵圭粍鐩�", materielGroupDTO);
+ // }
+
+ // if (inboundOrder == null)
+ // {
+ // return (false, "鍗曟嵁涓嶅瓨鍦�", materielGroupDTO);
+ // }
+
+ // if (inboundOrder.Details == null || inboundOrder.Details.Count == 0)
+ // {
+ // return (false, "鏃犲崟鎹槑缁嗕俊鎭�", materielGroupDTO);
+ // }
+
+ // if (inboundOrder.OrderStatus != InboundStatusEnum.鏈紑濮�.ObjToInt() && inboundOrder.OrderStatus != InboundStatusEnum.鍏ュ簱涓�.ObjToInt())
+ // {
+ // return (false, "璇ュ崟鎹笉鍙啀缁勭洏", materielGroupDTO);
+ // }
+
+ // List<Dt_InboundOrderDetail> inboundOrderDetails = inboundOrder.Details.Where(x => materielCodes.Contains(x.MaterielCode)).ToList();
+
+ // if (inboundOrderDetails.GroupBy(x => x.MaterielCode).Count() != materielCodes.Count)
+ // {
+ // return (false, "鏈夌墿鏂欎笉鍦ㄥ崟鎹唴", materielGroupDTO);
+ // }
+
+ // IGrouping<string, Dt_InboundOrderDetail>? temp = inboundOrder.Details.Where(x => materielCodes.Contains(x.MaterielCode)).GroupBy(x => x.MaterielCode).FirstOrDefault(x => x.Sum(v => v.OverInQuantity) >= x.Sum(v => v.OrderQuantity) || x.Sum(v => v.ReceiptQuantity) >= x.Sum(v => v.OrderQuantity));
+ // if (temp != null)
+ // {
+ // return (false, "鏈夌墿鏂欒秴鍑哄崟鎹暟閲�", materielGroupDTO);
+ // }
+
+ // return (true, "鎴愬姛", materielGroupDTO);
+ //}
+
+ /// <summary>
/// PDA鍒嗛〉鏌ヨ鏁版嵁
/// </summary>
/// <param name="pageNo">椤电爜</param>
--
Gitblit v1.9.3