Skip to content

D
DataCenter_Core2.1_20190520
Commit 87e6be37 by guanzhenshan
Options

1、增加平台退款流水报表 

2、增加统计仓库冗余数据的服务
parent 6dc4fc7a
Showing with 487 additions and 10 deletions
Bailun.DC.Models/Orders/dc_base_oms_order.cs
......@@ -427,5 +427,15 @@ namespace Bailun.DC.Models.Orders
/// OMS算出的利润
/// </summary>
public decimal profit_oms { get; set; }
/// <summary>
/// 退款人民币金额
/// </summary>
public decimal refundrmb { get; set; }
/// <summary>
/// 退款交易号
/// </summary>
public string refund_reference_id { get; set; }
}
}
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
......@@ -1581,6 +1581,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
ToCSV(listVal, colNames, filename, filepath);
return File("~/Files/Report/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + filename + ".csv", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", filename + ".csv");
}
......@@ -1740,7 +1741,99 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
#endregion
#region 退款单
/// <summary>
/// 退款单
/// </summary>
/// <returns></returns>
public ActionResult ListReturn(string platform)
{
ViewBag.platform = platform;
return View();
}
[BailunAuthentication(LoginMode.Enforce)]
public string ListReturnJson(BtTableParameter parameter,DateTime? start,DateTime? end,string platform,string website, string orderno)
{
var _service = new Services.OrdersServices();
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0;
var obj = _service.ListOrderReturn(parameter, start, end, companyid, platform, website, orderno, ref total);
var countOjb = _service.ListOrderReturnCount(start, end, companyid, platform, website, orderno);
var list = obj.Select(a => new {
a.platform_type,
a.website,
a.origin_order_id,
a.seller_account,
amount_refund = a.amount_refund.ToString("N2"),
refundrmb = a.refundrmb.ToString("N2"),
refund_time = a.refund_time.ToString("yyyy-MM-dd HH:mm:ss"),
a.refund_reference_id
});
return JsonConvert.SerializeObject(new { total = total, rows = list, count_row = new {
refundrmb = countOjb.refundrmb.ToString("N2"),
amount_refund = countOjb.amount_refund.ToString("N2"),
}});
}
/// <summary>
/// 导出退款流水
/// </summary>
/// <param name="start">退款开始时间</param>
/// <param name="end">退款结束时间</param>
/// <param name="platform">平台类型</param>
/// <param name="website">站点</param>
/// <param name="orderno">平台订单号</param>
/// <returns></returns>
public ActionResult ExportListReturn(DateTime? start, DateTime? end, string platform, string website, string orderno)
{
var _service = new Services.OrdersServices();
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var obj = _service.ListOrderReturn(start, end, companyid, platform, website, orderno);
var list = obj.Select(a => new {
a.platform_type,
a.website,
a.origin_order_id,
a.seller_account,
amount_refund = a.amount_refund.ToString("N2"),
refundrmb = a.refundrmb.ToString("N2"),
refund_time = a.refund_time.ToString("yyyy-MM-dd HH:mm:ss"),
a.refund_reference_id
});
var colNames = new List<string> {"平台订单号","平台名称","平台站点", "卖家帐号", "退款金额",
"退款RMB", "退款时间","退款交易号"
};
var listVal = new List<string>();
foreach (var item in list)
{
listVal.Add(
item.origin_order_id + "|" + item.platform_type + "|" + item.website + "|" + item.seller_account + "|" + item.amount_refund + "|" +
item.refundrmb + "|" + item.refund_time + "|" + item.refund_reference_id
);
}
var filename = platform + "平台退款流水导出" + DateTime.Now.ToString("yyyyMMddHHmmss");
var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\";
ToCSV(listVal, colNames, filename, filepath);
return File("~/Files/Report/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + filename + ".csv", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", filename + ".csv");
}
#endregion
#region Common
/// <summary>
......
Bailun.DC.Web/Areas/Reports/Views/Orders/ListReturn.cshtml 0 → 100644

