1

huanghongfeng

2 天以前 a34059e688e947a2ea079a0646872f1a21089940

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs

@@ -69,12 +69,13 @@
        }
    }

    public Dt_WheelsStock GetSelectionWheelsStock(List<Dt_WheelsStock> WheelsList, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld)
    public Dt_WheelsStock GetSelectionWheelsStock(List<Dt_WheelsStock> WheelsList, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld,int xuanpeicount)
    {
        //过盈量上限
        decimal selectionUpperValue = selectionStandards.upperValue;
        //过盈量下限
        decimal selectionLowerValue = selectionStandards.lowerValue;


        string level = string.Empty;
        if ("left".Equals(wheelsPosition))  //匹配左轮座轮子
@@ -130,7 +131,16 @@
                    ).ToList();
            }
        }
        return WheelsList.OrderBy(x => x.CreateDate).FirstOrDefault();

        if (newOrOld == "1" && xuanpeicount==2)
        {
            return WheelsList.OrderBy(x => decimal.Parse(x.Wheels_ygljz)).FirstOrDefault();
        }
        else
        {
            return WheelsList.OrderBy(x => x.CreateDate).FirstOrDefault();

        }
    }