diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java index 9dd322a..439ace1 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java @@ -82,6 +82,8 @@ public class Oms2cWaybillController extends BaseController @Log(title = "OMSExcel草稿方式下单", businessType = BusinessType.INSERT) @PostMapping(value = "/draftSubmitOrder") public AjaxResult draftSubmitOrder(@RequestBody EmisWaybill emisWaybillSave){ + waybillOrder.setUserId(getLoginUser().getUser().getId()); + waybillOrder.setCustomerCode(getLoginUser().getUser().getCustomerCode()); return this.iRpcWaybillSvc.draftSubmitOrderByOms(emisWaybillSave); } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybill.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybill.java index 9d8a7cb..0a1c137 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybill.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybill.java @@ -427,8 +427,6 @@ public class EmisWaybill extends BaseEntity /* ext_info */ private String extInfo; - - @TableField(exist = false) private List cargoList; @TableField(exist = false) diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java index 8e53c5a..b767a2b 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java @@ -42,7 +42,12 @@ public interface IRpcWaybillSvc { public AjaxResult getWaybillDetailByOms(@RequestParam("billCode")String billCode,@RequestParam("orderSn") String orderSn); - @PostMapping(value = "/draftSubmitOrderByOms") + /** + * oms批量下单 + * @param emisWaybillSave + * @return + */ + @PostMapping(value = "/apiweb/emisWaybill/draftSubmitOrderByOms") public AjaxResult draftSubmitOrderByOms(@RequestBody EmisWaybill emisWaybillSave); } \ No newline at end of file