需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -1152,33 +1152,41 @@ public class OrderBaseExcelLogic {
                             pgOrderProductDetail.setOrderProductId(pgOrderProductUp.getProductId());
 
                             pgOrderProductDetail.updateById();
+                            sort++;
                         }
 
                         List<PgOrderProductDetail> pgOrderProductDetailListWait = pgOrderProductDetails.stream()
                                 .filter(item -> item.getStatus().equals("WAIT")).collect(Collectors.toList());
 
                         for (PgOrderProductDetail pgOrderProductDetail : pgOrderProductDetailListWait) {
+                            if (sort > pgOrderProduct.getNum())
+                                break;
+                            pgOrderProductDetail.setSort(sort+1);
+                            pgOrderProductDetail.setOrderProductId(pgOrderProductUp.getProductId());
 
+                            pgOrderProductDetail.updateById();
+                            sort++;
                         }
 
-                    }
+                    }else {
 
 
-                    //生成新的产品数据
-                    pgOrderProductService.saveBatch(pgOrderProductList);
-                    //生成新的待采集数据
-                    int sort = 0;
-                    List<PgOrderProductDetail> newProductDetail = new ArrayList<>();
-                    for (PgOrderProduct pgOrderProductOne : pgOrderProducts) {
-                        PgOrderProductDetail pgOrderProductDetail = BeanUtil.toBean(pgOrderProductOne, PgOrderProductDetail.class);
-                        pgOrderProductDetail.setId(null);
-                        pgOrderProductDetail.setNum(1);
-                        pgOrderProductDetail.setSort(sort + 1);
-                        pgOrderProductDetail.setOrderProductId(pgOrderProductOne.getId());
-                        newProductDetail.add(pgOrderProductDetail);
-                        sort++;
+                        //生成新的产品数据
+                        pgOrderProductService.saveBatch(pgOrderProductList);
+                        //生成新的待采集数据
+                        int sort = 0;
+                        List<PgOrderProductDetail> newProductDetail = new ArrayList<>();
+                        for (PgOrderProduct pgOrderProductOne : pgOrderProducts) {
+                            PgOrderProductDetail pgOrderProductDetail = BeanUtil.toBean(pgOrderProductOne, PgOrderProductDetail.class);
+                            pgOrderProductDetail.setId(null);
+                            pgOrderProductDetail.setNum(1);
+                            pgOrderProductDetail.setSort(sort + 1);
+                            pgOrderProductDetail.setOrderProductId(pgOrderProductOne.getId());
+                            newProductDetail.add(pgOrderProductDetail);
+                            sort++;
+                        }
+                        pgOrderProductDetailService.saveBatch(newProductDetail);
                     }
-                    pgOrderProductDetailService.saveBatch(newProductDetail);
                 }
 
             }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -1072,7 +1072,23 @@ public class OrderBaseLogic {
         String workerIdsStr = "";
         if(CollectionUtils.isNotEmpty(orderAddBeanDTO.getOrderWorkers())){
             //如果是待网点派工的工单，此时变更状态为待接单
-            if(orderBaseStatusEnum == OrderBaseStatusEnum.DWDPG || orderBaseStatusEnum == OrderBaseStatusEnum.DQD)
+            if(orderBaseStatusEnum == OrderBaseStatusEnum.DWDPG || orderBaseStatusEnum == OrderBaseStatusEnum.DQD ||
+            orderBaseStatusEnum == OrderBaseStatusEnum.FL ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.CJ ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.YPD ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.DXSPD ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.DZBPG ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.DWDSPGP ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.DXSSPGP ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.DTJXSSPGP ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.DFZXPD ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.DFZXSPGP ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.XSBH ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.TJXSBH ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.ZBBH ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.FZXBH
+
+        )
                 orderBaseStatusEnum = OrderBaseStatusEnum.DJD;
 
             List<String> workerIds = orderAddBeanDTO.getOrderWorkers().stream().map(PgOrderWorker::getWorkerId).collect(Collectors.toList());