From 0ba3afb5a1b81c42ff777f67fffcbd659be282dd Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 17 Jun 2025 10:57:37 +0800 Subject: [PATCH] md --- .../web/emis/EmisTmsCostFeeController.java | 36 +++++++++++++++++++ .../emis/service/IEmisTmsCostFeeService.java | 3 ++ .../impl/EmisTmsCostFeeServiceImpl.java | 8 +++++ 3 files changed, 47 insertions(+) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java index 70197d3cc..e21858ade 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java @@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONObject; +import com.xdadan.erp.emis.domain.EmisTransPlanRule; import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.utils.WaybillHelper; @@ -136,6 +137,41 @@ public class EmisTmsCostFeeController extends BaseController } + /** + * Excel草稿方式新增 + */ +// @PreAuthorize("@ss.hasPermi('emis:emisTransPlanRule:draftSubmitTmsCostFee')") + @PostMapping(value = "/draftSubmitTmsCostFee") + public AjaxResult draftSubmitTmsCostFee(@RequestBody EmisTmsCostFee emisTmsCostFee) { + JSONObject jObjOut = new JSONObject(); + String result = "success"; + String msg = "提交成功"; + try { + emisTmsCostFeeService.insertEmisTmsCostFee(emisTmsCostFee); +// emisTmsCostFeeService.draftSubmitTmsCostFee(emisTmsCostFee); + jObjOut.put("ruleDetail", emisTmsCostFee); + } 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); + } + + @Log(title = "重新计算运单费用", businessType = BusinessType.UPDATE) @PostMapping("/reCalcSplitCostFee") diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java index 272c560be..dca4bb758 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java @@ -54,6 +54,9 @@ public interface IEmisTmsCostFeeService */ public int insertEmisTmsCostFee(EmisTmsCostFee emisTmsCostFee) throws EmisBizError; + + public int draftSubmitTmsCostFee(EmisTmsCostFee emisTmsCostFee) throws EmisBizError; + /** * 修改TMS运输成本账单 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java index f0bfa6b36..6cfce4538 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java @@ -106,6 +106,14 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService return emisTmsCostFeeMapper.checkUnique(emisTmsCostFee); } + + @Override + @Transactional + public int draftSubmitTmsCostFee(EmisTmsCostFee emisTmsCostFee) throws EmisBizError { + return 1; + } + + /** * 新增TMS运输成本账单 *