From 1a3113b9c27e10090d1ea49e3607e6d85d1a7102 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 16 Apr 2024 11:54:04 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c8ca7a1..f28f0272 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,14 +5,14 @@ WORKDIR /app # 配置apt的资源，采用阿里云资源仓库 必须是debian 10 buster版本 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-src http://mirrors.cloud.aliyuncs.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-src http://mirrors.cloud.aliyuncs.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-src http://mirrors.cloud.aliyuncs.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-src http://mirrors.cloud.aliyuncs.com/debian/ buster-backports 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.aliyun.com/debian/ buster main non-free contrib" >>/etc/apt/sources.list && \ + echo "deb http://mirrors.aliyun.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.aliyun.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.aliyun.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 #安装apt-get 安装 libc6-dev , libgdiplus 用于支持system.drawing 组件绘制,默认ubuntu命令 RUN apt-get update -qq && apt-get -y install libgdiplus libc6-dev From e4b12de86f8a70e6aa4040b6327a8769c23afe16 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 16 Apr 2024 13:56:02 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index f28f0272..33cd63b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,31 +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 - -# 配置apt的资源，采用阿里云资源仓库 必须是debian 10 buster版本 -RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \ - echo "deb http://mirrors.aliyun.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.aliyun.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.aliyun.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.aliyun.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 #安装apt-get 安装 libc6-dev , libgdiplus 用于支持system.drawing 组件绘制,默认ubuntu命令 RUN apt-get update -qq && apt-get -y install libgdiplus libc6-dev EXPOSE 80 EXPOSE 443 -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" From d2dd2743a3191f2a902f730a9d8fe3b24cac8517 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 16 Apr 2024 13:59:44 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 33cd63b1..e99754fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,10 @@ RUN apt-get update -qq && apt-get -y install libgdiplus libc6-dev EXPOSE 80 EXPOSE 443 +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 mcr.microsoft.com/dotnet/sdk:3.1 AS build WORKDIR /src COPY ["src/WMS.Web.Api/WMS.Web.Api.csproj", "src/WMS.Web.Api/"] From c05867b5184244bea4925b629e994bb4fc4dbfef Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 16 Apr 2024 14:03:27 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Dockerfile b/Dockerfile index e99754fc..95491b18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,18 @@ FROM mcr.microsoft.com/dotnet/aspnet:3.1 AS base WORKDIR /app + +# 配置apt的资源，采用阿里云资源仓库 必须是debian 10 buster版本 +RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \ + echo "deb http://mirrors.aliyun.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.aliyun.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.aliyun.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.aliyun.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 + #安装apt-get 安装 libc6-dev , libgdiplus 用于支持system.drawing 组件绘制,默认ubuntu命令 RUN apt-get update -qq && apt-get -y install libgdiplus libc6-dev From 27602dc493719e1f9d78524ef896a9e394516fac Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 16 Apr 2024 14:14:53 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Repositories/OutStockTaskRepositories.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index d6d9c144..3ce221cc 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -279,13 +279,13 @@ namespace WMS.Web.Repositories List taskIds = new List(); //搴忓垪鐮佸嚭搴撳崟 - if (dto.SerialNumbers.Count() > 0) + if (dto.SerialNumbers != null && dto.SerialNumbers.Count() > 0) { 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)); From d86033b30beae43b0f8b4add8f240eea043bf33e Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 16 Apr 2024 14:15:30 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 95491b18..79772b4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,15 +4,15 @@ FROM mcr.microsoft.com/dotnet/aspnet:3.1 AS base WORKDIR /app # 配置apt的资源，采用阿里云资源仓库 必须是debian 10 buster版本 -RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \ - echo "deb http://mirrors.aliyun.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.aliyun.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.aliyun.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.aliyun.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 +#RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \ + #echo "deb http://mirrors.aliyun.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.aliyun.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.aliyun.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.aliyun.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 #安装apt-get 安装 libc6-dev , libgdiplus 用于支持system.drawing 组件绘制,默认ubuntu命令 RUN apt-get update -qq && apt-get -y install libgdiplus libc6-dev From 0ed14f257c7e5ebcb450998770c73cfc29e169bc Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 16 Apr 2024 14:34:39 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Repositories/OutStockTaskRepositories.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 3ce221cc..fb6970a1 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -277,7 +277,9 @@ namespace WMS.Web.Repositories if (customer_result.IsSuccess) customers = customer_result.Data.ToList(); - List taskIds = new List(); + List taskIds = null; + List taskIds_s = new List(); + List taskIds_b = new List(); //搴忓垪鐮佸嚭搴撳崟 if (dto.SerialNumbers != null && dto.SerialNumbers.Count() > 0) { @@ -288,7 +290,11 @@ namespace WMS.Web.Repositories 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.AddRange(res.Select(s => s.TaskId)); + else + taskIds = res.Select(s => s.TaskId).Intersect(taskIds).ToList(); } #endregion @@ -332,7 +338,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)); } From ecfe26c1ce14786a3e7a5a63b480f6b8e0329cae Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 16 Apr 2024 14:51:08 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Repositories/OutStockTaskRepositories.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index fb6970a1..89c3707e 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -283,6 +283,7 @@ namespace WMS.Web.Repositories //搴忓垪鐮佸嚭搴撳崟 if (dto.SerialNumbers != null && dto.SerialNumbers.Count() > 0) { + taskIds = new List(); var res = await _outStockRepositories.GetEntityListBySerialNumbers(dto.SerialNumbers); taskIds.AddRange(res.Select(s => s.TaskId)); } @@ -292,7 +293,10 @@ namespace WMS.Web.Repositories var res = await _outStockRepositories.GetEntityListByBoxBillNos(dto.BoxBillNos); //瑕佽窡涓婇潰鐨勫簭鍒楃爜鎼滅储鍙栦氦闆 if (taskIds == null) + { + taskIds = new List(); taskIds.AddRange(res.Select(s => s.TaskId)); + } else taskIds = res.Select(s => s.TaskId).Intersect(taskIds).ToList(); }