新增单据第三次验收

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、正常单据处理
      */

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("更新成功");
+    }
 
 }

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;     //单据送货验收状态
+
 }

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;

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -216,6 +216,9 @@ public class IoOrderResponse {
      */
     private Integer exportStatus;
 
+    private Integer deliveryStatus;
+
+
     /**
      * 校验信息
      */

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);