wufan
/
ERP
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🔥 方案变更 移除旧文件

Browse Source
master
wufan 2 months ago
parent 19c45a2bb2
commit 5438599878
9 changed files with 0 additions and 471 deletions
Show Stats Download Patch File Download Diff File

82
TradeManageNew/Models/Shage/GetOrderUsedSaleDto.cs
Unescape Escape View File

@ -1,82 +0,0 @@
using System.Collections.Generic;
namespace TradeManageNew.Models.Shage
{
public class GetOrderUsedSaleDto
{
public int OrderId { get; set; }
/// <summary>
/// 订单号
/// </summary>
public string OrderCode { get; set; }
/// <summary>
/// 平台单号
/// </summary>
public string PlatOrderCode { get; set; }
/// <summary>
/// 收件人
/// </summary>
public string RevName { get; set; }
/// <summary>
/// 收件国家
/// </summary>
public string RevCountry { get; set; }
/// <summary>
/// 收件地址
/// </summary>
public string RevAddr { get; set; }
/// <summary>
/// 收件人电话
/// </summary>
public string RevPhone { get; set; }
/// <summary>
/// 邮编
/// </summary>
public string RevPostCode { get; set; }
/// <summary>
/// 店铺名称
/// </summary>
public string ShopName { get; set; }
/// <summary>
/// sku明细
/// </summary>
public List<GetOrderUsedSaleItemDto> Items { get; set; } = new List<GetOrderUsedSaleItemDto>();
}
public class GetOrderUsedSaleItemDto
{
/// <summary>
/// 产品编码
/// </summary>
public string ProductCode { get; set; }
/// <summary>
/// 产品描述
/// </summary>
public string ProductDescription { get; set; }
/// <summary>
/// SKU ID
/// </summary>
public int GoodsDetailId { get; set; }
/// <summary>
/// sku编码
/// </summary>
public string SkuCode { get; set; }
/// <summary>
/// 数量
/// </summary>
public int Quantity { get; set; }
}
}

10
TradeManageNew/Models/Shage/GetOrderUsedSaleInput.cs
Unescape Escape View File

@ -1,10 +0,0 @@
namespace TradeManageNew.Models.Shage
{
public class GetOrderUsedSaleInput
{
/// <summary>
/// 跟踪号
/// </summary>
public string TrackingCode { get; set; }
}
}

34
TradeManageNew/Models/Shage/OrderUsedSaleEntryInput.cs
Unescape Escape View File

@ -1,34 +0,0 @@
using TradeUsedSale.Enums;
namespace TradeManageNew.Models.Shage
{
public class OrderUsedSaleEntryInput
{
/// <summary>
/// 订单号
/// </summary>
public string OrderCode { get; set; }
/// <summary>
/// SKU Code
/// </summary>
public string GoodsCode { get; set; }
/// <summary>
/// 数量
/// </summary>
public int Quantity { get; set; }
/// <summary>
/// 跟踪号
/// </summary>
public string TrackingCode { get; set; }
/// <summary>
/// 仓库
/// </summary>
public WarehouseLocation WarehouseLocation { get; set; }
public int UserId { get; set; }
}
}

198
TradeManageNew/OuterService/ShageService.ashx.cs
Unescape Escape View File

