diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransPlanRuleController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransPlanRuleController.java
index a92dab6ab..03b269140 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransPlanRuleController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransPlanRuleController.java
@@ -3,6 +3,7 @@ package com.xdadan.erp.web.emis;
import java.util.List;
import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.fastjson.JSONObject;
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.core.page.TableDataInfo;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.xdadan.erp.emis.domain.EmisTransPlanRule;
import com.xdadan.erp.emis.service.IEmisTransPlanRuleService;
+import org.springframework.dao.DuplicateKeyException;
/**
* 供应商线路规划Controller
@@ -77,8 +79,32 @@ public class EmisTransPlanRuleController extends EmisBaseController {
*/
@PreAuthorize("@ss.hasPermi('emis:emisTransPlanRule:draftSubmitRule')")
@PostMapping(value = "/draftSubmitRule")
- public AjaxResult draftSubmitRule(@RequestBody EmisTransPlanRule emisTransPlanRule) throws EmisBizError {
- return toAjax(emisTransPlanRuleService.draftSubmitRule(emisTransPlanRule));
+ public AjaxResult draftSubmitRule(@RequestBody EmisTransPlanRule emisTransPlanRule) {
+ JSONObject jObjOut = new JSONObject();
+ String result = "success";
+ String msg = "提交成功";
+ try {
+ emisTransPlanRuleService.draftSubmitRule(emisTransPlanRule);
+ jObjOut.put("ruleDetail", emisTransPlanRule);
+ } catch (EmisBizError ex) {
+ ex.printStackTrace();
+ result = "fail";
+ msg = ex.getErrorCode() + ":" + ex.getMessage();
+ } catch (DuplicateKeyException e) {
+ e.printStackTrace();
+ result = "fail";
+ msg = "数据重复";
+ } catch (Exception ex) {
+ result = "fail";
+ ex.printStackTrace();
+ msg = "系统异常:" + ex.getMessage();
+ if (ex instanceof EmisBizError) {
+ msg = ((EmisBizError) ex).getErrorCode() + ":" + ex.getMessage();
+ }
+ }
+ jObjOut.put("result", result);
+ jObjOut.put("msg", msg);
+ return AjaxResult.success("成功", jObjOut);
}
/**
diff --git a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
index 38acc2e15..5989f4b4d 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
@@ -74,13 +74,13 @@
diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
index 03696f49d..88d4ad29f 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
s1.site_name as start_site_name, r.next_site_code, s2.site_name as next_site_name,
r.manager, r.supplier_code, r.start_date, r.end_date, r.remark,
r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time, r.create_site, r.update_site,
- l.line_name,
+ l.line_name,l.trans_manager,
(SELECT GROUP_CONCAT(s.name)
FROM emis_supplier s
WHERE FIND_IN_SET(s.code, r.supplier_code)