From 30304784e82d4bba24121328da8eb8490aec4f4f Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期二, 09 七月 2024 18:05:21 +0800
Subject: [PATCH] 更改进厂为待装
---
JavaSource/com/mandi/fendan/service/impl/ErpService.java | 56 ++++++++++++++++++--------------------------------------
1 files changed, 18 insertions(+), 38 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/service/impl/ErpService.java b/JavaSource/com/mandi/fendan/service/impl/ErpService.java
index 408fc8e..de552bc 100644
--- a/JavaSource/com/mandi/fendan/service/impl/ErpService.java
+++ b/JavaSource/com/mandi/fendan/service/impl/ErpService.java
@@ -5,6 +5,7 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.mandi.basicconfig.penum.PrefixEnum;
+import com.mandi.basicconfig.persist.Nckh;
import com.mandi.common.*;
import com.mandi.common.ParamFileter.Fileoperation;
import com.mandi.common.ParamFileter.RegexCheck;
@@ -19,7 +20,9 @@
import com.mandi.fendan.util.ConvertTool;
import com.mandi.fendan.util.FdtoNc;
import com.mandi.fendan.util.persist.*;
+import com.mandi.springmvc.logs.OpLogs;
import com.mandi.system.persist.Login;
+import com.mandi.system.persist.ModuleEnum;
import com.mandi.system.persist.UserType;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.map.HashedMap;
@@ -85,6 +88,9 @@
@Resource
private SqlSessionFactory sqlSessionFactory;
+
+ @Resource
+ private FdVehicleRemarkMapper fdVehicleRemarkMapper;
@Override
public ObjectResult<String> tzPrint(Login lg, String bssNo, String ipadd) {
@@ -374,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);
}
@@ -501,7 +506,6 @@
// mm.put("td_wfdzl",BigDecimalfiter.addscal(0, wt.getTd_wfdzl(),
// Contants.scale));
// } catch (Exception e) {
- // // TODO: handle exception
// }
rl.add(mm);
}
@@ -793,6 +797,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public ObjectResult<Boolean> delFdsheet(Login lg, String bsNo) throws Exception{
ObjectResult<Boolean> or = new ObjectResult<Boolean>();
if (lg == null) {
@@ -874,6 +879,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;
@@ -931,7 +937,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));
@@ -977,7 +983,8 @@
}
}
-
+ // 鍒犻櫎杞﹁締鍒嗗崟鐨勫娉╮emark
+ fdVehicleRemarkMapper.deleteByBusinessNo(bsNo);
or.setCode(0);
or.setItem(true);
return or;
@@ -1059,8 +1066,6 @@
return orr;
}
}
-
-
JsonParser jp = new JsonParser();
Fd_Vehicle fdv1 = new Fd_Vehicle();
// 妫�鏌ヨ溅杈嗕俊鎭�
@@ -1112,7 +1117,7 @@
String tdNo = tdje.getAsString();
if (StringUtils.isNotBlank(tdNo)) {
Fd_XSTD td = this.tdper.getbyTDBH(tdNo);
- if (td == null || td.getTd_wfdsl()<=0 ) { //|| td.isTd_zcwcbz() 瑁呰溅瀹屾垚鏍囧織 涓嶉渶瑕佷簡
+ if (td == null || td.getTd_wfdsl()<=0 ) {
continue;
}
@@ -1121,40 +1126,13 @@
//褰撳墠鐢ㄦ埛鍙兘鐪嬪埌鍙互鎿嶄綔鐨勬彁鍗� 涓嶅彲浠ユ搷浣滅殑鎻愬崟鐪嬩笉鍒�
//鎵�鏈変互涓媏lse鎿嶄綔鍘绘帀
if (StringUtils.isBlank(bsDE)) {
- /*bsDE = td.getTd_cqNo().equals(Contants.nc_ywdy_ZZ) ? Contants.zzSdepartNo :
- td.getTd_cqNo().equals(Contants.nc_ywdy_MS)? Contants.msSdepartNo :
- td.getTd_cqNo().equals(Contants.nc_ywdy_YR)? Contants.yrSdepartNo :
- Contants.kjSdepartNo;*/
bsDE = ConvertTool.ncCovertToYkt(td.getTd_cqNo());
}
-// else {
-// // 閮戝窞
-// if (bsDE.equals(Contants.zzSdepartNo)) {
-// if (!td.getTd_ywdybh().equals(Contants.nc_ywdy_ZZ)) {
-// orr.setCode(1);
-// orr.setErrmsg("鎻愬崟锛�"+td.getTd_ywdybh()+"涓嶆槸閮戝窞鍘傚尯鐨勬彁鍗曪紝涓嶈兘鍚屾椂閰嶅崟锛�");
-// return orr;
-// }
-// } else if(bsDE.equals(Contants.msSdepartNo)) {
-// if (!td.getTd_ywdybh().equals(Contants.nc_ywdy_MS)) {
-// orr.setCode(1);
-// orr.setErrmsg("鎻愬崟锛�"+td.getTd_ywdybh()+"涓嶆槸鏄庢櫉鍘傚尯鐨勬彁鍗曪紝涓嶈兘鍚屾椂閰嶅崟锛�");
-// return orr;
-// }
-// }else {
-// if (!td.getTd_ywdybh().equals(Contants.nc_ywdy_KJ)) {
-// orr.setCode(1);
-// orr.setErrmsg("鎻愬崟锛�"+td.getTd_ywdybh()+"涓嶆槸鏄庢櫉鍘傚尯鐨勬彁鍗曪紝涓嶈兘鍚屾椂閰嶅崟锛�");
-// return orr;
-// }
-// }
-// }
if (StringUtils.isBlank(ziti)) {
ziti = td.getTd_ztbz() == 2 ? "鑷彁" : "闈炶嚜鎻�";
}
if (StringUtils.isBlank(Rcompany)) {
Map<String, Object> mm = this.dqper.getKH(td.getTd_khbh());
- //
/*
* 1銆佸璐告湁鍙戠エ缂栧彿锛屽唴璐告病鏈夊彂绁ㄧ紪鍙�
* 2銆佸唴璐稿彇瀹為檯鍏徃鍚嶇О锛屽璐稿彇鐩稿簲缁勭粐鐨勫叕鍙哥畝绉�+鈥樻姤鍏斥��
@@ -1163,11 +1141,12 @@
if (mm != null) {
Rcompany = mm.get("name") == null ? "" : mm.get("name").toString();
}
+ if(mm == null || mm.size() == 0) { // 瀹㈡埛蹇呴』瀛樺湪锛屽惁鍒欐棤娉曞垎鍗�
+ orr.setCode(1);
+ orr.setErrmsg("璇ユ彁鍗曞鎴蜂笉瀛樺湪锛岃妫�鏌ユ暟鎹紒");
+ return orr;
+ }
} else {
- /*Rcompany = (td.getTd_ywdybh().equals(Contants.nc_ywdy_ZZ)?"閮戝窞鎶ュ叧":
- td.getTd_ywdybh().equals(Contants.nc_ywdy_MT)?"娌冲崡鎶ュ叧":
- td.getTd_ywdybh().equals(Contants.nc_ywdy_MS)?"鏄庢櫉鎶ュ叧":
- "绉戞妧鎶ュ叧");*/
Rcompany = ConvertTool.covertToCustoms(td.getTd_ywdybh());
}
}
@@ -1648,6 +1627,7 @@
}
}
} catch (Exception e) {
+ log.error("閿�鍞笟鍔¤溅杈嗗嚭鍘傜▼搴�" + e.getMessage(),e);
throw new Exception(StringUtils.isEmpty(e.getMessage()) ? "閿�鍞笟鍔¤溅杈嗗嚭鍘傜▼搴忓嚭閿欙紒" : e.getMessage());
}
orr.setCode(0);
--
Gitblit v1.9.3