From 9ce4bb2b6bd1378ba7b0bd6681d22cb37a5e1452 Mon Sep 17 00:00:00 2001
From: Administrator <hbal>
Date: 星期四, 15 十二月 2022 15:45:47 +0800
Subject: [PATCH] 空客户不配车
---
JavaSource/com/mandi/fendan/service/impl/ErpService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/service/impl/ErpService.java b/JavaSource/com/mandi/fendan/service/impl/ErpService.java
index 408fc8e..cf311e3 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;
@@ -793,6 +796,7 @@
}
@Override
+ @Transactional
public ObjectResult<Boolean> delFdsheet(Login lg, String bsNo) throws Exception{
ObjectResult<Boolean> or = new ObjectResult<Boolean>();
if (lg == null) {
@@ -1059,8 +1063,6 @@
return orr;
}
}
-
-
JsonParser jp = new JsonParser();
Fd_Vehicle fdv1 = new Fd_Vehicle();
// 妫�鏌ヨ溅杈嗕俊鎭�
@@ -1154,6 +1156,11 @@
}
if (StringUtils.isBlank(Rcompany)) {
Map<String, Object> mm = this.dqper.getKH(td.getTd_khbh());
+ if(mm == null || mm.size() == 0) { // 瀹㈡埛蹇呴』瀛樺湪锛屽惁鍒欐棤娉曞垎鍗�
+ orr.setCode(1);
+ orr.setErrmsg("璇ユ彁鍗曞鎴蜂笉瀛樺湪锛岃妫�鏌ユ暟鎹紒");
+ return orr;
+ }
//
/*
* 1銆佸璐告湁鍙戠エ缂栧彿锛屽唴璐告病鏈夊彂绁ㄧ紪鍙�
--
Gitblit v1.9.3