Browse Source

代码合并

master
lvzb 5 months ago
parent
commit
13c112259f
  1. 7
      WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs
  2. 6
      WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs
  3. 5
      WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs

7
WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs

@ -190,13 +190,16 @@ namespace Win_in.Sfs.Scp.WebApi
status = null, status = null,
truckNbr = asn.PlateNumber, truckNbr = asn.PlateNumber,
whse = "", whse = "",
dock = "", dock = asn.Dock,
shipDate = asn.ShipTime, shipDate = asn.ShipTime,
dueDate = asn.ReceiveTime, dueDate = asn.ReceiveTime,
timeWindow = asn.ReceivedPort, timeWindow = asn.ReceivedPort,
remark = asn.Remark, remark = asn.Remark,
}; };
if (string.IsNullOrEmpty(asnMstr.TimeWindow))
{
asnMstr.TimeWindow = "00:00-00:00";
}
foreach (var barcode in barcodes) foreach (var barcode in barcodes)
{ {
var det = new AsnDet() var det = new AsnDet()

6
WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs

@ -94,8 +94,10 @@ namespace Win_in.Sfs.Scp.WebApi
/// </summary> /// </summary>
public virtual string remark { get; set; } public virtual string remark { get; set; }
/// <summary>
/// 工厂编码
/// </summary>
public virtual string Subsite { get; set; }
public virtual List<AsnDet> details { get; set; } = new List<AsnDet>(); public virtual List<AsnDet> details { get; set; } = new List<AsnDet>();

5
WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs

@ -46,6 +46,11 @@ namespace Win_in.Sfs.Scp.v1.Domain.Asns
public string SubSite { get; set; } public string SubSite { get; set; }
public int IsPort { get; set; }//接口是否读取 public int IsPort { get; set; }//接口是否读取
/// <summary>
/// 收货口
/// </summary>
public string Dock { get; set; }
public string WebSubSite { get; set; }
public Guid? TenantId { get; } public Guid? TenantId { get; }
} }
} }
Loading…
Cancel
Save