国内审批订单同时修改订单数据

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/enums/OrderStatusEnum.java

@@ -0,0 +1,45 @@
+package org.springblade.purchase.sales.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+@Getter
+@AllArgsConstructor
+public enum OrderStatusEnum {
+	/**
+	 * 录入
+	 */
+	ENTERING("录入"),
+	/**
+	 * 提交审批
+	 */
+	SUBMIT("提交审批"),
+
+	/**
+	 * 审批中
+	 */
+	APPROVE("审批中"),
+
+	/**
+	 * 审批通过
+	 */
+	PASS("审批通过"),
+
+
+
+
+	;
+
+	private final String type;
+
+	public static OrderStatusEnum fromType(Integer orderType) {
+		for (OrderStatusEnum type : OrderStatusEnum.values()) {
+			if (Objects.equals(type.getType(), orderType)) {
+				return type;
+			}
+		}
+		throw new IllegalArgumentException("order type not exist");
+	}
+}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -43,6 +43,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.purchase.sales.entity.*;
+import org.springblade.purchase.sales.enums.OrderStatusEnum;
 import org.springblade.purchase.sales.mapper.OrderItemsMapper;
 import org.springblade.purchase.sales.mapper.OrderMapper;
 import org.springblade.purchase.sales.service.IOrderService;
@@ -691,6 +692,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			throw new SecurityException("当前租户未查询到审批流配置");
 		} else {
 			salesOrder.setStatus(1);
+			salesOrder.setOrderStatus(OrderStatusEnum.SUBMIT.getType());
 			salesOrder.setCheckDate(new Date());
 			baseMapper.updateById(salesOrder);
 
@@ -779,6 +781,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			throw new SecurityException("订单已审批通过请勿重复审批");
 		}
 		order.setStatus(3);
+		order.setOrderStatus(OrderStatusEnum.PASS.getType());
 		baseMapper.updateById(order);
 		/**===========================end 审核通过修改销售订单信息==========================*/
 
@@ -914,6 +917,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			throw new SecurityException("审批失败");
 		}
 		order.setStatus(2);
+		order.setOrderStatus(OrderStatusEnum.APPROVE.getType());
 		baseMapper.updateById(order);
 	}
 
@@ -981,6 +985,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 		}
 		order.setStatus(0);
+		order.setOrderStatus(OrderStatusEnum.ENTERING.getType());
 		baseMapper.updateById(order);
 	}
 
@@ -1051,6 +1056,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 		}
 		order.setStatus(0);
+		order.setOrderStatus(OrderStatusEnum.ENTERING.getType());
 		baseMapper.updateById(order);
 		//删除审批流数据
 		AuditProecessDTO proecessDTO = new AuditProecessDTO();