ddlucky 1 year ago
parent 8d39a93510
commit 1a1ed7b667

@ -457,6 +457,7 @@ namespace VOL.WMS.Services
if (!FileList.isNullorEmpty())
{
var vw = VW_OP_WMS_OUT_PLANRepository.Instance.FindFirst(x => x.WMSPLANID == head.WMSPLANID);
INFO_FILESService.DealSaveDetail(FileList, head.WMSPLANID.ToString(), head.WMSNO, "出库通知", vw.MBLNO, vw.CNTRNO);
}
@ -819,7 +820,7 @@ namespace VOL.WMS.Services
}
if (updtrucklist.Exists(x => x.TRUCKNO == truckno))
{
return addtrucklist.First(x => x.TRUCKNO == truckno).GID;
return updtrucklist.First(x => x.TRUCKNO == truckno).GID;
}
return new Guid();
}
@ -828,26 +829,30 @@ namespace VOL.WMS.Services
foreach (var item in TruckList)
{
if (string.IsNullOrWhiteSpace(item.IMGPATH)) continue;
if (currFileList != null && currFileList.Count() > 0 && currFileList.Exists(x => x.GID == item.GID))
{
//更新imgpath
//if (currFileList != null && currFileList.Count() > 0 && currFileList.Exists(x => x.GID == item.GID))
//{
// //更新imgpath
var updrec = currFileList.First(x => x.GID == item.GID);
updrec.IMGPATH=item.IMGPATH;
updFilelist.Add(updrec);
if (FileList.Exists(x => x.GID == item.GID)) {
FileList.First(x => x.GID == item.GID).IMGPATH= item.IMGPATH;
FileList.First(x => x.GID == item.GID).FILENAME = item.TRUCKNO;
}
}
else if (addFilelist.Exists(x => x.FILENAME == item.TRUCKNO))
// var updrec = currFileList.First(x => x.GID == item.GID);
// updrec.IMGPATH=item.IMGPATH;
// updFilelist.Add(updrec);
// if (FileList.Exists(x => x.GID == item.GID)) {
// if (!string.IsNullOrWhiteSpace(item.IMGPATH))
// FileList.First(x => x.GID == item.GID).IMGPATH= item.IMGPATH;
// FileList.First(x => x.GID == item.GID).FILENAME = item.TRUCKNO;
// }
//}
//else
if (addFilelist.Exists(x => x.FILENAME == item.TRUCKNO))
{
var updrec = currFileList.First(x => x.GID == item.GID);
if (!string.IsNullOrWhiteSpace(updrec.IMGPATH)) updrec.IMGPATH += ",";
if (!string.IsNullOrWhiteSpace(updrec.IMGPATH))
updrec.IMGPATH += ",";
updrec.IMGPATH += item.IMGPATH;
updFilelist.Add(updrec);
@ -861,7 +866,7 @@ namespace VOL.WMS.Services
var newfile = AutoMapperHelper.MapTo<VW_OP_TRUCK_FILE, INFO_FILES>(item);
newfile.GID = Getgid(item.TRUCKNO);
newfile.GID = Guid.Empty; //Getgid(item.TRUCKNO);
newfile.PID = head.WMSPLANID;
newfile.FILETYPE = "出库通知";
newfile.UPLOADEMPLY = userInfo.UserTrueName;

Loading…
Cancel
Save