chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

Browse Source
dev
cjy 4 weeks ago
parent 54055351ce 4697d4de68
commit 3830c3e804
4 changed files with 108 additions and 38 deletions
Show Stats Download Patch File Download Diff File

1
ds-wms-service/DS.WMS.Core/DS.WMS.Core.csproj
Unescape Escape View File

@ -40,6 +40,7 @@
<Folder Include="Op\Dtos\TaskInteraction\" /> <Folder Include="Op\Dtos\TaskInteraction\" />
<Folder Include="Op\Entity\TaskInteraction\" /> <Folder Include="Op\Entity\TaskInteraction\" />
<Folder Include="Op\Interface\TaskInteraction\" /> <Folder Include="Op\Interface\TaskInteraction\" />
<Folder Include="Op\Interface\新文件夹\" />
<Folder Include="Op\Method\TaskInteraction\" /> <Folder Include="Op\Method\TaskInteraction\" />
<Folder Include="TaskPlat\Interface\VGM\" /> <Folder Include="TaskPlat\Interface\VGM\" />
<Folder Include="TaskPlat\Interface\PODDischargeGateoutFull\" /> <Folder Include="TaskPlat\Interface\PODDischargeGateoutFull\" />

82
ds-wms-service/DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs
Unescape Escape View File

@ -1041,19 +1041,30 @@ namespace DS.WMS.Core.Op.EDI
Shipping = formatEdiStr("txt", bill.MARKS); Shipping = formatEdiStr("txt", bill.MARKS);
ShippingList = formatlengthStr(Shipping, 35); ShippingList = formatlengthStr(Shipping, 35);
for (var i = 0; i < Math.Ceiling(Convert.ToDecimal(Convert.ToDecimal(ShippingList.Count) / Convert.ToDecimal(10))); i++) //for (var i = 0; i < Math.Ceiling(Convert.ToDecimal(Convert.ToDecimal(ShippingList.Count) / Convert.ToDecimal(10))); i++)
//{
// var tempstr = "44:";
// for (var z = 0; z < 10; z++)
// {
// if ((i * 10 + z) < ShippingList.Count)
// tempstr = tempstr + ShippingList[i * 10 + z];
// if (z < 9) tempstr = tempstr + ":";
// }
// if (tempstr != "44:")
// {
// r.WriteLine(tempstr + "'");
// icount++;
// }
//}
if (ShippingList.Count != 0 && Shipping.Length > 0)
{ {
var tempstr = "44:"; for (var i = 0; i < ShippingList.Count; i++)
for (var z = 0; z < 10; z++)
{ {
if ((i * 10 + z) < ShippingList.Count) if (!string.IsNullOrWhiteSpace(ShippingList[i]))
tempstr = tempstr + ShippingList[i * 10 + z];
if (z < 9) tempstr = tempstr + ":";
}
if (tempstr != "44:")
{ {
r.WriteLine(tempstr + "'"); r.WriteLine("44:" + ShippingList[i] + "'");
icount++; icount = icount + 1;
}
} }
} }
@ -1067,35 +1078,38 @@ namespace DS.WMS.Core.Op.EDI
for (var i = 0; i < ShippingList.Count; i++) for (var i = 0; i < ShippingList.Count; i++)
{ {
if (ShippingList[i] != "") if (!string.IsNullOrWhiteSpace(ShippingList[i]))
{
if (m <= 5)
{
if (m == 1) strtemp = "47:" + ShippingList[i] + ":";
else
{
if (m == 5)
strtemp = strtemp + ShippingList[i];
else
strtemp = strtemp + ShippingList[i] + ":";
}
}
else
{ {
m = 1; r.WriteLine("47:" + ShippingList[i]+ "'");
r.WriteLine(strtemp + "'");
strtemp = "47:" + ShippingList[i] + ":";
icount = icount + 1; icount = icount + 1;
}
m = m + 1; //if (m <= 5)
} //{
// if (m == 1) strtemp = "47:" + ShippingList[i] + ":";
// else
// {
// if (m == 5)
// strtemp = strtemp + ShippingList[i];
// else
// strtemp = strtemp + ShippingList[i] + ":";
// }
//}
//else
//{
// m = 1;
// r.WriteLine(strtemp + "'");
// strtemp = "47:" + ShippingList[i] + ":";
// icount = icount + 1;
//}
//m = m + 1;
} }
} }
if (!string.IsNullOrWhiteSpace(strtemp))
{
r.WriteLine(strtemp + "'");
icount = icount + 1;
} }
//if (!string.IsNullOrWhiteSpace(strtemp))
//{
// r.WriteLine(strtemp + "'");
// icount = icount + 1;
//}
var ISSOC = "N"; var ISSOC = "N";
if (bill.ISCONTAINERSOC) ISSOC = "Y"; if (bill.ISCONTAINERSOC) ISSOC = "Y";

53
ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLManageBase.cs
Unescape Escape View File

@ -0,0 +1,53 @@
using DS.Module.Core.Data;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.WMS.Core.Op.Entity.BLManage
{
/// <summary>
/// 提单管理主信息
/// </summary>
[SqlSugar.SugarTable("op_sea_bl_issue_base", "提单管理主信息")]
public class BLManageBase : BaseModel<long>
{
/// <summary>
/// 订舱主键,关联订舱主表ID
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "订舱主键", IsNullable = true)]
public long BookingId { get; set; }
/// <summary>
/// 单证编号
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "单证编号", Length = 64, IsNullable = true)]
public string BLNo { get; set; }
/// <summary>
/// 单证类型
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "单证类型", Length = 20, IsNullable = true)]
public string BLType { get; set; }
/// <summary>
/// 单证类型名称
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "单证类型名称", Length = 50, IsNullable = true)]
public string BLTypeName { get; set; }
/// <summary>
/// 状态代码
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "状态代码", Length = 20, IsNullable = true)]
public string Status { get; set; }
/// <summary>
/// 状态名称
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "状态名称", Length = 50, IsNullable = true)]
public string StatusName { get; set; }
}
}

6
ds-wms-service/DS.WMS.Core/Op/Method/DJYChargeFee/DJYChargeFeeService.cs
Unescape Escape View File

@ -140,10 +140,12 @@ namespace DS.WMS.Core.Op.Method
string feeUserId = webAccountConfig.AppKey; string feeUserId = webAccountConfig.AppKey;
string feeUserKey = webAccountConfig.AppSecret; string feeUserKey = webAccountConfig.AppSecret;
var c = tenantDb.Queryable<DJYChargeFee>().Filter(null, true).Count(x => x.Id == id); string feeType = $"{(int)model.BSType}_{(int)model.SendType}";
var c = tenantDb.Queryable<DJYChargeFee>().Filter(null, true).Count(x => x.Id == id && x.FeeType == feeType);
if (c > 0) if (c > 0)
{ {
Logger.Log(NLog.LogLevel.Info, $"{batchId}-已存在扣费记录，id：{id}，提单号：{orderInfo.MBLNO}"); Logger.Log(NLog.LogLevel.Info, $"{batchId}-已存在扣费记录，id：{id}，提单号：{orderInfo.MBLNO} feeType={feeType}");
continue; continue;
} }

Write Preview
Loading…
Cancel
Save