Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

helongyang

2025-12-19 8f83047945fe40caf9243990ba448f590494dfa4

 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs

@@ -80,6 +80,13 @@
                                                .Where(x => x.LocationCode == param.Value.ToString());
                                        }
                                        break;
                                    case var name when name == nameof(Dt_StockInfo.PalletCode).FirstLetterToLower():
                                        if (!string.IsNullOrEmpty(param.Value?.ToString()))
                                        {
                                            sugarQueryable1 = sugarQueryable1
                                                .Where(x => x.PalletCode == param.Value.ToString());
                                        }
                                        break;

                                    case var name when name == nameof(Dt_StockInfo.CreateDate).FirstLetterToLower():
                                        if (DateTime.TryParse(param.Value?.ToString(), out DateTime minDate))
@@ -115,6 +122,22 @@
                                            }
                                        }
                                        break;
                                    case "inventoryage":
                                        int inventoryage = param.Value.ObjToInt();
                                        if (inventoryage > 0)
                                        {
                                            DateTime dateTime = DateTime.Now.AddDays(-inventoryage);
                                            sugarQueryable1 = sugarQueryable1.Where(x => x.CreateDate >= dateTime);
                                        }
                                        break;
                                    case "inventoryage1":
                                        int inventoryage1 = param.Value.ObjToInt();
                                        if (inventoryage1 > 0)
                                        {
                                            DateTime dateTime = DateTime.Now.AddDays(-inventoryage1);
                                            sugarQueryable1 = sugarQueryable1.Where(x => x.CreateDate <= dateTime);
                                        }
                                        break;
                                }
                            }
                        }