diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java index b261926..ee7fffa 100644 --- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java @@ -137,17 +137,16 @@ public class WaybillController extends BaseController } } - @Log(title = "Excel草稿方式下单", businessType = BusinessType.INSERT) + @Log(title = "OMSExcel草稿方式下单", businessType = BusinessType.INSERT) @PostMapping(value = "/draftSubmitOrderByOms") public AjaxResult draftSubmitOrderByOms(@RequestBody EmisWaybill emisWaybillSave) { - JSONObject jObjOut = new JSONObject(); String result="success"; String msg="下单成功"; try { - emisWaybillService.draftSubmitOrder(emisWaybillSave); + emisWaybillService.draftSubmitOrder(emisWaybillSave,true); jObjOut.put("billDetail", emisWaybillSave); }catch(EmisBizError ex){ @@ -171,7 +170,6 @@ public class WaybillController extends BaseController if(ex instanceof EmisBizError){ msg=((EmisBizError)ex).getErrorCode()+":"+ex.getMessage(); } - } jObjOut.put("result", result); jObjOut.put("msg", msg);