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

md

Browse Source
This commit is contained in:
linfso 2024-06-15 22:19:54 +08:00
parent 852cf24faf
commit 2621bd66e3
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,10 +163,9 @@ public class EmisWaybillAttachmentController extends EmisBaseController
{ {
if(StringUtils.isEmpty(emisWaybillAttachment.getFileUrl())){ if(StringUtils.isEmpty(emisWaybillAttachment.getFileUrl())){
return AjaxResult.error("附件路径为空！"); return AjaxResult.error("附件fileUrl必传");
} }
// 0-GOODS_PIC 1-揽收底单 2-签收底单 // 0-GOODS_PIC 1-揽收底单 2-签收底单
if(WaybillAttachType.SIGNED_PIC.typeCode.equals(emisWaybillAttachment.getAttachType())){ if(WaybillAttachType.SIGNED_PIC.typeCode.equals(emisWaybillAttachment.getAttachType())){
// 检查运单是否签收，如果没有签收需要做图片签收 // 检查运单是否签收，如果没有签收需要做图片签收

1
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
View File

@ -29,7 +29,6 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
public EmisWaybill selectEmisWaybillByBillCode(@Param("billCode")String billCode); public EmisWaybill selectEmisWaybillByBillCode(@Param("billCode")String billCode);
public List<Map> selectWaybillStatByEmpCode(@Param("empCode")String empCode,@Param("waybillStatus")String waybillStatus); public List<Map> selectWaybillStatByEmpCode(@Param("empCode")String empCode,@Param("waybillStatus")String waybillStatus);
public List<Map> selectCommissionStatDataByEmp(@Param("empCode")String empCode); public List<Map> selectCommissionStatDataByEmp(@Param("empCode")String empCode);

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -444,6 +444,7 @@ public class EmisBaseService {
return emisWaybillMapper.selectEmisWaybillByBillCode(billCode); return emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
} }
/** /**
* 更新打印状态 * 更新打印状态
* @param billCode * @param billCode