Merge remote-tracking branch 'origin/master'

sd-business/src/main/java/com/sd/business/entity/order/enums/OrderExceptionTypeEnum.java

@@ -25,6 +25,7 @@ public enum OrderExceptionTypeEnum {
     SKU_UPDATE(7, "订单商品被更改"),
     NO_DESIGN_DOCUMENT(8, "未绑定图稿"),
     UNDERSTOCK(9, "主材库存不足"),
+    ORDER_CHECK(10, "万里牛状态异常：订单打回审核"),
     ;
 
     private static final Map<Integer, OrderExceptionTypeEnum> map = new HashMap<>();

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -290,6 +290,9 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         if (orderInfo.getWlnStatus() == 12) {
             addExceptionType(orderInfo, OrderExceptionTypeEnum.ORDER_EXCEPTION_HANDLING);
         }
+        if (orderInfo.getWlnStatus() == 0 && Objects.equals(orderInfo.getStatus(), OrderStatusEnum.STOCK_PREPARATION.getKey())) {
+            addExceptionType(orderInfo, OrderExceptionTypeEnum.ORDER_CHECK);
+        }
 
         // 事业部
         if (department == null) {