|
|
|
@ -2374,6 +2374,19 @@ namespace DS.WMS.Core.Op.Method
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (hOrder != null && hOrder.Id > 0)
|
|
|
|
|
{
|
|
|
|
|
model.IssueType = hOrder.IssueType;
|
|
|
|
|
//model.IssueTypeCode = hOrder.IssueTypeCode;
|
|
|
|
|
//model.IssuePlaceCode = hOrder.IssuePlaceCode;
|
|
|
|
|
model.IssuePlace = hOrder.IssuePlace;
|
|
|
|
|
model.LoadPortId = hOrder.LoadPortId;
|
|
|
|
|
//model.LoadPortCode = hOrder.LoadPortCode;
|
|
|
|
|
model.LoadPort = hOrder.LoadPort;
|
|
|
|
|
model.DischargePortId = hOrder.DischargePortId;
|
|
|
|
|
//model.DischargePortCode = hOrder.DischargePortCode;
|
|
|
|
|
model.DischargePort = hOrder.DischargePort;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
model.IssueType = order.IssueType;
|
|
|
|
|
model.IssueTypeCode = order.IssueTypeCode;
|
|
|
|
@ -2387,19 +2400,6 @@ namespace DS.WMS.Core.Op.Method
|
|
|
|
|
model.DischargePort = order.DischargePort;
|
|
|
|
|
model.CustomerService = order.CustomerService;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
model.IssueType = hOrder.IssueType;
|
|
|
|
|
//model.IssueTypeCode = hOrder.IssueTypeCode;
|
|
|
|
|
//model.IssuePlaceCode = hOrder.IssuePlaceCode;
|
|
|
|
|
model.IssuePlace = hOrder.IssuePlace;
|
|
|
|
|
model.LoadPortId = hOrder.LoadPortId;
|
|
|
|
|
//model.LoadPortCode = hOrder.LoadPortCode;
|
|
|
|
|
model.LoadPort = hOrder.LoadPort;
|
|
|
|
|
model.DischargePortId = hOrder.DischargePortId;
|
|
|
|
|
//model.DischargePortCode = hOrder.DischargePortCode;
|
|
|
|
|
model.DischargePort = hOrder.DischargePort;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (order.ETD.HasValue && order.StlDate.HasValue)
|
|
|
|
|
{
|
|
|
|
|