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 a677abc89..74f73e69f 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 @@ -163,10 +163,9 @@ public class EmisWaybillAttachmentController extends EmisBaseController { if(StringUtils.isEmpty(emisWaybillAttachment.getFileUrl())){ - return AjaxResult.error("附件路径为空!"); + return AjaxResult.error("附件fileUrl必传"); } - // 0-GOODS_PIC 1-揽收底单 2-签收底单 if(WaybillAttachType.SIGNED_PIC.typeCode.equals(emisWaybillAttachment.getAttachType())){ // 检查运单是否签收,如果没有签收需要做图片签收 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index 8762985a5..b7c265666 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -29,7 +29,6 @@ public interface EmisWaybillMapper extends BaseMapper public EmisWaybill selectEmisWaybillByBillCode(@Param("billCode")String billCode); - public List selectWaybillStatByEmpCode(@Param("empCode")String empCode,@Param("waybillStatus")String waybillStatus); public List selectCommissionStatDataByEmp(@Param("empCode")String empCode); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index d5ce2e435..c3134bc09 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -444,6 +444,7 @@ public class EmisBaseService { return emisWaybillMapper.selectEmisWaybillByBillCode(billCode); } + /** * 更新打印状态 * @param billCode