|
|
@ -884,13 +884,13 @@ namespace djy.Service.AFR
|
|
|
|
var expendResult = fin.Expend(new CustFee
|
|
|
|
var expendResult = fin.Expend(new CustFee
|
|
|
|
{
|
|
|
|
{
|
|
|
|
CARRIER = masterItem.ShipCompanyCode,
|
|
|
|
CARRIER = masterItem.ShipCompanyCode,
|
|
|
|
ETD = null,
|
|
|
|
ETD = masterItem.LoadDate,
|
|
|
|
VOYNO = masterItem.Voyno,
|
|
|
|
VOYNO = masterItem.Voyno,
|
|
|
|
VESSEL = masterItem.Vessel,
|
|
|
|
VESSEL = masterItem.Vessel,
|
|
|
|
HBLNO = dealHouseItem.HouseBillNo,
|
|
|
|
HBLNO = dealHouseItem.HouseBillNo,
|
|
|
|
SENDUSERID = User.GID,
|
|
|
|
SENDUSERID = User.GID,
|
|
|
|
LURURENID = User.GID,
|
|
|
|
LURURENID = User.GID,
|
|
|
|
CtnrCount = 1,
|
|
|
|
CtnrCount = cntrAll.Count(c => c.PID == dealHouseItem.GID),
|
|
|
|
CtnrInfo = string.Empty,
|
|
|
|
CtnrInfo = string.Empty,
|
|
|
|
BSTYPE = BusinessType.AFR_REPORT,
|
|
|
|
BSTYPE = BusinessType.AFR_REPORT,
|
|
|
|
SENDTYPE = sendType switch { 1 or 2 => 0, 3 => 1, _ => -1 },
|
|
|
|
SENDTYPE = sendType switch { 1 or 2 => 0, 3 => 1, _ => -1 },
|
|
|
@ -1043,7 +1043,7 @@ namespace djy.Service.AFR
|
|
|
|
var expendResult = fin.Expend(new CustFee
|
|
|
|
var expendResult = fin.Expend(new CustFee
|
|
|
|
{
|
|
|
|
{
|
|
|
|
CARRIER = expendMasterItem.ShipCompanyCode,
|
|
|
|
CARRIER = expendMasterItem.ShipCompanyCode,
|
|
|
|
ETD = null,
|
|
|
|
ETD = expendMasterItem.LoadDate,
|
|
|
|
VOYNO = expendMasterItem.Voyno,
|
|
|
|
VOYNO = expendMasterItem.Voyno,
|
|
|
|
VESSEL = expendMasterItem.Vessel,
|
|
|
|
VESSEL = expendMasterItem.Vessel,
|
|
|
|
HBLNO = expendHouseItem.HouseBillNo,
|
|
|
|
HBLNO = expendHouseItem.HouseBillNo,
|
|
|
|