Merge remote-tracking branch 'origin/master'

src/main/java/com/aps/controller/LanuchController.java

@@ -106,6 +106,7 @@ public class LanuchController {
 
         List<ProdSceneConfig> scenes = prodSceneConfigService.lambdaQuery()
                 .eq(ProdSceneConfig::getCreateUser, userId)
+                .orderByDesc(ProdSceneConfig::getCreateTime)
                 .list();
         return R.ok(scenes);
     }

src/main/java/com/aps/entity/basic/Order.java

@@ -19,7 +19,6 @@ public class Order {
     private String materialCode;
     private String serie;
     private Integer routingId;
-
     private double quantity = 100; // 100个
     private double sYQuantity;
     private LocalDateTime startDate;

src/main/java/com/aps/service/impl/LanuchServiceImpl.java

@@ -133,7 +133,7 @@ public class LanuchServiceImpl implements LanuchService {
             } else {
                 apsOrders = apsOrderService.lambdaQuery()
                         .eq(ApsOrder::getIsdeleted, 0)
-                        .eq(ApsOrder::getSchedulestatus, 1)
+                        .eq(ApsOrder::getStatus, 4)
 //                    .eq(ApsOrder::getCreatoruserid, username)
                         .in(ApsOrder::getId, apsOrderIds)
                         .list();