@ -1370,204 +1370,6 @@ namespace TradeManageNew.OuterService
md.Data = null; md.Data = null;
} }
} }
if (Method == "PostOrderUsedSaleEntry")
{
var input = JsonConvert.DeserializeObject<OrderUsedSaleEntryInput>(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<GetOrderUsedSaleInput>(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") if (Method == "GetOrderUsedSalePlatform")
{ {
var input = JsonConvert.DeserializeObject<GetOrderUsedSalePlatformInput>(ResponseContent); var input = JsonConvert.DeserializeObject<GetOrderUsedSalePlatformInput>(ResponseContent);

3
TradeManageNew/TradeManageNew.csproj
Unescape Escape View File

@ -2915,10 +2915,7 @@
<Compile Include="LXOpenApi.cs" /> <Compile Include="LXOpenApi.cs" />
<Compile Include="MicrosoftExcelNew.cs" /> <Compile Include="MicrosoftExcelNew.cs" />
<Compile Include="ModelNew.cs" /> <Compile Include="ModelNew.cs" />
<Compile Include="Models\Shage\GetOrderUsedSaleDto.cs" />
<Compile Include="Models\Shage\GetOrderUsedSalePlatformDto.cs" /> <Compile Include="Models\Shage\GetOrderUsedSalePlatformDto.cs" />
<Compile Include="Models\Shage\OrderUsedSaleEntryInput.cs" />
<Compile Include="Models\Shage\GetOrderUsedSaleInput.cs" />
<Compile Include="Models\Shage\GetOrderUsedSalePlatformInput.cs" /> <Compile Include="Models\Shage\GetOrderUsedSalePlatformInput.cs" />
<Compile Include="Models\Shage\OrderUsedSalePlatformInput.cs" /> <Compile Include="Models\Shage\OrderUsedSalePlatformInput.cs" />
<Compile Include="OrderAPI.ashx.cs"> <Compile Include="OrderAPI.ashx.cs">

2
TradeUsedSale/Repositories/ErpDbContext.cs
Unescape Escape View File

@ -23,8 +23,6 @@ namespace TradeUsedSale.Repositories
public ITable<HW_GoodsInfo> HW_GoodsInfo => this.GetTable<HW_GoodsInfo>(); public ITable<HW_GoodsInfo> HW_GoodsInfo => this.GetTable<HW_GoodsInfo>();
public ITable<HW_GoodsDetail> HW_GoodsDetail => this.GetTable<HW_GoodsDetail>(); public ITable<HW_GoodsDetail> HW_GoodsDetail => this.GetTable<HW_GoodsDetail>();
public ITable<DT_OrderReturn> DT_OrderReturn => this.GetTable<DT_OrderReturn>(); public ITable<DT_OrderReturn> DT_OrderReturn => this.GetTable<DT_OrderReturn>();
public ITable<DT_OrderUsedSale> DT_OrderUsedSale => this.GetTable<DT_OrderUsedSale>();
public ITable<DT_OrderUsedSaleEntry> DT_OrderUsedSaleEntry => this.GetTable<DT_OrderUsedSaleEntry>();
public ITable<DT_OrderUsedSalePlatform> DT_OrderUsedSalePlatform => this.GetTable<DT_OrderUsedSalePlatform>(); public ITable<DT_OrderUsedSalePlatform> DT_OrderUsedSalePlatform => this.GetTable<DT_OrderUsedSalePlatform>();
public ITable<JC_Shop> JC_Shop => this.GetTable<JC_Shop>(); public ITable<JC_Shop> JC_Shop => this.GetTable<JC_Shop>();
public ITable<JC_UserInfo> JC_UserInfo => this.GetTable<JC_UserInfo>(); public ITable<JC_UserInfo> JC_UserInfo => this.GetTable<JC_UserInfo>();

76
TradeUsedSale/Repositories/Models/DT_OrderUsedSale.cs
Unescape Escape View File

@ -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; }
/// <summary>
/// 跟踪号
/// </summary>
public string TrackingCode { get; set; }
/// <summary>
/// 订单Id
/// </summary>
public int OrderId { get; set; }
/// <summary>
/// 订单号
/// </summary>
public string OrderCode { get; set; }
/// <summary>
/// SKU ID
/// </summary>
public int GoodsId { get; set; }
/// <summary>
/// SKU Code
/// </summary>
public string GoodsCode { get; set; }
/// <summary>
/// 数量
/// </summary>
public int Quantity { get; set; }
/// <summary>
/// 仓库
/// </summary>
public WarehouseLocation WarehouseLocation { get; set; }
/// <summary>
/// 库位编码
/// </summary>
public string WarehousePositionCode { get; set; }
/// <summary>
/// 扫描时间
/// </summary>
public DateTime ScanTime { get; set; }
/// <summary>
/// 扫描人
/// </summary>
public int ScanUserId { get; set; }
/// <summary>
/// 图片信息
/// </summary>
public string ImageUrls { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreationTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreatorId { get; set; }
}
}

64
TradeUsedSale/Repositories/Models/DT_OrderUsedSaleEntry.cs
Unescape Escape View File

@ -1,64 +0,0 @@
using System;
using LinqToDB.Mapping;
using TradeUsedSale.Enums;
namespace TradeUsedSale.Repositories.Models
{
/// <summary>
/// 二手销售商品录入记录
/// </summary>
public class DT_OrderUsedSaleEntry
{
[PrimaryKey, Identity] public int Id { get; set; }
/// <summary>
/// 订单Id
/// </summary>
public int OrderId { get; set; }
/// <summary>
/// 订单号
/// </summary>
public string OrderCode { get; set; }
/// <summary>
/// 平台单号
/// </summary>
public string PlatOrderCode { get; set; }
/// <summary>
/// SKU ID
/// </summary>
public int GoodsDetailId { get; set; }
/// <summary>
/// SKU Code
/// </summary>
public string GoodsCode { get; set; }
/// <summary>
/// 数量
/// </summary>
public int Quantity { get; set; }
/// <summary>
/// 跟踪号
/// </summary>
public string TrackingCode { get; set; }
/// <summary>
/// 仓库
/// </summary>
public WarehouseLocation WarehouseLocation { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreationTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreatorId { get; set; }
}
}

2
TradeUsedSale/TradeUsedSale.csproj
Unescape Escape View File

@ -52,8 +52,6 @@
<Compile Include="Repositories\Models\DT_OrderGoods.cs" /> <Compile Include="Repositories\Models\DT_OrderGoods.cs" />
<Compile Include="Repositories\Models\DT_OrderInfo.cs" /> <Compile Include="Repositories\Models\DT_OrderInfo.cs" />
<Compile Include="Repositories\Models\DT_OrderReturn.cs" /> <Compile Include="Repositories\Models\DT_OrderReturn.cs" />
<Compile Include="Repositories\Models\DT_OrderUsedSale.cs" />
<Compile Include="Repositories\Models\DT_OrderUsedSaleEntry.cs" />
<Compile Include="Repositories\Models\DT_OrderUsedSalePlatform.cs" /> <Compile Include="Repositories\Models\DT_OrderUsedSalePlatform.cs" />
<Compile Include="Repositories\Models\DT_OrderXXInfo.cs" /> <Compile Include="Repositories\Models\DT_OrderXXInfo.cs" />
<Compile Include="Repositories\Models\HW_GoodsDetail.cs" /> <Compile Include="Repositories\Models\HW_GoodsDetail.cs" />

Write Preview
Loading…
Cancel
Save