From 62b9fdd570385be5daa5f93b1dfe9a1b202dd8dc Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 12 Oct 2022 15:11:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9D=A1=E7=A0=81=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E9=87=8D=E5=A4=8D=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/OrderController.java | 27 +++++++++++++++++++ .../controller/inout/WareHouseController.java | 6 +++++ .../glxp/udi/admin/dao/inout/OrderDao.java | 8 ++++++ .../udi/admin/service/inout/OrderService.java | 16 +++++++++++ .../service/inout/WarehouseTempService.java | 18 +++++++++++++ .../mybatis/mapper/inout/OrderDao.xml | 4 +++ 6 files changed, 79 insertions(+) diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java index ce845a9..6a56a14 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java @@ -379,6 +379,13 @@ public class OrderController { return ResultVOUtils.success("未选择订单！"); } + /** + * 查询单据详情 + * + * @param filterOrderDetailRequest + * @param bindingResult + * @return + */ @GetMapping(value = "/warehouse/inout/order/detail") public BaseResponse orderDetail(FilterOrderDetailRequest filterOrderDetailRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -411,6 +418,12 @@ public class OrderController { return ResultVOUtils.success("更新成功"); } + /** + * 更新单据信息 + * + * @param orderEditRequest + * @return + */ @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/updateOrderInfo") public BaseResponse updateOrderInfo(@RequestBody OrderEditRequest orderEditRequest) { @@ -607,4 +620,18 @@ public class OrderController { return ResultVOUtils.success("更新成功"); } + /** + * 网页端新增扫码单据提交接口 + * + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/warehouse/inout/order/submitWebScanOrder") + public BaseResponse submitWebScanOrder(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors() || null == addOrderRequest || StrUtil.isBlank(addOrderRequest.getOrderId())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + return orderService.submitWebScanOrder(addOrderRequest.getOrderId()); + } + } diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/WareHouseController.java b/src/main/java/com/glxp/udi/admin/controller/inout/WareHouseController.java index 53ba38d..288f405 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/WareHouseController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/WareHouseController.java @@ -312,6 +312,12 @@ public class WareHouseController { String code = addOrderRequest.getCode(); if (StrUtil.isBlank(code)) { return ResultVOUtils.error(ResultEnum.DATA_ERROR); + } else if (StrUtil.isNotBlank(addOrderRequest.getOrderId())) { + //向已存在的单据中添加此条码，判断此条码是否重复 + boolean exists = warehouseTempService.codeExists(addOrderRequest.getOrderId(), addOrderRequest.getCode()); + if (exists) { + return ResultVOUtils.error(500, "条码重复！"); + } } UdiEntity udiEntity = FilterUdiUtils.getUdi(code); diff --git a/src/main/java/com/glxp/udi/admin/dao/inout/OrderDao.java b/src/main/java/com/glxp/udi/admin/dao/inout/OrderDao.java index 6040a40..2133e21 100644 --- a/src/main/java/com/glxp/udi/admin/dao/inout/OrderDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/inout/OrderDao.java @@ -45,4 +45,12 @@ public interface OrderDao extends BaseMapper { * @return */ int selectStatusByOrderId(@Param("orderId") String orderId); + + /** + * 修改单据状态 + * + * @param orderStatus + * @param orderId + */ + void updateOrderStatus(@Param("orderStatus") Integer orderStatus, @Param("orderId") String orderId); } diff --git a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java index fd298e4..6e48478 100644 --- a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java +++ b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java @@ -537,4 +537,20 @@ public class OrderService { orderDao.deleteById(id); } + /** + * 提交网页端扫码单据 + * + * @param orderId 单据号 + * @return + */ + public BaseResponse submitWebScanOrder(String orderId) { + //查询临时码表，若此单据不存在条码，则无法提交 + int countCount = codesTempDao.countByOrderId(orderId); + if (countCount == 0) { + return ResultVOUtils.error(500, "此单据未添加产品，提交失败！"); + } + //将单据从草稿状态修改为待处理状态 + orderDao.updateOrderStatus(ConstantStatus.ORDER_STATUS_WAIT, orderId); + return ResultVOUtils.success("提交成功"); + } } diff --git a/src/main/java/com/glxp/udi/admin/service/inout/WarehouseTempService.java b/src/main/java/com/glxp/udi/admin/service/inout/WarehouseTempService.java index 56ca1cc..fbba317 100644 --- a/src/main/java/com/glxp/udi/admin/service/inout/WarehouseTempService.java +++ b/src/main/java/com/glxp/udi/admin/service/inout/WarehouseTempService.java @@ -138,4 +138,22 @@ public class WarehouseTempService { public void updateByOrderId(WarehouseEntity warehouseEntity) { codesTempDao.updateByOrderId(warehouseEntity); } + + /** + * 检查条码是否已添加到此单据中 + * + * @param orderId + * @param code + * @return + */ + public boolean codeExists(String orderId, String code) { + QueryWrapper countWrapper = new QueryWrapper<>(); + countWrapper.eq("orderId", orderId) + .eq("code", code); + Long count = codesTempDao.selectCount(countWrapper); + if (null != code && count > 0) { + return true; + } + return false; + } } diff --git a/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 8d97424..b771fd6 100644 --- a/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -27,4 +27,8 @@ + + + update io_order set status = #{orderStatus} where orderId = #{orderId} + \ No newline at end of file