|
|
@ -985,13 +985,22 @@ namespace VOL.WMS.Services
|
|
|
|
var keys = base.GetWorkKeysStr(saveModel);
|
|
|
|
var keys = base.GetWorkKeysStr(saveModel);
|
|
|
|
|
|
|
|
|
|
|
|
var needaddFeebaseList_temp = Vw_Op_Wms_FeeBaseRepository.Instance.FindAsIQueryable(x => keys.Contains(x.GID.ToString())).OrderBy(o => o.FEESTARTDATE).ToList();
|
|
|
|
var needaddFeebaseList_temp = Vw_Op_Wms_FeeBaseRepository.Instance.FindAsIQueryable(x => keys.Contains(x.GID.ToString())).OrderBy(o => o.FEESTARTDATE).ToList();
|
|
|
|
|
|
|
|
//20230118 如果在从搜索结果中向对账单内添加业务时,对账单头表已经选择了结算对象
|
|
|
|
|
|
|
|
//则只向对账单内添加应收仓储费对象ARCLIENTWMSOUT与【对账单头表的结算对象CUSTOMERNAME】相同的
|
|
|
|
|
|
|
|
//如为空 则仍然计算时间段内全部可以收费的库存
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(head.CUSTOMERNAME))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
needaddFeebaseList_temp = needaddFeebaseList_temp.Where(x => x.ARCLIENTWMSOUT == head.CUSTOMERNAME).ToList();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var needaddFeebaseList = new List<Vw_Op_Wms_FeeBase>();
|
|
|
|
var needaddFeebaseList = new List<Vw_Op_Wms_FeeBase>();
|
|
|
|
|
|
|
|
|
|
|
|
void feebaselist_add(Vw_Op_Wms_FeeBase item)
|
|
|
|
void feebaselist_add(Vw_Op_Wms_FeeBase item)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!needaddFeebaseList.Exists(x => x.WMSID == item.WMSID && x.GID == item.GID))
|
|
|
|
if (!needaddFeebaseList.Exists(x => x.WMSID == item.WMSID && x.GID == item.GID)) {
|
|
|
|
needaddFeebaseList.Add(item);
|
|
|
|
needaddFeebaseList.Add(item);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
foreach (var item in needaddFeebaseList_temp)
|
|
|
|
foreach (var item in needaddFeebaseList_temp)
|
|
|
@ -1011,6 +1020,16 @@ namespace VOL.WMS.Services
|
|
|
|
{
|
|
|
|
{
|
|
|
|
//var newreclist = Vw_Op_Wms_FeeBaseRepository.Instance.FindAsIQueryable(x => x.MBLNO == item.MBLNO && x.CUSTOMERNAME == item.CUSTOMERNAME && x.GOODSOWNER == item.GOODSOWNER && x.CORPID == item.CORPID).ToList();
|
|
|
|
//var newreclist = Vw_Op_Wms_FeeBaseRepository.Instance.FindAsIQueryable(x => x.MBLNO == item.MBLNO && x.CUSTOMERNAME == item.CUSTOMERNAME && x.GOODSOWNER == item.GOODSOWNER && x.CORPID == item.CORPID).ToList();
|
|
|
|
var newreclist = Vw_Op_Wms_FeeBaseRepository.Instance.FindAsIQueryable(x => x.WMSID == item.WMSID ).ToList();
|
|
|
|
var newreclist = Vw_Op_Wms_FeeBaseRepository.Instance.FindAsIQueryable(x => x.WMSID == item.WMSID ).ToList();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//20230118 如果在从搜索结果中向对账单内添加业务时,对账单头表已经选择了结算对象
|
|
|
|
|
|
|
|
//则只向对账单内添加应收仓储费对象ARCLIENTWMSOUT与【对账单头表的结算对象CUSTOMERNAME】相同的
|
|
|
|
|
|
|
|
//如为空 则仍然计算时间段内全部可以收费的库存
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(head.CUSTOMERNAME))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
newreclist = newreclist.Where(x => x.ARCLIENTWMSOUT == head.CUSTOMERNAME).ToList();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (newreclist != null && newreclist.Count > 0)
|
|
|
|
if (newreclist != null && newreclist.Count > 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
foreach (var rec in newreclist)
|
|
|
|
foreach (var rec in newreclist)
|
|
|
|