hjg
2025-02-21 35c31c8f3d501833a7e39fe5da5b02bf55635db4
JavaSource/com/mandi/fendan/service/impl/ErpService.java
@@ -283,7 +283,7 @@
      }
      // 如果是管理员或者非提单更物流公司的操作
      boolean isAdminOrFdAdmin = UserType.admin.toString().equals(lg.getWorkerno())  || StringUtils.isNotBlank(fdAdmin);
      if (StringUtils.isEmpty(companyNo)) {
       if (StringUtils.isEmpty(companyNo)) {
         if (!isAdminOrFdAdmin) { // 如果不是更改车辆分单管理员和也不是系统管理员,需要加上公司no
            companyNo = lg.getDepartno();
         }
@@ -569,7 +569,8 @@
                  /*xstd.getTd_ywdybh().equals(Contants.nc_ywdy_ZZ) ? Contants.nc_ywdy_ZZ:
                        xstd.getTd_ywdybh().equals(Contants.nc_ywdy_MS) ? Contants.nc_ywdy_MS
                        : Contants.nc_ywdy_KJ*/
                  ConvertTool.ncGetDefault(xstd.getTd_ywdybh())
//                  ConvertTool.ncGetDefault(xstd.getTd_ywdybh())
                  ConvertTool.ncGetDefault(xstd.getTd_cqNo())
            );
            // 这个地方改一下,允许fd_mx_wlgs中存在的单查看
            int total = fdMxWlgsMapper.selectCountByTdTdls(xstd.getTd_tdls());
@@ -655,7 +656,8 @@
                  /*xstd.getTd_ywdybh().equals(Contants.nc_ywdy_ZZ) ? Contants.nc_ywdy_ZZ:
                        xstd.getTd_ywdybh().equals(Contants.nc_ywdy_MS) ? Contants.nc_ywdy_MS
                        : Contants.nc_ywdy_KJ*/
                  ConvertTool.ncGetDefault(xstd.getTd_ywdybh())
//                  ConvertTool.ncGetDefault(xstd.getTd_ywdybh())
                  ConvertTool.ncGetDefault(xstd.getTd_cqNo())
            );
            int total = fdMxWlgsMapper.selectCountByTdTdls(xstd.getTd_tdls());
            if (ccr == null && total == 0) {
@@ -1147,7 +1149,8 @@
                     return orr;
                  }
               } else {
                  Rcompany = ConvertTool.covertToCustoms(td.getTd_ywdybh());
//                  Rcompany = ConvertTool.covertToCustoms(td.getTd_ywdybh());
                  Rcompany = ConvertTool.covertToCustoms(td.getTd_cqNo());
               }
            }
            tdl.add(td);
@@ -1695,10 +1698,11 @@
               /*td.getTd_ywdybh().equals(Contants.nc_ywdy_ZZ) ? Contants.nc_ywdy_ZZ
                     :td.getTd_ywdybh().equals(Contants.nc_ywdy_MS) ? Contants.nc_ywdy_MS
                     : Contants.nc_ywdy_KJ*/
               ConvertTool.ncGetDefault(td.getTd_ywdybh())
//               ConvertTool.ncGetDefault(td.getTd_ywdybh())
               ConvertTool.ncGetDefault(td.getTd_cqNo())
         );
         int total = fdMxWlgsMapper.selectCountByTdTdls(td.getTd_tdls());
         int total = fdMxWlgsMapper.selectCountByTdTdls(td.getTd_cqNo());
         if (wldq == null && total == 0) {
            orr.setCode(1);
            orr.setErrmsg("当前账号所属物流公司没有配置该地区的分单权限!");