1

yangpeixing

昨天 aa4aa67abfdf69e30d5076451716e5aba11d5ec0

 WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs

@@ -161,6 +161,7 @@
                    return WebResponseContent.Instance.Error($"未找到入库单明细信息");
                }
                List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serialNumbers);

                //验证判断时间格式
                WebResponseContent IsValidContent = IsValidMCDates(models);
                if (!IsValidContent.Status)
@@ -180,11 +181,7 @@
                {
                    inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.LotNo ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
                }
                else
                {
                    inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.BatchNo == (models.FirstOrDefault()?.LotNo ?? "")).ToList();
                }

 

                if (inboundOrderDetails == null || inboundOrderDetails.Count <= 0)
                {
@@ -266,11 +263,6 @@
                    {
                        notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
                    }
                    else
                    {
                        notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
                    }


                    if (notGroupDetail == null)
                    {
@@ -366,26 +358,29 @@
                    string json = JsonConvert.SerializeObject(item);
                    Dictionary<string, object> delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);

                    string serialNumber = string.Empty;
                    decimal quantity = 0;

                    // 第一步：读取serialNumber并校验
                    if (delKeyDict.TryGetValue("serialNumber", out object serialNumberObj))
                    {
                        string serialNumber = serialNumberObj?.ToString();
                        if (!string.IsNullOrEmpty(serialNumber))
                        {
                            serialNumbers.Add(serialNumber);
                        }
                        else
                        serialNumber = serialNumberObj?.ToString();
                        if (string.IsNullOrEmpty(serialNumber))
                        {
                            return WebResponseContent.Instance.Error("serialNumber的值为空");
                        }
                    }
                    else
                    {
                        return WebResponseContent.Instance.Error("缺少serialNumber字段");
                    }

                    if (delKeyDict.TryGetValue("quantity", out object quantityObj))
                    {
                        if (quantityObj == null)
                        {
                            return WebResponseContent.Instance.Error("物料数量的值为空");
                        }
                        decimal quantity;
                        try
                        {
                            quantity = Convert.ToDecimal(quantityObj);
@@ -398,13 +393,30 @@
                        {
                            return WebResponseContent.Instance.Error("物料数量必须大于0");
                        }

                        quantitys.Add(quantity);
                    }
                    else
                    {
                        return WebResponseContent.Instance.Error("缺少物料数量字段");
                    }

                    var keyValuePairs = serialNumber.Split(','); 
                    List<string> newKeyValuePairs = new List<string>();
                    bool qFieldUpdated = false;

                    foreach (var pair in keyValuePairs)
                    {
                        if (pair.StartsWith("Q:"))
                        {
                            newKeyValuePairs.Add($"Q:{quantity}");
                            qFieldUpdated = true;
                        }
                        else
                        {
                            newKeyValuePairs.Add(pair);
                        }
                    }
                    string updatedSerialNumber = string.Join(',', newKeyValuePairs);
                    serialNumbers.Add(updatedSerialNumber); 
                }
                Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
                if (warehouse == null)
@@ -464,12 +476,17 @@
                    return WebResponseContent.Instance.Error($"托盘号重复,该托盘已组过物料");
                }
                List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
                _unitOfWorkManage.BeginTran();
                foreach (var model in models)
                {

                    Dt_InboundOrderDetail notGroupDetail = new Dt_InboundOrderDetail();

                    notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
                    notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == model.Quantity).FirstOrDefault();
                    if (notGroupDetail == null)
                    {
                        return WebResponseContent.Instance.Error($"请检查物料信息条码和入库单明细是否对应正确");
                    }

                    if (notGroupDetail.MaterielType == 1)
                    {
@@ -531,7 +548,7 @@

                inboundOrder.OrderStatus = InOrderStatusEnum.入库中.ObjToInt();

                _unitOfWorkManage.BeginTran();

                if (stockInfo.Id == 0)
                {
                    _stockRepository.StockInfoRepository.Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
@@ -1746,7 +1763,7 @@
            {
                int pageNo = saveModel.MainData["pageNo"].ObjToInt();
                string? orderNo = saveModel.MainData["orderNo"].ToString();
                int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
                int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();                                                                         
                List<Dt_InboundOrder> dt_ReceiveOrders = new List<Dt_InboundOrder>();
                if (string.IsNullOrEmpty(orderNo))
                {
@@ -1756,7 +1773,16 @@
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 50);
                }

                if(dt_ReceiveOrders == null || dt_ReceiveOrders.Count == 0)
                {
                    List<int> orderNos = _inboundOrderDetailService.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.MaterielCode.Contains(orderNo)).Select(x => x.OrderId).Distinct().ToList();
                    foreach (var item in orderNos)
                    {
                       Dt_InboundOrder inboundOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.Id == item) && x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).First();
                        dt_ReceiveOrders.Add(inboundOrders);
                    }
                }
    
                content.OK(data: dt_ReceiveOrders);
            }
            catch (Exception ex)