md

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-派件清单

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesmenRelMapper.java

@@ -44,7 +44,15 @@ public interface EmisSalesmenRelMapper extends BaseMapper<EmisSalesmenRel>
      * @return 数量
      */
     public int checkUnique(EmisSalesmenRel emisSalesmenRel);
-    
+
+
+    /**
+     * 检查分享关系是否正常
+     * @param emisSalesmenRel
+     * @return
+     */
+    public int checkRelIsValid(EmisSalesmenRel emisSalesmenRel);
+
 
     /**
      * 新增 

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);
+
     /**
      * 新增销售人员关联表
      * 

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);
+    }
+
     /**
      * 新增销售人员关联表
      * 

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
     </select>
 
+    <select id="checkRelIsValid" parameterType="EmisSalesmenRel" resultType="int">
+        select count(1) from  emis_salesmen_rel
+        where
+            del_flag='0' and bl_open='1'
+            and now() <![CDATA[ >= ]]> start_date and now() <![CDATA[ <= ]]> end_date
+            and salesmen = #{salesmen}
+            and sales_ass = #{salesAss}
+         limit 1
+    </select>
+
     <select id="checkUnique" parameterType="EmisSalesmenRel"  resultType="int">
 		select count(1) from  emis_salesmen_rel
 		where del_flag='0'