aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: tms-运单管理-运单签收图片上传-已签收的运单，单独上传图片，不会同步更新签收记录中的图片bug修复

Browse Source
This commit is contained in:
aike 2026-04-15 14:49:50 +08:00
parent c5ade5154e
commit 623e36e0da
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
View File

@ -15,15 +15,18 @@ import java.util.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.domain.EmisWaybill;
import com.xdadan.erp.emis.domain.EmisWaybillProblemInfo; import com.xdadan.erp.emis.domain.EmisWaybillProblemInfo;
import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.enumtype.ScanType;
import com.xdadan.erp.emis.domain.enumtype.WaybillAttachType; import com.xdadan.erp.emis.domain.enumtype.WaybillAttachType;
import com.xdadan.erp.emis.domain.enumtype.WaybillStatus; import com.xdadan.erp.emis.domain.enumtype.WaybillStatus;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.vo.WaybillOrder;
import com.xdadan.erp.emis.domain.vo.scan.ScanInfo; import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.service.IEmisTmsScanRecordService; import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
import com.xdadan.erp.emis.service.IEmisWaybillService;
import com.xdadan.erp.emis.utils.WaybillHelper; import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -66,6 +69,9 @@ public class EmisWaybillAttachmentController extends EmisBaseController
@Autowired @Autowired
private IEmisTmsScanRecordService emisTmsScanRecordService; private IEmisTmsScanRecordService emisTmsScanRecordService;
@Autowired
private IEmisWaybillService emisWaybillService;
/** /**
* 查询运单附件列表 * 查询运单附件列表
*/ */
@ -226,7 +232,26 @@ public class EmisWaybillAttachmentController extends EmisBaseController
return AjaxResult.success("上传成功"); return AjaxResult.success("上传成功");
}else{ }else{
// 上传签收图片 // 上传签收图片
return toAjax(emisWaybillAttachmentService.insertEmisWaybillAttachment(emisWaybillAttachment)); emisWaybillAttachmentService.insertEmisWaybillAttachment(emisWaybillAttachment);
try {
WaybillOrder waybillOrder = emisWaybillService.getWaybillOrderByBillCode(emisWaybillAttachment.getBillCode());
if (waybillOrder != null && StringUtils.isNotBlank(waybillOrder.getBillPicDispatchRmk())) {
EmisTmsScanRecord scanQuery = new EmisTmsScanRecord();
scanQuery.setBillCode(waybill.getBillCode());
scanQuery.setScanType(ScanType.SIGNED.opCode);
List<EmisTmsScanRecord> signedScanList = emisTmsScanRecordService.selectEmisTmsScanRecordList(scanQuery);
if (signedScanList != null && !signedScanList.isEmpty()) {
EmisTmsScanRecord updateScanRecord = new EmisTmsScanRecord();
updateScanRecord.setId(signedScanList.get(0).getId());
updateScanRecord.setPicUrl(waybillOrder.getBillPicDispatchRmk());
emisTmsScanRecordService.updateEmisTmsScanRecord(updateScanRecord);
}
}
} catch (Exception e) {
e.printStackTrace();
return AjaxResult.error("上传异常!");
}
return AjaxResult.success("上传成功");
} }
} }