1.修改单据状态值

src/main/java/com/glxp/api/constant/ConstantStatus.java

@@ -6,13 +6,47 @@ package com.glxp.api.constant;
 public class ConstantStatus {
 
     //订单状态
-    public static final Integer ORDER_STATUS_TEMP_SAVE = -1;   //等待提交(草稿）
-    public static final Integer ORDER_STATUS_PROCESS = 1;   //等待处理
-    public static final Integer ORDER_STATUS_CHECK = 2;     //等待校验
-    public static final Integer ORDER_STATUS_FAIL = 3;      //单据校验失败
-    public static final Integer ORDER_STATUS_SUCCESS = 4;   //已校验
+
+    /**
+     * 等待提交(草稿）
+     */
+    public static final Integer ORDER_STATUS_TEMP_SAVE = -1;
+
+    /**
+     * 已提交待处理
+     */
+    public static final Integer ORDER_STATUS_PROCESS = 2;
+
+    /**
+     * 处理成功待校验
+     */
+    public static final Integer ORDER_STATUS_CHECK = 3;
+
+    /**
+     * 处理异常
+     */
+    public static final Integer ORDER_STATS_ERROR = 4;
+
+    /**
+     * 校验成功待审核
+     */
+    public static final Integer ORDER_STATUS_CHECK_SUCCESS = 5;
+
+    /**
+     * 校验失败
+     */
+    public static final Integer ORDER_STATUS_CHECK_FAIL = 6;
+
+    /**
+     * 审核通过
+     */
+    public static final Integer ORDER_STATUS_AUDITED = 7;
+
+    /**
+     * 审核拒绝
+     */
+    public static final Integer ORDER_STATUS_AUDITED_REFUSED = 8;
     public static final Integer ORDER_STATUS_ADDITIONAL = 5;    //补录单据
-    public static final Integer ORDER_STATUS_DOING = 6;
     public static final Integer ORDER_STATUS_RECEIVEED = 7;
 
     //订单处理状态

src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java

@@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 @Data
 @TableName(value = "io_order")
 public class IoOrderEntity implements Serializable {
@@ -65,7 +64,7 @@ public class IoOrderEntity implements Serializable {
     private Integer fromType;
 
     /**
-     * 1:草稿；2:已提交待处理;3:处理成功待校验;3:处理异常;4:校验成功待审核;5:校验失败;6:审核通过;7:审核拒绝
+     * 1:草稿；2:已提交待处理;3:处理成功待校验;4:处理异常;5:校验成功待审核;6:校验失败;7:审核通过;8:审核拒绝
      */
     @TableField(value = "`status`")
     private Integer status;

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

@@ -154,5 +154,9 @@ public class IoOrderDetailCodeResponse {
 
     private boolean checkSuccess;
 
+    /**
+     * 供应商名称
+     */
+    private String supName;
 
 }

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -7,8 +7,6 @@ import com.glxp.api.constant.ConstantType;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvPreinDetailEntity;
-import com.glxp.api.entity.inv.InvProductDetailEntity;
-import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inv.InvPreinDetailService;
 import com.glxp.api.service.inv.InvPreinOrderService;
@@ -110,7 +108,7 @@ public class IoCheckInoutService {
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderEntity.getBillNo());
 
         if (CollUtil.isEmpty(orderDetailCodeEntities)) {
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_FAIL);
             orderEntity.setUpdateTime(new Date());
             orderEntity.setErrMsg("校验失败，扫码详情为空！");
             orderService.update(orderEntity);
@@ -140,7 +138,7 @@ public class IoCheckInoutService {
         }
         codeTempService.deleteByBillNo(orderEntity.getBillNo());
 
-        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
+        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
         orderEntity.setUpdateTime(new Date());
         orderService.update(orderEntity);
         checkSecond(orderEntity);
@@ -152,7 +150,7 @@ public class IoCheckInoutService {
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(orderEntity.getBillNo());
 
         if (CollUtil.isEmpty(orderDetailCodeEntities)) {
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_FAIL);
             orderEntity.setUpdateTime(new Date());
             orderEntity.setErrMsg("校验失败，扫码详情为空！");
             orderService.update(orderEntity);
@@ -160,7 +158,7 @@ public class IoCheckInoutService {
         }
 
         if (CollUtil.isEmpty(orderDetailBizEntities)) {
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_FAIL);
             orderEntity.setUpdateTime(new Date());
             orderEntity.setErrMsg("校验失败，业务详情为空！");
             orderService.update(orderEntity);
@@ -217,7 +215,7 @@ public class IoCheckInoutService {
 
         if (StrUtil.isNotEmpty(errMsg)) {
             orderEntity.setErrMsg(errMsg + "校验失败");
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_FAIL);
             orderEntity.setUpdateTime(new Date());
             orderService.update(orderEntity);
         } else {
@@ -237,7 +235,7 @@ public class IoCheckInoutService {
             }
             codeTempService.deleteByBillNo(orderEntity.getBillNo());
             orderEntity.setErrMsg("校验成功！");
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
             orderEntity.setUpdateTime(new Date());
             orderService.update(orderEntity);
             checkSecond(orderEntity);