合并

刘磊

8 天以前 2de09bec5cc05bf875543fa8956167ca7db73021

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

@@ -71,17 +71,16 @@
        //过盈量下限
        decimal selectionLowerValue = selectionStandards.lowerValue;

        decimal mesStand = 0;
        string level = string.Empty;
        if ("left".Equals(wheelsPosition))  //匹配左轮座轮子
        {
            mesStand = decimal.Parse(CZInfo_Mes.ZLZZJ);
            decimal mesStand = decimal.Parse(CZInfo_Mes.ZLZZJ);
            level = LevelChangeHelper.LevelChangeType(CZInfo_Mes.ZLZDJ);
            WheelsList = WheelsList.Where(x => mesStand - (decimal.Parse(x.Wheels_gkcc)) >= selectionLowerValue && mesStand - (decimal.Parse(x.Wheels_gkcc)) <= selectionUpperValue && x.Wheels_level == level && x.Wheels_NewOrOld == newOrOld).ToList();
        }
        else    //否则匹配右轮座轮子
        {
            mesStand = decimal.Parse(CZInfo_Mes.YLZZJ);
            decimal mesStand = decimal.Parse(CZInfo_Mes.YLZZJ);
            level = LevelChangeHelper.LevelChangeType(CZInfo_Mes.YLZDJ);
            WheelsList = WheelsList.Where(x => mesStand - (decimal.Parse(x.Wheels_gkcc)) >= selectionLowerValue && mesStand - (decimal.Parse(x.Wheels_gkcc)) <= selectionUpperValue && x.Wheels_level == level && x.Wheels_NewOrOld == newOrOld).ToList();
        }
@@ -131,7 +130,7 @@



    public Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld)
    public Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld, string wheelsProps)
    {
        try
        {
@@ -163,6 +162,7 @@
                string Wheels_gkzja = "";
                string Wheels_gkzjb = "";
                string Wheels_gkzjc = "";
                string clsx = "";

                SaveModel saveModel = new SaveModel();
                saveModel.MainData = new Dictionary<string, object>
@@ -173,6 +173,12 @@
                if (webResponse.Status)
                {
                    CLInfo_ZY data = (CLInfo_ZY)webResponse.Data;

                    if(wheelsProps== data.CLSX)
                    {
                        wheelsStocks.Remove(item);
                        continue;
                    }

                    Wheels_gkcc = data.gkcc;
                    // æ¯‚å­”a界面均值
@@ -190,6 +196,7 @@
                    {

                        wheelsStocks.Remove(item);
                        continue;
                    }
                    if (selectionStandards.isCantainGK)
                    {
@@ -210,6 +217,7 @@
                                && ZLZC - (decimal.Parse(Wheels_gkzjc)) < selectionLowerValue_gk && ZLZC - (decimal.Parse(Wheels_gkzjc)) > selectionUpperValue_gk)
                            {
                                wheelsStocks.Remove(item);
                                continue;
                            }
                        }
                        else
@@ -223,6 +231,7 @@
                                && YLZC - (decimal.Parse(Wheels_gkzjc)) >= selectionLowerValue_gk && YLZC - (decimal.Parse(Wheels_gkzjc)) <= selectionUpperValue_gk)
                            {
                                wheelsStocks.Remove(item);
                                continue;
                            }


@@ -242,6 +251,28 @@
        }
    }

    public WebResponseContent InventoryStatistics()
    {
        WebResponseContent content = new WebResponseContent();

        List<Dt_WheelsStock> stockInfos = BaseDal.QueryData();

        //获取车型
        List<string> Wheels_CarTypeList = stockInfos.Select(x => x.Wheels_CarType).Distinct().ToList();

        foreach (var CarType in Wheels_CarTypeList)
        {
            content.Data = stockInfos.Where(x => x.Wheels_CarType == CarType).GroupBy(w => w.Wheels_ldxh)
           .Select(typeGroup => new
           {
               Wheels_CarType = CarType,    //车型
               Wheels_ldxh = typeGroup.Key,
               Count = typeGroup.Count(),

           }).ToList();
        }
        return content;
    }