From 35c31c8f3d501833a7e39fe5da5b02bf55635db4 Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期五, 21 二月 2025 15:56:29 +0800
Subject: [PATCH] 账号没有配置该地区的分单权限
---
JavaSource/com/mandi/fendan/service/impl/ErpService.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/service/impl/ErpService.java b/JavaSource/com/mandi/fendan/service/impl/ErpService.java
index 2be6e21..eaaaf09 100644
--- a/JavaSource/com/mandi/fendan/service/impl/ErpService.java
+++ b/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) { // 濡傛灉涓嶆槸鏇存敼杞﹁締鍒嗗崟绠＄悊鍛樺拰涔熶笉鏄郴缁熺鐞嗗憳锛岄渶瑕佸姞涓婂叕鍙竛o
companyNo = lg.getDepartno();
}
@@ -380,7 +380,6 @@
mm.put("td_wfdsl", wt.getTd_wfdsl());
mm.put("td_wfdzl", BigDecimalfiter.addscal(0, wt.getTd_wfdzl(), Contants.scale));
} catch (Exception e) {
- // TODO: handle exception
}
rl.add(mm);
}
@@ -507,7 +506,6 @@
// mm.put("td_wfdzl",BigDecimalfiter.addscal(0, wt.getTd_wfdzl(),
// Contants.scale));
// } catch (Exception e) {
- // // TODO: handle exception
// }
rl.add(mm);
}
@@ -571,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());
@@ -657,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) {
@@ -881,6 +881,7 @@
String xstdNo = VX.getXstdNo();
List<Fd_XSTDMX> mxl = new ArrayList<Fd_XSTDMX>();
Fd_XSTD xstd = this.tdper.getbyTDBH(xstdNo);
+ if(xstd==null) continue;
List<Fd_XSTDMX> MXL = this.tdmxper.getbyBsNoandcmNo(xstd.getTd_tdls(), bsNo, lg.getDepartno());
double ZZL = 0;
int ZZS = 0;
@@ -938,7 +939,7 @@
this.fdvcper.del(vehicleId, lg.getDepartno(), fb.getSdepartNo());
- // 鍙戦�丯C绯荤粺鍒犻櫎鍒嗗崟淇℃伅
+ // 鍙戦�丯C绯荤粺鍒犻櫎鍒嗗崟淇℃伅 todo 鍙戦�乶c鏆傛椂鍙栨秷鎺夛紝姝ｅ紡瑕佹仮澶�
if (tdl != null && tdl.size() > 0) {
Fileoperation.AppendContentToFile(Fileoperation.gettestFileName(),
"鍙栨秷閰嶈溅涓氬姟鍗� 璇锋眰鎻愬崟 ::" + Jacksonmethod.tojson(tdl, false));
@@ -1148,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);
@@ -1696,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("褰撳墠璐﹀彿鎵�灞炵墿娴佸叕鍙告病鏈夐厤缃鍦板尯鐨勫垎鍗曟潈闄愶紒");
--
Gitblit v1.9.3