From ff14cb5d323be1762d3f390c10b2b274e0d0cf68 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Wed, 6 Mar 2024 20:05:05 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Services/TrackOrders/TrackOrderService.cs | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
index 908d7227..5228df92 100644
--- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
+++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
@@ -73,6 +73,11 @@ namespace SJZY.Track.Application.Services.TrackOrders
a.IsCanDelete=trackContent.IsCanDelete;
a.IsExternal = trackContent.IsExternal;
}
+ else
+ {
+ a.IsCanDelete=false;
+ a.IsExternal=false;
+ }
if (a.TrackTimeZoneValue==0f)
{
a.TrackTimeZone=$"GTM{" "}+00:00";
From 350ba56a450ecc48165348ab2a9cb83d6507f0ce Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Wed, 6 Mar 2024 20:11:54 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Services/TrackOrders/TrackOrderService.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
index 5228df92..0e08e188 100644
--- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
+++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
@@ -73,11 +73,11 @@ namespace SJZY.Track.Application.Services.TrackOrders
a.IsCanDelete=trackContent.IsCanDelete;
a.IsExternal = trackContent.IsExternal;
}
- else
- {
- a.IsCanDelete=false;
- a.IsExternal=false;
- }
+ //else
+ //{
+ // a.IsCanDelete=false;
+ // a.IsExternal=false;
+ //}
if (a.TrackTimeZoneValue==0f)
{
a.TrackTimeZone=$"GTM{" "}+00:00";
From 7949fd1dfa8a3ef36d515e86036c22fab53942d8 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Tue, 12 Mar 2024 09:43:19 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=20=20=20=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B,=E5=AE=A2=E6=88=B7=20=E7=9A=84=E8=BF=87?=
=?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProvideServices/GetPageTrackOrderInput.cs | 15 +++++++++++++++
.../Options/GetCamsUrlOptions.cs | 17 +++++++++++++++++
.../Dtos/Order/GetPageTrackOrderInputVO.cs | 15 +++++++++++++++
.../Repositories/OrderRepository.cs | 3 +++
4 files changed, 50 insertions(+)
create mode 100644 src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs
diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
index 81aa553e..26e2e776 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
@@ -17,6 +17,16 @@ public class GetPageTrackOrderInput : PageInfoInput
///
public string? OrderNos { get; set; }
+ ///
+ /// 订单类型
+ ///
+ public int? TrackOrderType { get; set; }
+
+ ///
+ /// 客户id
+ ///
+ public int? CustomerId { get; set; }
+
///
/// 创建时间开始
///
@@ -73,6 +83,11 @@ public class TrackOrderDto
///
public string? CustomerCode { get; set; }
+ ///
+ /// 客户id
+ ///
+ public int CustomerId { get; set; }
+
///
/// 订单明细（json）
///
diff --git a/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs b/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs
new file mode 100644
index 00000000..82677724
--- /dev/null
+++ b/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs
@@ -0,0 +1,17 @@
+using SJZY.Expand.ABP.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SJZY.Track.Application.Options
+{
+ public class GetCamsUrlOptions : IOptionAutoInjection
+ {
+ ///
+ /// 2.5URL
+ ///
+ public string? Cams25URL { get; set; }
+ }
+}
diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
index c1b97cc5..67d955f9 100644
--- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
@@ -24,6 +24,16 @@ namespace SJZY.Track.Domain.Dtos.Order
///
public string? OrderNos { get; set; }
+ ///
+ /// 订单类型
+ ///
+ public int? TrackOrderType { get; set; }
+
+ ///
+ /// 客户id
+ ///
+ public int? CustomerId { get; set; }
+
///
/// 创建时间开始
///
@@ -75,6 +85,11 @@ namespace SJZY.Track.Domain.Dtos.Order
///
public string? CustomerCode { get; set; }
+ ///
+ /// 客户id
+ ///
+ public int CustomerId { get; set; }
+
/////
///// 订单明细（json）
/////
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index 481a5c87..0348c347 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -137,6 +137,8 @@ public class OrderRepository : BasicRepository, IOrderRepository, I
(a, b, c) => a.CreateTime >= input.CreateTimeStart)
.WhereIF((!input.CreateTimeStart.HasValue) && input.CreateTimeEnd.HasValue,
(a, b, c) => a.CreateTime <= input.CreateTimeEnd)
+ .WhereIF(input.CustomerId>0, (a, b, c) => a.CustomId==input.CustomerId)
+ .WhereIF(input.TrackOrderType>0, (a, b, c) => a.OrderType==input.TrackOrderType)
.OrderByDescending((a, b, c) => a.CreateTime)
.Select((a, b, c) => new TrackOrderVO
{
@@ -148,6 +150,7 @@ public class OrderRepository : BasicRepository, IOrderRepository, I
.Return("箱/袋单").ElseIF(a.OrderType == 4).Return("FBA订单").End(""),
CustomerShortName = b.Abbreviation,
CustomerCode = b.Code,
+ CustomerId = a.CustomId,
//TrackTemplateNames = SqlFunc.Subqueryable()
// .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id)
// .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Name, ","),
From 8f856726255e5bc8b5c12a20cf95d1771564ea79 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Tue, 12 Mar 2024 09:43:19 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=20=20=20=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B,=E5=AE=A2=E6=88=B7=20=E7=9A=84=E8=BF=87?=
=?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProvideServices/GetPageTrackOrderInput.cs | 15 +++++++++++++++
.../Options/GetCamsUrlOptions.cs | 17 +++++++++++++++++
.../Dtos/Order/GetPageTrackOrderInputVO.cs | 15 +++++++++++++++
.../Repositories/OrderRepository.cs | 3 +++
4 files changed, 50 insertions(+)
create mode 100644 src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs
diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
index 81aa553e..26e2e776 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
@@ -17,6 +17,16 @@ public class GetPageTrackOrderInput : PageInfoInput
///
public string? OrderNos { get; set; }
+ ///
+ /// 订单类型
+ ///
+ public int? TrackOrderType { get; set; }
+
+ ///
+ /// 客户id
+ ///
+ public int? CustomerId { get; set; }
+
///
/// 创建时间开始
///
@@ -73,6 +83,11 @@ public class TrackOrderDto
///
public string? CustomerCode { get; set; }
+ ///
+ /// 客户id
+ ///
+ public int CustomerId { get; set; }
+
///
/// 订单明细（json）
///
diff --git a/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs b/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs
new file mode 100644
index 00000000..82677724
--- /dev/null
+++ b/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs
@@ -0,0 +1,17 @@
+using SJZY.Expand.ABP.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SJZY.Track.Application.Options
+{
+ public class GetCamsUrlOptions : IOptionAutoInjection
+ {
+ ///
+ /// 2.5URL
+ ///
+ public string? Cams25URL { get; set; }
+ }
+}
diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
index c1b97cc5..67d955f9 100644
--- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
@@ -24,6 +24,16 @@ namespace SJZY.Track.Domain.Dtos.Order
///
public string? OrderNos { get; set; }
+ ///
+ /// 订单类型
+ ///
+ public int? TrackOrderType { get; set; }
+
+ ///
+ /// 客户id
+ ///
+ public int? CustomerId { get; set; }
+
///
/// 创建时间开始
///
@@ -75,6 +85,11 @@ namespace SJZY.Track.Domain.Dtos.Order
///
public string? CustomerCode { get; set; }
+ ///
+ /// 客户id
+ ///
+ public int CustomerId { get; set; }
+
/////
///// 订单明细（json）
/////
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index be9cc648..2516bb94 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -137,6 +137,8 @@ public class OrderRepository : BasicRepository, IOrderRepository, I
(a, b, c) => a.CreateTime >= input.CreateTimeStart)
.WhereIF((!input.CreateTimeStart.HasValue) && input.CreateTimeEnd.HasValue,
(a, b, c) => a.CreateTime <= input.CreateTimeEnd)
+ .WhereIF(input.CustomerId>0, (a, b, c) => a.CustomId==input.CustomerId)
+ .WhereIF(input.TrackOrderType>0, (a, b, c) => a.OrderType==input.TrackOrderType)
.OrderByDescending((a, b, c) => a.CreateTime)
.Select((a, b, c) => new TrackOrderVO
{
@@ -148,6 +150,7 @@ public class OrderRepository : BasicRepository, IOrderRepository, I
.Return("箱/袋单").ElseIF(a.OrderType == 4).Return("FBA订单").End(""),
CustomerShortName = b.Abbreviation,
CustomerCode = b.Code,
+ CustomerId = a.CustomId,
//TrackTemplateNames = SqlFunc.Subqueryable()
// .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id)
// .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Name, ","),
From 4e96eab54b3656a6c7da88e3301c1574de0fcd2c Mon Sep 17 00:00:00 2001
From: dingenwen <543338760@qq.com>
Date: Wed, 13 Mar 2024 10:54:45 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Dtos/Order/GetPageTrackOrderInputVO.cs | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
index ccd9d467..8407e59b 100644
--- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
@@ -43,16 +43,6 @@ namespace SJZY.Track.Domain.Dtos.Order
///
public string? OrderNos { get; set; }
- ///
- /// 订单类型
- ///
- public int? TrackOrderType { get; set; }
-
- ///
- /// 客户id
- ///
- public int? CustomerId { get; set; }
-
///
/// 创建时间开始
///