@{
ViewData["Title"] = "ListReturn";
Layout = "~/Pages/Shared/_MainLayout.cshtml";
}
<div class="row">
<div class="col-sm-12">
<div class="ibox-content m-b-sm border-bottom">
<form id="toolbar">
<div class="form-inline" style="line-height:40px;">
<div class="form-group">
<label>平台：</label>
<select id="platform" name="platform" class="form-control">
<option value="">选择平台</option>
</select>
</div>
<div class="form-group">
<label>站点：</label>
<select id="website" name="website" class="form-control">
<option value="">选择站点</option>
</select>
</div>
@*<div class="form-group">
<label>销售帐号：</label>
<select id="account" name="account" class="form-control" style="width:160px;">
<option value="">选择帐号</option>
</select>
</div>*@
<div class="form-group">
<label>退款时间</label>
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"))" />
<span>至</span>
<input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.ToString("yyyy-MM-dd"))" />
</div>
<div class="form-group">
<label>&nbsp;</label>
<input id="orderno" name="orderno" class="form-control" style="width:130px;" placeholder="平台订单号" />
</div>
<div class="form-group">
<label>&nbsp;</label>
<button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
<button type="button" class="btn btn-success" onclick="exportlist()">导出</button>
</div>
</div>
</form>
</div>
<div class="ibox-content m-b-sm border-bottom">
<table id="roletable" style="table-layout:fixed;"></table>
</div>
</div>
</div>
@section css{
<style>
.mules {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
}
@section scripts{
<script type="text/javascript">
var tb;
$(document).ready(function () {
laydate.render({ elem: '#start' });
laydate.render({ elem: '#end' });
var height = document.body.clientHeight;
$("#roletable").attr("data-height", (height - 170));
listPlatform();
})
function list() {
var columns = [
{
field: 'origin_order_id', title: '平台订单号', width: '180', sortable: true, formatter: function (idx, data) {
return '<div class="mules" title="' + data.origin_order_id + '">' + data.origin_order_id + '</div>';
}
},
{ field: 'platform_type', title: '平台名称', width: '100', sortable: true },
{ field: 'website', title: '平台站点', width: '90', sortable: true },
{
field: 'seller_account', title: '卖家帐号', width: '160', sortable: true, formatter: function (idx, data) {
return '<div class="mules" title="' + data.seller_account + '">' + data.seller_account+'</div>';
}
},
{ field: 'amount_refund', title: '退款金额', width: '100', sortable: true, iscount: true },
{ field: 'refundrmb', title: '退款RMB', width: '100', sortable: false, iscount: true },
{ field: 'refund_time', title: '退款时间', width: '150', sortable: true },
{ field: 'refund_reference_id', title: '退款交易号', width: '150', sortable: false }
];
var url = '@Url.Content("~/Reports/Orders/ListReturnJson")' + '?' + $("#toolbar").serialize();
if (tb == undefined) {
tb = OnlyTable("roletable", columns, url, "", {
showfooter: true, loadsuccess: function (d) {
//替换汇总行的相关列值
var tr = $('.fixed-table-footer').find('tr');
for (var c in columns) {
var key = columns[c].field;
if (columns[c].iscount) {
for (var v in d.count_row) {
if (key == v) {
tr.find('td').eq(c).children('div').first().html(d.count_row[v]);
break;
}
}
}
}
}
}, {
fixedcol: true,
fixedcolnum:1
});
}
else {
tb.bootstrapTable('refresh', { url: url });
}
}
function listPlatform() {
var lindex = layer.load();
$.submit({
url: '@Url.Content("~/Reports/Orders/ListPlatform")',
type:'POST',
paramData: '',
func: function (result) {
layer.close(lindex);
if (result != null && result != undefined) {
$('#platform').html('<option value="">选择平台</option>');
for (var i = 0; i < result.length; i++) {
$('#platform').append('<option value="' + result[i] + '">' + result[i]+'</option>');
}
$('#platform').val('@ViewBag.platform');
$('#platform').change(function () {
listWebsite();
})
list();
listWebsite();
}
}
})
}
function listAccount() {
$.submit({
url: '@Url.Content("~/Reports/Orders/ListAccount")',
type:'POST',
paramData: 'platform=@(ViewBag.platform)',
func: function (result) {
if (result != null && result != undefined) {
$('#account').html('<option value="">选择帐号</option>');
for (var i = 0; i < result.length; i++) {
$('#account').append('<option value="' + result[i] + '">' + result[i]+'</option>');
}
}
}
})
}
function listWebsite() {
if ($('#platform').val() == '') {
return false;
}
var lindex = layer.load();
$.submit({
url: '@Url.Content("~/Reports/Orders/ListWebSite")',
type:'POST',
paramData: 'platform=' + $('#platform').val(),
func: function (result) {
layer.close(lindex);
if (result != null && result != undefined) {
$('#website').html('<option value="">选择站点</option>');
for (var i = 0; i < result.length; i++) {
$('#website').append('<option value="' + result[i] + '">' + result[i]+'</option>');
}
}
}
})
}
function exportlist() {
window.open('@Url.Content("~/Reports/Orders/ExportListReturn?")' + $("#toolbar").serialize(), '_blank');
}
</script>
}
Bailun.DC.Web/Controllers/ApiController.cs
......@@ -62,7 +62,7 @@ namespace Bailun.DC.Web.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
public string SkuWarehouseRedundancy()
public string SkuWarehouseRedundancy1()
{
var filename = _hostingEnvironment.WebRootPath+"\\Files\\turnfile\\";
......@@ -76,7 +76,7 @@ namespace Bailun.DC.Web.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
public string SkuWarehouseSales()
public string SkuWarehouseSales1()
{
var filename = _hostingEnvironment.WebRootPath + "\\Files\\turnfile\\skusales.csv";
......
Bailun.DC.Web/Views/Home/Main.cshtml
......@@ -149,11 +149,11 @@
<span>订单汇总</span>
</a>
</li>
<li>
@*<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/OrderRefundDetails")" data-index="0">
<span>退款单明细</span>
</a>
</li>
</li>*@
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/DepositReceived")" data-index="0">
<span>预收款明细</span>
......@@ -217,6 +217,16 @@
<span>FBA平台费用流水</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListReturn?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>亚马逊退款流水</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListReturn?platform=FBA")" data-index="0" style="padding-left:74px;">
<span>FBA退款流水</span>
</a>
</li>
</ul>
</li>
<li>
......@@ -266,6 +276,11 @@
<span>汇损费列表</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListReturn?platform=Ebay")" data-index="0" style="padding-left:74px;">
<span>EBay退款流水</span>
</a>
</li>
</ul>
</li>
<li>
......@@ -274,6 +289,12 @@
<span>平台利润统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListReturn")" data-index="0">
<i class="fa fa-money"></i>
<span>平台退款流水</span>
</a>
</li>
</ul>
</li>
......
Bailun.DC.sln
......@@ -15,7 +15,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bailun.DC.Common", "Bailun.
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows Console", "Windows Console", "{AE2CE86A-8538-4142-920F-684DCF47C064}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bailun.DC.SaveSkuDeliverWeighDiff", "Bailun.DC.SaveSkuDeliverWeighDiff\Bailun.DC.SaveSkuDeliverWeighDiff.csproj", "{75536DAE-6ADD-463C-954E-55C95A991293}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.SaveSkuDeliverWeighDiff", "Bailun.DC.SaveSkuDeliverWeighDiff\Bailun.DC.SaveSkuDeliverWeighDiff.csproj", "{75536DAE-6ADD-463C-954E-55C95A991293}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "consoleService", "consoleService", "{CBED94A6-5000-41F3-BB28-19675A118131}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkuWHRedundancyService", "SkuWHRedundancyService\SkuWHRedundancyService.csproj", "{070FDDD3-6461-4A06-B8E2-4E099B51D11B}"
EndProject
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{4D94867E-FE5E-41EF-A6DD-EAA47A96269F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -47,12 +53,21 @@ Global
{75536DAE-6ADD-463C-954E-55C95A991293}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75536DAE-6ADD-463C-954E-55C95A991293}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75536DAE-6ADD-463C-954E-55C95A991293}.Release|Any CPU.Build.0 = Release|Any CPU
{070FDDD3-6461-4A06-B8E2-4E099B51D11B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{070FDDD3-6461-4A06-B8E2-4E099B51D11B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{070FDDD3-6461-4A06-B8E2-4E099B51D11B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{070FDDD3-6461-4A06-B8E2-4E099B51D11B}.Release|Any CPU.Build.0 = Release|Any CPU
{4D94867E-FE5E-41EF-A6DD-EAA47A96269F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4D94867E-FE5E-41EF-A6DD-EAA47A96269F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D94867E-FE5E-41EF-A6DD-EAA47A96269F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D94867E-FE5E-41EF-A6DD-EAA47A96269F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{75536DAE-6ADD-463C-954E-55C95A991293} = {AE2CE86A-8538-4142-920F-684DCF47C064}
{070FDDD3-6461-4A06-B8E2-4E099B51D11B} = {CBED94A6-5000-41F3-BB28-19675A118131}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6E53AF28-A282-4FB0-A769-EAEA9769C02A}
......
SkuWHRedundancyService/Dockerfile 0 → 100644
FROM microsoft/dotnet:2.1-runtime AS base
WORKDIR /app
FROM microsoft/dotnet:2.1-sdk AS build
WORKDIR /src
COPY SkuWHRedundancyService/SkuWHRedundancyService.csproj SkuWHRedundancyService/
COPY Bailun.DC.Common/Bailun.DC.Common.csproj Bailun.DC.Common/
COPY Bailun.DC.DB/Bailun.DC.DB.csproj Bailun.DC.DB/
COPY Bailun.DC.Models/Bailun.DC.Models.csproj Bailun.DC.Models/
RUN dotnet restore SkuWHRedundancyService/SkuWHRedundancyService.csproj
COPY . .
WORKDIR /src/SkuWHRedundancyService
RUN dotnet build SkuWHRedundancyService.csproj -c Release -o /app
FROM build AS publish
RUN dotnet publish SkuWHRedundancyService.csproj -c Release -o /app
FROM base AS final
WORKDIR /app
COPY --from=publish /app .
ENTRYPOINT ["dotnet", "SkuWHRedundancyService.dll"]
SkuWHRedundancyService/Program.cs 0 → 100644
using System;
namespace SkuWHRedundancyService
{
class Program
{
static void Main(string[] args)
{
var service = new Services();
service.SaveRedundancy(DateTime.Now.AddDays(-1));
}
}
}
SkuWHRedundancyService/Services.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
using MySql.Data.MySqlClient;
using Bailun.DC.Models.Warehouse;
using Bailun.DC.Common;
using Dapper;
namespace SkuWHRedundancyService
{
public class Services
{
public bool SaveRedundancy(DateTime date)
{
Console.WriteLine("进去方法，"+DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
try
{
using (var cn = new MySqlConnection(Bailun.DC.Common.GlobalConfig.ConnectionString))
{
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
cn.Execute("delete from dc_mid_skuwarehouse_redundancy where `day`='" + date.ToString("yyyy-MM-dd") + "'",2*60);
var page = 1;
var pagesize = 4000;
var listcount = cn.QueryFirstOrDefault<int>("select count(id) from dc_base_stock");
var resultcount = 0;
while (page == 1 || (resultcount == pagesize && resultcount != 0))
{
var strlimit = (((page - 1) * pagesize) + "," + pagesize);
var liststock = cn.Query<mWarehouseRedundancy>($@"select t1.bailun_sku,t1.warehouse_code,t1.usable_stock,t2.sku_title_cn,t2.unit_price,t3.warehouse_name,t4.quantity,t5.quantity_out_stock,t6.oneday_total_sales,t6.threeday_total_sales,t6.sevenday_total_sales,t6.fourteenday_total_sales,t6.thirtyday_total_sales,t6.threeday_average_sales,t6.sevenday_average_sales,t6.fourteenday_average_sales,t6.thirtyday_average_sales,t5.quantity_purchase,t5.quantity_transfer,t2.product_code,t2.bailun_category_id,t2.bailun_category_name,t7.status as 'monitorstatus',t8.tortstatus
from dc_base_stock t1
join dc_base_sku t2 on t1.bailun_sku=t2.bailun_sku
join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
left join dc_auto_daily_redundance t4 on t4.record_time='{DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")}' and t1.bailun_sku=t4.bailun_sku and t1.warehouse_code=t4.warehouse_code -- 仓库冗余
left join dc_mid_transit t5 on t1.bailun_sku=t5.bailun_sku and t1.warehouse_code=t5.warehouse_code
left join dc_daily_sales t6 on t1.bailun_sku=t6.bailun_sku and t6.record_date='{DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")}' and t1.warehouse_code=t6.warehouse_code
left join dc_auto_config_sku_warehouse t7 on t7.bailun_sku=t1.bailun_sku and t7.warehouse_code=t1.warehouse_code
left join dc_sku_monitor t8 on t8.sku=t1.bailun_sku and t8.warehousecode=t1.warehouse_code
limit {strlimit}", null, null, true, 30 * 60);
resultcount = liststock.AsList().Count;
page++;
var str = @"insert dc_mid_skuwarehouse_redundancy (bailun_sku,bailun_sku_name,warehouse_code,warehouse_name,productcount,amount_total,daily_productsale_count,dailysale_amount,productsale_rate,saleamount_rate,redundancy_product_count,redundancy_product_rate,redundancy_amount,redundancy_amount_rate,yesterdaysale_amount,yesterdaysale_count,sale_3d_avg,sale_7d_avg,sale_14d_avg,sale_30d_avg,day_turnover_rate,week_turnover_rate,month_turnover_rate,stockout,day,createtime,onway_count,sku_product_code,bailun_category_id,bailun_category_name,monitorstatus,tortstatus) values ";
foreach (var item in liststock)
{
var onwaycount = (item.quantity_purchase ?? 0 + item.quantity_transfer ?? 0);
var stockcount = (item.usable_stock + onwaycount); //可用库存+在途数
str += $@"('{item.bailun_sku}','{item.sku_title_cn}','{item.warehouse_code}','{item.warehouse_name}',{stockcount},{stockcount * item.unit_price},{(item.sevenday_average_sales ?? 0)},{((item.sevenday_total_sales ?? 0) * item.unit_price)},{(stockcount > 0 ? decimal.Round(((item.sevenday_average_sales ?? 0) / (decimal)stockcount),4) : 0)},{(stockcount > 0 ? decimal.Round((item.sevenday_average_sales ?? 0) / (decimal)stockcount,4) : 0)},{(item.quantity ?? 0)},{(stockcount > 0 ? decimal.Round((decimal)(item.quantity ?? 0) / (decimal)stockcount,4) : 0)},{((item.quantity ?? 0) * item.unit_price)},{(stockcount > 0 ? decimal.Round((item.quantity ?? 0) / (decimal)stockcount,4): 0)},{((item.oneday_total_sales ?? 0) * item.unit_price)},{(item.oneday_total_sales ?? 0)},{decimal.Round(((item.threeday_average_sales ?? 0) / 3),4)},{decimal.Round(((item.sevenday_average_sales ?? 0) / 7),4)},{decimal.Round(((item.fourteenday_average_sales ?? 0) / 14),4)},{decimal.Round(((item.thirtyday_average_sales ?? 0) / 30),4)},{(stockcount > 0 ? decimal.Round(item.oneday_total_sales ?? 0 / (decimal)stockcount,4) : 0)},{(stockcount > 0 ? decimal.Round((item.sevenday_average_sales ?? 0) / (decimal)stockcount * 7,4) : 0)},{(stockcount > 0 ? decimal.Round((item.thirtyday_average_sales ?? 0) / (decimal)stockcount * 30,4) : 0)},{(item.quantity_out_stock ?? 0)},'{DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',{onwaycount},'{item.product_code}',{item.bailun_category_id},'{item.bailun_category_name}',{(item.monitorstatus ?? 0)},{(item.tortstatus ?? 0)}),";
}
if (resultcount > 0)
{
str = str.Substring(0, str.Length - 1);
cn.Execute(str, null, null, 5 * 60);
}
}
//生成仓库维度的冗余报告
cn.Execute("call Proc_SaveWarehouseRedundancy", null, null, 6 * 60);
Console.WriteLine("运行成功，时间：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
return true;
}
}
catch (Exception ex)
{
Console.WriteLine("出现异常：" + ex.Message);
return false;
}
}
}
}
SkuWHRedundancyService/SkuWHRedundancyService.csproj 0 → 100644
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapper" Version="1.60.6" />
<PackageReference Include="MySql.Data" Version="8.0.16" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bailun.DC.Common\Bailun.DC.Common.csproj" />
<ProjectReference Include="..\Bailun.DC.DB\Bailun.DC.DB.csproj" />
<ProjectReference Include="..\Bailun.DC.Models\Bailun.DC.Models.csproj" />
</ItemGroup>
</Project>
docker-compose.dcproj
......@@ -3,7 +3,7 @@
<PropertyGroup Label="Globals">
<ProjectVersion>2.1</ProjectVersion>
<DockerTargetOS>Linux</DockerTargetOS>
<ProjectGuid>92040d69-5f88-4efd-973b-18949bceed2b</ProjectGuid>
<ProjectGuid>4d94867e-fe5e-41ef-a6dd-eaa47a96269f</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<None Include="docker-compose.override.yml">
......
docker-compose.yml
version: '3.4'
services:
bailun.dc.saveskudeliverweighdiff:
image: ${DOCKER_REGISTRY}bailundcsaveskudeliverweighdiff
skuwhredundancyservice:
image: ${DOCKER_REGISTRY}skuwhredundancyservice
build:
context: .
dockerfile: Bailun.DC.SaveSkuDeliverWeighDiff/Dockerfile
dockerfile: SkuWHRedundancyService/Dockerfile
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