|
|
|
@ -196,8 +196,10 @@ namespace djy.Service.Ams
|
|
|
|
|
string guid = "";
|
|
|
|
|
List<string> hblist = null;
|
|
|
|
|
hblist = dto.HouseDto.Select(x => x.HBLNo.Trim()).ToList();
|
|
|
|
|
|
|
|
|
|
var newHblnoList = dto.HouseDto.Where(x => string.IsNullOrEmpty(x.GID)).Select(x => x.HBLNo.Trim()).ToList();
|
|
|
|
|
var mlist = DbBus.Get(DbList.AMSCenter).Select<AMS_Master>().Where(x => x.IsDel != true && x.MBLNO == dto.MBLNO.Trim() && x.GID != dto.GID && x.MBLNO != "").ToOne();
|
|
|
|
|
var hlist = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => x.IsDel != true && hblist.Contains(x.HBLNo) && x.PID != dto.GID && x.HBLNo != "").ToOne();
|
|
|
|
|
var hlist = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => x.IsDel != true && newHblnoList.Contains(x.HBLNo)).ToOne();
|
|
|
|
|
//if (mlist != null || hlist != null)
|
|
|
|
|
if (hlist != null) // 日期 AMS去掉主单号重复校验,因为可能存在同一个单号分多次发送的问题
|
|
|
|
|
{
|
|
|
|
@ -867,7 +869,17 @@ namespace djy.Service.Ams
|
|
|
|
|
return req;
|
|
|
|
|
}
|
|
|
|
|
AMSDDto aMSDDto = new AMSDDto();
|
|
|
|
|
aMSDDto.fromdea = AMSAccount.PARAMVALUE;
|
|
|
|
|
if (AMSRequestDEA != null)
|
|
|
|
|
{
|
|
|
|
|
aMSDDto.fromdea = AMSRequestDEA.ItemCode;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
aMSDDto.fromdea = sysOptionConfig.Webconfig.requesterDea;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//aMSDDto.fromdea = AMSAccount.PARAMVALUE;
|
|
|
|
|
aMSDDto.ids = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => x.IsDel != true && x.PID == oid && House.Contains(x.GID)).ToList().Select(x => x.GID).ToList();
|
|
|
|
|
|
|
|
|
|
docContent = JsonConvert.SerializeObject(aMSDDto).ToBase64();
|
|
|
|
|