Commit f79769d2 by pengjinyang

提交

parent f9cea12d
...@@ -12,7 +12,7 @@ namespace Domain.TakeStock ...@@ -12,7 +12,7 @@ namespace Domain.TakeStock
public TakeStockOrder() public TakeStockOrder()
{ {
this.Code = "TSO" + DateTime.Now.ToString("yyMMddHHmmssfff"); this.Code = "TSO" + DateTime.Now.ToString("yyMMddHHmmssfff");
this.CreationTime = DateTime.UtcNow.AddHours(8); this.CreationTime = DateTime.Now;
} }
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)] [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
......
...@@ -25,15 +25,15 @@ namespace Service.TakeStock ...@@ -25,15 +25,15 @@ namespace Service.TakeStock
WarehouseCode = message.WarehouseCode, WarehouseCode = message.WarehouseCode,
IsAutomation = true, IsAutomation = true,
Description = "库存不足发起的系统自动盘点。", Description = "库存不足发起的系统自动盘点。",
CreationTime = DateTime.UtcNow.AddHours(8) CreationTime = DateTime.Now
}; };
List<TakeStockOrder> orders = new List<TakeStockOrder>() List<TakeStockOrder> orders = new List<TakeStockOrder>()
{ {
new TakeStockOrder new TakeStockOrder
{ {
Sku = message.Sku, Sku = message.Sku,
CreationTime = DateTime.UtcNow.AddHours(8) CreationTime = DateTime.Now
} }
}; };
await _takeStockService.CreateTakeStockOrderAsync(schedule, orders); await _takeStockService.CreateTakeStockOrderAsync(schedule, orders);
......
...@@ -52,7 +52,7 @@ namespace Service.TakeStock ...@@ -52,7 +52,7 @@ namespace Service.TakeStock
string[] skus = orders.Select(o => o.Sku).ToArray(); string[] skus = orders.Select(o => o.Sku).ToArray();
if (schedule.IsAutomation) if (schedule.IsAutomation)
{ {
int count = _orderRepository.Count(o => o.WarehouseCode.Equals(schedule.WarehouseCode) && skus.Contains(o.Sku) && o.State != TSOrderState.取消 && o.CreationTime < DateTime.UtcNow.AddHours(8).AddDays(2)); int count = _orderRepository.Count(o => o.WarehouseCode.Equals(schedule.WarehouseCode) && skus.Contains(o.Sku) && o.State != TSOrderState.取消 && o.CreationTime < DateTime.Now.AddDays(2));
if (count > 0) return false; if (count > 0) return false;
} }
......
...@@ -2,6 +2,9 @@ FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base ...@@ -2,6 +2,9 @@ FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
WORKDIR /app WORKDIR /app
EXPOSE 5002 EXPOSE 5002
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& echo 'Asia/Shanghai' >/etc/timezone
FROM microsoft/dotnet:2.2-sdk AS build FROM microsoft/dotnet:2.2-sdk AS build
WORKDIR /src WORKDIR /src
COPY ["TakeStock.API/TakeStock.API.csproj", "TakeStock.API/"] COPY ["TakeStock.API/TakeStock.API.csproj", "TakeStock.API/"]
......
FROM microsoft/dotnet:2.2-runtime AS base FROM microsoft/dotnet:2.2-runtime AS base
WORKDIR /app WORKDIR /app
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& echo 'Asia/Shanghai' >/etc/timezone
FROM microsoft/dotnet:2.2-sdk AS build FROM microsoft/dotnet:2.2-sdk AS build
WORKDIR /src WORKDIR /src
COPY TakeStock.Subscriber/TakeStock.Subscriber.csproj TakeStock.Subscriber/ COPY TakeStock.Subscriber/TakeStock.Subscriber.csproj TakeStock.Subscriber/
......
...@@ -84,14 +84,14 @@ namespace TakeStock.Subscriber ...@@ -84,14 +84,14 @@ namespace TakeStock.Subscriber
WarehouseCode = message.WarehouseCode, WarehouseCode = message.WarehouseCode,
IsAutomation = true, IsAutomation = true,
Description = "库存不足发起的系统自动盘点。", Description = "库存不足发起的系统自动盘点。",
CreationTime = DateTime.UtcNow.AddHours(8), CreationTime = DateTime.Now,
Orders = new List<dynamic>() Orders = new List<dynamic>()
{ {
new new
{ {
WarehouseCode = message.WarehouseCode, WarehouseCode = message.WarehouseCode,
Sku = message.Sku, Sku = message.Sku,
//CreationTime = DateTime.UtcNow.AddHours(8) //CreationTime = TSOrderState
} }
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment