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 | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/service/impl/ErpService.java b/JavaSource/com/mandi/fendan/service/impl/ErpService.java
index 2394b3d..de552bc 100644
--- a/JavaSource/com/mandi/fendan/service/impl/ErpService.java
+++ b/JavaSource/com/mandi/fendan/service/impl/ErpService.java
@@ -89,6 +89,9 @@
@Resource
private SqlSessionFactory sqlSessionFactory;
+ @Resource
+ private FdVehicleRemarkMapper fdVehicleRemarkMapper;
+
@Override
public ObjectResult<String> tzPrint(Login lg, String bssNo, String ipadd) {
ObjectResult<String> orr = new ObjectResult<String>();
@@ -377,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);
}
@@ -504,7 +506,6 @@
// mm.put("td_wfdzl",BigDecimalfiter.addscal(0, wt.getTd_wfdzl(),
// Contants.scale));
// } catch (Exception e) {
- // // TODO: handle exception
// }
rl.add(mm);
}
@@ -796,7 +797,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ObjectResult<Boolean> delFdsheet(Login lg, String bsNo) throws Exception{
ObjectResult<Boolean> or = new ObjectResult<Boolean>();
if (lg == null) {
@@ -878,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;
@@ -935,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));
@@ -981,7 +983,8 @@
}
}
-
+ // 鍒犻櫎杞﹁締鍒嗗崟鐨勫娉╮emark
+ fdVehicleRemarkMapper.deleteByBusinessNo(bsNo);
or.setCode(0);
or.setItem(true);
return or;
@@ -1624,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