From cf51391fd6d55651fe1ead39d292eeeae2ef7205 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 10 Jan 2025 16:11:49 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisWaybillController.java | 52 +++++++++++++++++++ .../emis/mapper/EmisSalesmenRelMapper.java | 10 +++- .../emis/service/IEmisSalesmenRelService.java | 3 ++ .../impl/EmisSalesmenRelServiceImpl.java | 11 ++++ .../mapper/EmisSalesmenRelMapper.xml | 10 ++++ 5 files changed, 85 insertions(+), 1 deletion(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index 2f4cecfa7..88fa1e7fe 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -71,6 +71,9 @@ public class EmisWaybillController extends EmisBaseController @Autowired private IEmisWaybillService emisWaybillService; + @Autowired + private IEmisSalesmenRelService emisSalesmenRelService; + @Autowired private EmisBaseService emisBaseService; @@ -901,6 +904,55 @@ public class EmisWaybillController extends EmisBaseController return getDataTable(list); } + + // 检查是否可查看运单详情 + @GetMapping("/checkIsCanViewBillDetail") + public AjaxResult checkIsCanViewBillDetail(String billCode) + { + + if(StringUtils.isEmpty(billCode)){ + return AjaxResult.success("billCode is empty","0"); + } + + EmisWaybill billDetail=emisWaybillService.selectEmisWaybillByBillCode(billCode); + if(billDetail==null){ + return AjaxResult.success("bill not exists","0"); + } + + //bug:848 调整后：与运单号关联的：寄件网点、目的网点、签收网点、总部、销售联系人、回款联系人 允许查看 运单信息； + // 其他网点或员工若不相关则不允许查看； + //bug- 目的国除中国外的网点能看到目的是该国的运单信息 + String ownerSiteCode = getLoginUser().getUser().getOwnerSiteCode(); + String ownerCountryCode = getLoginUser().getUser().getCountryCode(); + String empName = getLoginUser().getUser().getEmpName(); + if( + ownerSiteCode.equals(billDetail.getSendSiteCode()) + || ownerSiteCode.equals(billDetail.getDispatchSiteCode()) + || ownerSiteCode.equals(billDetail.getDispatchUnderlingSiteCode()) + || ownerSiteCode.equals(billDetail.getSignSiteCode()) + || ownerSiteCode.equals("88888") + || ownerSiteCode.equals(billDetail.getPayee()) + || empName.equals(billDetail.getSalesmen()) + || (!"0086".equals(billDetail.getReceiveCountry()) + && ownerCountryCode.equals(billDetail.getReceiveCountry()) + ) + ){ + return AjaxResult.success("Success","1"); + } + + // 获取销售关系 + EmisSalesmenRel queryRel = new EmisSalesmenRel(); + queryRel.setSalesAss(empName); + queryRel.setSalesmen(billDetail.getSalesmen()); + int isCheckValid=emisSalesmenRelService.checkRelIsValid(queryRel); + if(isCheckValid>0){ + return AjaxResult.success("Success","1"); + } + + return AjaxResult.success("Success","0"); + + } + /** * 查询扫描统计数据 * 1-发件清单 2-到件清单 3-派件清单 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesmenRelMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesmenRelMapper.java index 7316ab6ac..affc5ba92 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesmenRelMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesmenRelMapper.java @@ -44,7 +44,15 @@ public interface EmisSalesmenRelMapper extends BaseMapper * @return 数量 */ public int checkUnique(EmisSalesmenRel emisSalesmenRel); - + + + /** + * 检查分享关系是否正常 + * @param emisSalesmenRel + * @return + */ + public int checkRelIsValid(EmisSalesmenRel emisSalesmenRel); + /** * 新增 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesmenRelService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesmenRelService.java index 8a978733e..ba6845b3b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesmenRelService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesmenRelService.java @@ -44,6 +44,9 @@ public interface IEmisSalesmenRelService */ public int checkUnique(EmisSalesmenRel emisSalesmenRel); + + public int checkRelIsValid(EmisSalesmenRel emisSalesmenRel); + /** * 新增销售人员关联表 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesmenRelServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesmenRelServiceImpl.java index d80a1ebce..354d3c341 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesmenRelServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesmenRelServiceImpl.java @@ -66,6 +66,17 @@ public class EmisSalesmenRelServiceImpl implements IEmisSalesmenRelService return emisSalesmenRelMapper.checkUnique(emisSalesmenRel); } + /** + * 检查分享关系是否有效 + * @param emisSalesmenRel + * @return + */ + @Override + public int checkRelIsValid(EmisSalesmenRel emisSalesmenRel) + { + return emisSalesmenRelMapper.checkRelIsValid(emisSalesmenRel); + } + /** * 新增销售人员关联表 * diff --git a/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml index 841a63288..a66f1b452 100644 --- a/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml @@ -42,6 +42,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc + +