diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java index 9ba4e5c5b..9474447c9 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java @@ -1,11 +1,11 @@ -/** +/** * @Project: emis * @Title: EmisWaybillAttachmentController.java * @author linfso * @date 2024-03-01 03:51:55 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:
运单附件 控制器
*/ @@ -15,15 +15,18 @@ import java.util.*; import javax.servlet.http.HttpServletResponse; 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.EmisWaybillProblemInfo; import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.enumtype.WaybillAttachType; import com.xdadan.erp.emis.domain.enumtype.WaybillStatus; 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.service.EmisBaseService; import com.xdadan.erp.emis.service.IEmisTmsScanRecordService; +import com.xdadan.erp.emis.service.IEmisWaybillService; import com.xdadan.erp.emis.utils.WaybillHelper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -49,7 +52,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillAttachmentService; /** * 运单附件Controller - * + * * @author linfso * @date 2024-03-01 03:51:55 */ @@ -66,6 +69,9 @@ public class EmisWaybillAttachmentController extends EmisBaseController @Autowired private IEmisTmsScanRecordService emisTmsScanRecordService; + @Autowired + private IEmisWaybillService emisWaybillService; + /** * 查询运单附件列表 */ @@ -226,7 +232,26 @@ public class EmisWaybillAttachmentController extends EmisBaseController return AjaxResult.success("上传成功"); }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