diff --git a/TradeManageNew/Models/Shage/GetOrderUsedSaleDto.cs b/TradeManageNew/Models/Shage/GetOrderUsedSaleDto.cs
deleted file mode 100644
index d0f0978..0000000
--- a/TradeManageNew/Models/Shage/GetOrderUsedSaleDto.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System.Collections.Generic;
-
-namespace TradeManageNew.Models.Shage
-{
- public class GetOrderUsedSaleDto
- {
- public int OrderId { get; set; }
-
- ///
- /// 订单号
- ///
- public string OrderCode { get; set; }
-
- ///
- /// 平台单号
- ///
- public string PlatOrderCode { get; set; }
-
- ///
- /// 收件人
- ///
- public string RevName { get; set; }
-
- ///
- /// 收件国家
- ///
- public string RevCountry { get; set; }
-
- ///
- /// 收件地址
- ///
- public string RevAddr { get; set; }
-
- ///
- /// 收件人电话
- ///
- public string RevPhone { get; set; }
-
- ///
- /// 邮编
- ///
- public string RevPostCode { get; set; }
-
- ///
- /// 店铺名称
- ///
- public string ShopName { get; set; }
-
- ///
- /// sku明细
- ///
- public List Items { get; set; } = new List();
- }
-
- public class GetOrderUsedSaleItemDto
- {
- ///
- /// 产品编码
- ///
- public string ProductCode { get; set; }
-
- ///
- /// 产品描述
- ///
- public string ProductDescription { get; set; }
-
- ///
- /// SKU ID
- ///
- public int GoodsDetailId { get; set; }
-
- ///
- /// sku编码
- ///
- public string SkuCode { get; set; }
-
- ///
- /// 数量
- ///
- public int Quantity { get; set; }
- }
-}
\ No newline at end of file
diff --git a/TradeManageNew/Models/Shage/GetOrderUsedSaleInput.cs b/TradeManageNew/Models/Shage/GetOrderUsedSaleInput.cs
deleted file mode 100644
index e274819..0000000
--- a/TradeManageNew/Models/Shage/GetOrderUsedSaleInput.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace TradeManageNew.Models.Shage
-{
- public class GetOrderUsedSaleInput
- {
- ///
- /// 跟踪号
- ///
- public string TrackingCode { get; set; }
- }
-}
\ No newline at end of file
diff --git a/TradeManageNew/Models/Shage/OrderUsedSaleEntryInput.cs b/TradeManageNew/Models/Shage/OrderUsedSaleEntryInput.cs
deleted file mode 100644
index 807d854..0000000
--- a/TradeManageNew/Models/Shage/OrderUsedSaleEntryInput.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using TradeUsedSale.Enums;
-
-namespace TradeManageNew.Models.Shage
-{
- public class OrderUsedSaleEntryInput
- {
- ///
- /// 订单号
- ///
- public string OrderCode { get; set; }
-
- ///
- /// SKU Code
- ///
- public string GoodsCode { get; set; }
-
- ///
- /// 数量
- ///
- public int Quantity { get; set; }
-
- ///
- /// 跟踪号
- ///
- public string TrackingCode { get; set; }
-
- ///
- /// 仓库
- ///
- public WarehouseLocation WarehouseLocation { get; set; }
-
- public int UserId { get; set; }
- }
-}
\ No newline at end of file
diff --git a/TradeManageNew/OuterService/ShageService.ashx.cs b/TradeManageNew/OuterService/ShageService.ashx.cs
index 6a227e7..dd555f3 100644
--- a/TradeManageNew/OuterService/ShageService.ashx.cs
+++ b/TradeManageNew/OuterService/ShageService.ashx.cs
@@ -1370,204 +1370,6 @@ namespace TradeManageNew.OuterService
md.Data = null;
}
}
- if (Method == "PostOrderUsedSaleEntry")
- {
- var input = JsonConvert.DeserializeObject(ResponseContent);
- var validatedSuccess = true;
- if (string.IsNullOrWhiteSpace(input.OrderCode))
- {
- md.Code = "400";
- md.Result = "Please enter order code";
- md.Data = null;
- validatedSuccess = false;
- }
- if (string.IsNullOrWhiteSpace(input.GoodsCode))
- {
- md.Code = "400";
- md.Result = "Please enter sku code";
- md.Data = null;
- validatedSuccess = false;
- }
- else
- {
- input.GoodsCode = input.GoodsCode.Trim();
- }
-
- if (string.IsNullOrWhiteSpace(input.TrackingCode))
- {
- md.Code = "400";
- md.Result = "Please enter tracking code";
- md.Data = null;
- validatedSuccess = false;
- }
- else
- {
- input.TrackingCode = input.TrackingCode.Trim();
- }
-
- if (input.Quantity<=0)
- {
- md.Code = "400";
- md.Result = "The quantity must be greater than 0";
- md.Data = null;
- validatedSuccess = false;
- }
- if (validatedSuccess)
- {
- using (var db = new ErpDbContext())
- {
- //订单信息
- var order = db.DT_OrderInfo.FirstOrDefault(x =>
- x.PlatOrderCode == input.OrderCode || x.OrderCode == input.OrderCode);
- if (order is null)
- {
- throw new Exception($"There is no order with order number {input.OrderCode}");
- }
-
- //订单明细信息
- var orderItem = db.DT_OrderGoods
- .FirstOrDefault(x => x.OrderId == order.OrderId && x.GoodsSKU == input.GoodsCode);
- if (orderItem is null)
- {
- throw new Exception(
- $"There is no SKU with code {input.GoodsCode} in order [{input.OrderCode}]");
- }
-
- //SKU信息
- var sku = db.HW_GoodsDetail.FirstOrDefault(x => x.DetailId == orderItem.DetailId);
- if (sku is null)
- {
- throw new Exception(
- $"There is no product information with ID {orderItem.DetailId}");
- }
-
- //检查是否存在相同跟踪号不同订单的情况
- var repeatTrackingCodeOrderIds = db.DT_OrderUsedSaleEntry
- .Where(x => x.TrackingCode == input.TrackingCode)
- .Select(x => x.OrderId)
- .Distinct();
- if (repeatTrackingCodeOrderIds.Any() && !repeatTrackingCodeOrderIds.Contains(order.OrderId))
- {
- throw new Exception(
- $"The tracking number has already been linked to an order");
- }
-
- var newOrderUsedSaleEntry =
- new TradeUsedSale.Repositories.Models.DT_OrderUsedSaleEntry
- {
- OrderId = order.OrderId,
- OrderCode = order.OrderCode,
- PlatOrderCode=order.PlatOrderCode,
- GoodsDetailId = sku.DetailId,
- GoodsCode = sku.SKU1,
- Quantity = input.Quantity,
- TrackingCode = input.TrackingCode,
- WarehouseLocation = input.WarehouseLocation,
- CreationTime = DateTime.Now,
- CreatorId = input.UserId
- };
-
- db.InsertWithInt32Identity(newOrderUsedSaleEntry);
-
- md.Code = "100";
- md.Result = "Success";
- md.Data = "";
- }
- }
- }
-
- if (Method == "GetOrderUsedSale")
- {
- var input = JsonConvert.DeserializeObject(ResponseContent);
- if (string.IsNullOrWhiteSpace(input.TrackingCode))
- {
- md.Code = "400";
- md.Result = "Please enter tracking code";
- md.Data = null;
- }
- else
- {
- input.TrackingCode = input.TrackingCode.Trim();
- //可能需要处理扫描面单匹配的问题
-
- using (var db = new ErpDbContext())
- {
- //此前已校验过一个跟踪号只能匹配相同的订单号
- var orderUsedSaleEntryList = db.DT_OrderUsedSaleEntry
- .Where(x => x.TrackingCode == input.TrackingCode)
- .ToList();
-
- if (!orderUsedSaleEntryList.Any())
- {
- throw new Exception($"Tracking number {input.TrackingCode} has no data");
- }
-
- var groupOrderUsedSaleEntry = orderUsedSaleEntryList.GroupBy(x => x.GoodsDetailId)
- .Select(o => new
- {
- o.Key,
- Quantity = o.Sum(x => x.Quantity)
- }).ToList();
-
- var goodsDetailIds = groupOrderUsedSaleEntry.Select(x => x.Key).ToList();
- var skus = db.HW_GoodsDetail.Where(x => goodsDetailIds.Contains(x.DetailId)).ToList();
-
- var spuIds = skus.Select(x => x.GoodsId).Distinct().ToList();
- var spus = db.HW_GoodsInfo.Where(x => spuIds.Contains(x.GoodsId));
-
- var orderInfo = (from order in db.DT_OrderInfo
- join orderXxInfo in db.DT_OrderXXInfo on order.OrderId equals orderXxInfo.OrderId
- join shop in db.JC_Shop on order.ShopId equals shop.ShopId
- where order.OrderId == orderUsedSaleEntryList.First().OrderId
- select new
- {
- order.OrderId,
- order.OrderCode,
- order.PlatOrderCode,
- orderXxInfo.RevName,
- orderXxInfo.RevCountry,
- orderXxInfo.RevAddr,
- orderXxInfo.RevPhone,
- orderXxInfo.RevPostCode,
- shop.ShopName
- }).FirstOrDefault();
-
- var result = new GetOrderUsedSaleDto
- {
- OrderId = orderInfo.OrderId,
- OrderCode = orderInfo.OrderCode,
- PlatOrderCode = orderInfo.PlatOrderCode,
- RevName = orderInfo.RevName,
- RevCountry = orderInfo.RevCountry,
- RevAddr = orderInfo.RevAddr,
- RevPhone = orderInfo.RevPhone,
- RevPostCode = orderInfo.RevPostCode,
- ShopName = orderInfo.ShopName,
- Items = groupOrderUsedSaleEntry.Select(o =>
- {
- var sku = skus.First(x => x.DetailId == o.Key);
- var spu = spus.FirstOrDefault(x => x.GoodsId == o.Key);
-
- return new GetOrderUsedSaleItemDto
- {
- ProductCode = spu?.GoodsCode,
- ProductDescription = spu?.GoodsEnglisgName,
- GoodsDetailId = sku.DetailId,
- SkuCode = sku.SKU1,
- Quantity = o.Quantity
- };
- })
- .ToList()
- };
-
- md.Code = "100";
- md.Result = "Success";
- md.Data = JsonConvert.SerializeObject(result);
- }
- }
-
- }
-
if (Method == "GetOrderUsedSalePlatform")
{
var input = JsonConvert.DeserializeObject(ResponseContent);
diff --git a/TradeManageNew/TradeManageNew.csproj b/TradeManageNew/TradeManageNew.csproj
index b65b3ee..5a50d9f 100644
--- a/TradeManageNew/TradeManageNew.csproj
+++ b/TradeManageNew/TradeManageNew.csproj
@@ -2915,10 +2915,7 @@
-
-
-
diff --git a/TradeUsedSale/Repositories/ErpDbContext.cs b/TradeUsedSale/Repositories/ErpDbContext.cs
index d000b09..f32f9bc 100644
--- a/TradeUsedSale/Repositories/ErpDbContext.cs
+++ b/TradeUsedSale/Repositories/ErpDbContext.cs
@@ -23,8 +23,6 @@ namespace TradeUsedSale.Repositories
public ITable HW_GoodsInfo => this.GetTable();
public ITable HW_GoodsDetail => this.GetTable();
public ITable DT_OrderReturn => this.GetTable();
- public ITable DT_OrderUsedSale => this.GetTable();
- public ITable DT_OrderUsedSaleEntry => this.GetTable();
public ITable DT_OrderUsedSalePlatform => this.GetTable();
public ITable JC_Shop => this.GetTable();
public ITable JC_UserInfo => this.GetTable();
diff --git a/TradeUsedSale/Repositories/Models/DT_OrderUsedSale.cs b/TradeUsedSale/Repositories/Models/DT_OrderUsedSale.cs
deleted file mode 100644
index da6cd77..0000000
--- a/TradeUsedSale/Repositories/Models/DT_OrderUsedSale.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using LinqToDB.Mapping;
-using TradeUsedSale.Enums;
-
-namespace TradeUsedSale.Repositories.Models
-{
- public class DT_OrderUsedSale
- {
- [PrimaryKey, Identity] public int Id { get; set; }
-
- ///
- /// 跟踪号
- ///
- public string TrackingCode { get; set; }
-
- ///
- /// 订单Id
- ///
- public int OrderId { get; set; }
-
- ///
- /// 订单号
- ///
- public string OrderCode { get; set; }
-
- ///
- /// SKU ID
- ///
- public int GoodsId { get; set; }
-
- ///
- /// SKU Code
- ///
- public string GoodsCode { get; set; }
-
- ///
- /// 数量
- ///
- public int Quantity { get; set; }
-
- ///
- /// 仓库
- ///
- public WarehouseLocation WarehouseLocation { get; set; }
-
- ///
- /// 库位编码
- ///
- public string WarehousePositionCode { get; set; }
-
- ///
- /// 扫描时间
- ///
- public DateTime ScanTime { get; set; }
-
- ///
- /// 扫描人
- ///
- public int ScanUserId { get; set; }
-
- ///
- /// 图片信息
- ///
- public string ImageUrls { get; set; }
-
- ///
- /// 创建时间
- ///
- public DateTime CreationTime { get; set; }
-
- ///
- /// 创建人
- ///
- public int CreatorId { get; set; }
- }
-}
\ No newline at end of file
diff --git a/TradeUsedSale/Repositories/Models/DT_OrderUsedSaleEntry.cs b/TradeUsedSale/Repositories/Models/DT_OrderUsedSaleEntry.cs
deleted file mode 100644
index bbfd380..0000000
--- a/TradeUsedSale/Repositories/Models/DT_OrderUsedSaleEntry.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using LinqToDB.Mapping;
-using TradeUsedSale.Enums;
-
-namespace TradeUsedSale.Repositories.Models
-{
- ///
- /// 二手销售商品录入记录
- ///
- public class DT_OrderUsedSaleEntry
- {
- [PrimaryKey, Identity] public int Id { get; set; }
-
- ///
- /// 订单Id
- ///
- public int OrderId { get; set; }
-
- ///
- /// 订单号
- ///
- public string OrderCode { get; set; }
-
- ///
- /// 平台单号
- ///
- public string PlatOrderCode { get; set; }
-
- ///
- /// SKU ID
- ///
- public int GoodsDetailId { get; set; }
-
- ///
- /// SKU Code
- ///
- public string GoodsCode { get; set; }
-
- ///
- /// 数量
- ///
- public int Quantity { get; set; }
-
- ///
- /// 跟踪号
- ///
- public string TrackingCode { get; set; }
-
- ///
- /// 仓库
- ///
- public WarehouseLocation WarehouseLocation { get; set; }
-
- ///
- /// 创建时间
- ///
- public DateTime CreationTime { get; set; }
-
- ///
- /// 创建人
- ///
- public int CreatorId { get; set; }
- }
-}
\ No newline at end of file
diff --git a/TradeUsedSale/TradeUsedSale.csproj b/TradeUsedSale/TradeUsedSale.csproj
index e6b31b6..6d9c19c 100644
--- a/TradeUsedSale/TradeUsedSale.csproj
+++ b/TradeUsedSale/TradeUsedSale.csproj
@@ -52,8 +52,6 @@
-
-