From 184f6b131eda8fcd592cf66cac2d5d0911ed0b88 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 20 Mar 2023 17:19:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=AC=A1=E9=AA=8C=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/constant/ConstantStatus.java | 4 +++ .../inout/IoOrderReviewController.java | 32 ++++++++++++++++++- .../glxp/api/entity/inout/IoOrderEntity.java | 4 +++ .../res/basic/BasicBussinessTypeResponse.java | 4 +-- .../glxp/api/res/inout/IoOrderResponse.java | 3 ++ src/main/resources/schemas/schema_v2.1.sql | 1 + 6 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index 0f6e3d53..51c84962 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -53,6 +53,10 @@ public class ConstantStatus { public static final Integer ORDER_STATUS_PROCESSING = 9; + public static final Integer ORDER_DELIVERY_STATUS_UN = 1; + public static final Integer ORDER_DELIVERY_STATUS_ED = 2; + + /** * 单据创建类型 2.新增扫码单据，1、新增业务单据，3、正常单据处理 */ diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 0b021840..7784e7f0 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -84,7 +84,7 @@ public class IoOrderReviewController extends BaseController { } - //前端直接验收完成 + //前端二次审核 @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/web/updateStatus") public BaseResponse webUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest, @@ -100,6 +100,23 @@ public class IoOrderReviewController extends BaseController { return updateReview(getUser(), orderEntity); } + //前端第三次验收 + @AuthRuleAnnotation("") + @PostMapping("/spms/inout/order/third/updateStatus") + public BaseResponse thirdUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + IoOrderEntity orderEntity = orderService.findByBillNo(updateExportStatusRequest.getOrderId()); + if (orderEntity == null) { + return ResultVOUtils.error(500, "未找到该业务单据"); + } + return thirdUpdateReview(getUser(), orderEntity); + } + + @Resource IoCodeService codeService; @Resource @@ -347,5 +364,18 @@ public class IoOrderReviewController extends BaseController { return ResultVOUtils.success("更新成功"); } + //前端第三次验收 + public BaseResponse thirdUpdateReview(AuthAdmin authAdmin, IoOrderEntity orderEntity) { + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED); + orderEntity.setReviewUser(authAdmin.getId() + ""); + orderEntity.setUpdateTime(new Date()); + orderEntity.setAuditTime(new Date()); + orderEntity.setDeliveryStatus(ConstantStatus.ORDER_DELIVERY_STATUS_ED); + orderService.update(orderEntity); + redisUtil.del(ConstantStatus.REDIS_BILLNO + orderEntity.getBillNo()); + redisUtil.del(ConstantStatus.REDIS_BILLNO_CODES + orderEntity.getBillNo()); + //验收完成->进入流程 + return ResultVOUtils.success("更新成功"); + } } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index 39149e06..0039597a 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -217,4 +217,8 @@ public class IoOrderEntity { @TableField(value = "busType") private Integer busType; //1:正常；2：送货；3.到货 + + @TableField(value = "deliveryStatus") + private Integer deliveryStatus; //单据送货验收状态 + } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 4b400205..a5d122f4 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -41,7 +41,7 @@ public class BasicBussinessTypeResponse { /** * 是否预入库 */ - private Boolean advanceType; +// private Boolean advanceType; private Boolean changeEnable; private Boolean genUnit; private String defaultUnit; @@ -81,7 +81,7 @@ public class BasicBussinessTypeResponse { private String prefix; private String localPrefix; - private boolean preIn; + // private boolean preIn; private boolean preInBack; private boolean outToSpms; private boolean ullageFill; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 588d5ceb..d7ce1c54 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -216,6 +216,9 @@ public class IoOrderResponse { */ private Integer exportStatus; + private Integer deliveryStatus; + + /** * 校验信息 */ diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index b1facf6a..3d0ade99 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -3,6 +3,7 @@ CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 1); CALL Pro_Temp_ColumnWork('io_order', 'busType', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'deliveryStatus', 'tinyint ', 1); CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3); CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3);