Merge branch 'v1.0.5' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api into v1.0.5

Dockerfile

@@ -1,18 +1,19 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM registry.cn-hangzhou.aliyuncs.com/yz-ops/base-module:aspnet3.1 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:3.1 AS base
 WORKDIR /app
 
 # <20><><EFBFBD><EFBFBD>apt<70><74><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4><EFBFBD><EFBFBD><EFBFBD>ð<EFBFBD><C3B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD>ֿ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>debian 10 buster<65>汾
-RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
+#RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
-   echo "deb http://mirrors.cloud.aliyuncs.com/debian/ buster main non-free contrib" >/etc/apt/sources.list && \
+   #echo "deb http://mirrors.aliyun.com/debian/ buster main non-free contrib" >/etc/apt/sources.list && \
-   echo "deb-src http://mirrors.cloud.aliyuncs.com/debian/ buster main non-free contrib" >>/etc/apt/sources.list && \
+   #echo "deb-src http://mirrors.aliyun.com/debian/ buster main non-free contrib" >>/etc/apt/sources.list && \
-   echo "deb http://mirrors.cloud.aliyuncs.com/debian-security buster/updates main" >>/etc/apt/sources.list && \
+   #echo "deb http://mirrors.aliyun.com/debian-security buster/updates main" >>/etc/apt/sources.list && \
-   echo "deb-src http://mirrors.cloud.aliyuncs.com/debian-security buster/updates main" >>/etc/apt/sources.list && \
+   #echo "deb-src http://mirrors.aliyun.com/debian-security buster/updates main" >>/etc/apt/sources.list && \
-   echo "deb http://mirrors.cloud.aliyuncs.com/debian/ buster-updates main non-free contrib" >>/etc/apt/sources.list && \
+   #echo "deb http://mirrors.aliyun.com/debian/ buster-updates main non-free contrib" >>/etc/apt/sources.list && \
-   echo "deb-src http://mirrors.cloud.aliyuncs.com/debian/ buster-updates main non-free contrib" >>/etc/apt/sources.list && \
+   #echo "deb-src http://mirrors.aliyun.com/debian/ buster-updates main non-free contrib" >>/etc/apt/sources.list && \
-   echo "deb http://mirrors.cloud.aliyuncs.com/debian/ buster-backports main non-free contrib" >>/etc/apt/sources.list && \
+   #echo "deb http://mirrors.aliyun.com/debian/ buster-backports main non-free contrib" >>/etc/apt/sources.list && \
-   echo "deb-src http://mirrors.cloud.aliyuncs.com/debian/ buster-backports main non-free contrib" >>/etc/apt/sources.list
+   #echo "deb-src http://mirrors.aliyun.com/debian/ buster-backports main non-free contrib" >>/etc/apt/sources.list
+
 #<23><>װapt-get <20><>װ libc6-dev , libgdiplus  <20><><EFBFBD><EFBFBD>֧<EFBFBD><D6A7>system.drawing <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,Ĭ<><C4AC>ubuntu<74><75><EFBFBD><EFBFBD>
 RUN apt-get update -qq && apt-get -y install libgdiplus libc6-dev
 
@@ -23,9 +24,12 @@ COPY ["src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml", "/app/WMS.Web.Api.xml"]
 COPY ["src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml", "/app/WMS.Web.Core.xml"]
 COPY ["src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml", "/app/WMS.Web.Domain.xml"]
 
-FROM registry.cn-hangzhou.aliyuncs.com/yz-ops/base-module:aspnetsdk3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
 WORKDIR /src
 COPY ["src/WMS.Web.Api/WMS.Web.Api.csproj", "src/WMS.Web.Api/"]
+COPY ["src/WMS.Web.Repositories/WMS.Web.Repositories.csproj", "src/WMS.Web.Repositories/"]
+COPY ["src/WMS.Web.Domain/WMS.Web.Domain.csproj", "src/WMS.Web.Domain/"]
+COPY ["src/WMS.Web.Core/WMS.Web.Core.csproj", "src/WMS.Web.Core/"]
 RUN dotnet restore "src/WMS.Web.Api/WMS.Web.Api.csproj"
 COPY . .
 WORKDIR "/src/src/WMS.Web.Api"

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -277,18 +277,28 @@ namespace WMS.Web.Repositories
             if (customer_result.IsSuccess)
                 customers = customer_result.Data.ToList();
 
-            List<int> taskIds = new List<int>();
+            List<int> taskIds = null;
+            List<int> taskIds_s = new List<int>();
+            List<int> taskIds_b = new List<int>();
             //序列码出库单
-            if (dto.SerialNumbers.Count() > 0)
+            if (dto.SerialNumbers != null && dto.SerialNumbers.Count() > 0)
             {
+                taskIds = new List<int>();
                 var res = await _outStockRepositories.GetEntityListBySerialNumbers(dto.SerialNumbers);
                 taskIds.AddRange(res.Select(s => s.TaskId));
             }
             //箱号取出库单
-            if (dto.BoxBillNos.Count() > 0)
+            if (dto.BoxBillNos != null && dto.BoxBillNos.Count() > 0)
             {
                 var res = await _outStockRepositories.GetEntityListByBoxBillNos(dto.BoxBillNos);
-                taskIds.AddRange(res.Select(s => s.TaskId));
+                //要跟上面的序列码搜索取交集
+                if (taskIds == null)
+                {
+                    taskIds = new List<int>();
+                    taskIds.AddRange(res.Select(s => s.TaskId));
+                }
+                else
+                    taskIds = res.Select(s => s.TaskId).Intersect(taskIds).ToList();
             }
             #endregion
 
@@ -332,7 +342,7 @@ namespace WMS.Web.Repositories
                 DateTime dt_end = ((DateTime)dto.CreateEndDate).AddDays(1);
                 query = query.Where(w => w.order.OperateTime <= dt_end);
             }
-            if (taskIds.Count() > 0)
+            if (taskIds != null)
             {
                 query = query.Where(w => taskIds.Contains(w.order.Id));
             }