diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java index 177405fa..42a97a29 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java @@ -95,31 +95,36 @@ public class AppPmsController extends BaseController { @Log(title = "Pms出库单请求", skipAuth = true) @PostMapping("/orderOut") @Anonymous - public AjaxResult pmsOrderOut(@RequestBody PmsOrderOutRequest orderOutRequest) { - // TODO + public AjaxResult pmsOrderOut(@RequestBody List orderOutRequests) { + if(orderOutRequests == null || orderOutRequests.isEmpty()) { + return error("请求数据为空。"); + } + int insertRow = 0; // 判断请求数据完整性 - if (StringUtils.isEmpty(orderOutRequest.getListId()) - || orderOutRequest.getOrderType() == null - || StringUtils.isEmpty(orderOutRequest.getGoodsId()) - || orderOutRequest.getGoodsNum() == null - || StringUtils.isEmpty(orderOutRequest.getGoodsDesc())) { - return error("请求数据不完整。"); + for(PmsOrderOutRequest orderOutRequest : orderOutRequests) { + if (StringUtils.isEmpty(orderOutRequest.getListId()) + || orderOutRequest.getOrderType() == null + || StringUtils.isEmpty(orderOutRequest.getGoodsId()) + || orderOutRequest.getGoodsNum() == null + || StringUtils.isEmpty(orderOutRequest.getGoodsDesc())) { + return error("请求数据不完整。"); + } + // 判断入库单号是否重复 + AppPmsOrderOut existAppPmsOrderOut = appPmsOrderOutService.selectAppPmsOrderOutByListId(orderOutRequest.getListId()); + if (existAppPmsOrderOut != null) { + return error("出库单号重复。"); + } + AppPmsOrderOut appPmsOrderOut = new AppPmsOrderOut(); + appPmsOrderOut.setListId(orderOutRequest.getListId()); + appPmsOrderOut.setOrderType(Long.valueOf(orderOutRequest.getOrderType())); + appPmsOrderOut.setCustomerId(orderOutRequest.getCustomerId()); + appPmsOrderOut.setGoodsId(orderOutRequest.getGoodsId()); + appPmsOrderOut.setGoodsNum(BigDecimal.valueOf(orderOutRequest.getGoodsNum())); + appPmsOrderOut.setGoodsDesc(orderOutRequest.getGoodsDesc()); + appPmsOrderOut.setCreateTime(new Date()); + appPmsOrderOut.setUpdateTime(new Date()); + insertRow += appPmsOrderOutService.insertAppPmsOrderOut(appPmsOrderOut); } - // 判断入库单号是否重复 - AppPmsOrderOut existAppPmsOrderOut = appPmsOrderOutService.selectAppPmsOrderOutByListId(orderOutRequest.getListId()); - if (existAppPmsOrderOut != null) { - return error("出库单号重复。"); - } - AppPmsOrderOut appPmsOrderOut = new AppPmsOrderOut(); - appPmsOrderOut.setListId(orderOutRequest.getListId()); - appPmsOrderOut.setOrderType(Long.valueOf(orderOutRequest.getOrderType())); - appPmsOrderOut.setCustomerId(orderOutRequest.getCustomerId()); - appPmsOrderOut.setGoodsId(orderOutRequest.getGoodsId()); - appPmsOrderOut.setGoodsNum(BigDecimal.valueOf(orderOutRequest.getGoodsNum())); - appPmsOrderOut.setGoodsDesc(orderOutRequest.getGoodsDesc()); - appPmsOrderOut.setCreateTime(new Date()); - appPmsOrderOut.setUpdateTime(new Date()); - - return toAjax(appPmsOrderOutService.insertAppPmsOrderOut(appPmsOrderOut)); + return insertRow == orderOutRequests.size() ? success("success") : error("出库单保存失败"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/PmsOrderOutRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/PmsOrderOutRequest.java index 908bcc85..91d8a9f4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/PmsOrderOutRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/PmsOrderOutRequest.java @@ -1,7 +1,7 @@ package com.ruoyi.web.domain; /** - * Pms订单入库请求 + * Pms订单出库请求 */ public class PmsOrderOutRequest { /**