md
This commit is contained in:
parent
6ea6433f1a
commit
0ba3afb5a1
@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
import cn.hutool.core.collection.CollectionUtil;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
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.EmisWaybill;
|
||||||
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
||||||
import com.xdadan.erp.emis.utils.WaybillHelper;
|
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)
|
@Log(title = "重新计算运单费用", businessType = BusinessType.UPDATE)
|
||||||
@PostMapping("/reCalcSplitCostFee")
|
@PostMapping("/reCalcSplitCostFee")
|
||||||
|
|||||||
@ -54,6 +54,9 @@ public interface IEmisTmsCostFeeService
|
|||||||
*/
|
*/
|
||||||
public int insertEmisTmsCostFee(EmisTmsCostFee emisTmsCostFee) throws EmisBizError;
|
public int insertEmisTmsCostFee(EmisTmsCostFee emisTmsCostFee) throws EmisBizError;
|
||||||
|
|
||||||
|
|
||||||
|
public int draftSubmitTmsCostFee(EmisTmsCostFee emisTmsCostFee) throws EmisBizError;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改TMS运输成本账单
|
* 修改TMS运输成本账单
|
||||||
*
|
*
|
||||||
|
|||||||
@ -106,6 +106,14 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
|
|||||||
return emisTmsCostFeeMapper.checkUnique(emisTmsCostFee);
|
return emisTmsCostFeeMapper.checkUnique(emisTmsCostFee);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Transactional
|
||||||
|
public int draftSubmitTmsCostFee(EmisTmsCostFee emisTmsCostFee) throws EmisBizError {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增TMS运输成本账单
|
* 新增TMS运输成本账单
|
||||||
*
|
*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user