Merge remote-tracking branch 'origin/master'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java

@@ -47,5 +47,9 @@ public class InspectionTaskSearch extends InspectionTask {
     private LocalDate receiveDateEnd;
     @Schema(description = "质量检验类型")
     private Integer checkWorkType;
+    @Schema(description = "供应商")
+    private Long mainProcessingSupplier;
+    @Schema(description = "班组")
+    private Long mainProcessingUnit;
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java

@@ -298,16 +298,16 @@ public class WorkCenterController extends BladeController {
 //                    .map(Object::toString) // 或者直接使用String::valueOf，效果相同
 //                    .collect(Collectors.joining(","));
 //
-//            QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.in("id",teamIds);
-//            List<TeamSet> teams = teamService.list(queryWrapper);
-//
-//            team= teams.stream()
-//                    .map(user -> String.valueOf(user.getTsName()))
-//                    .collect(Collectors.joining(","));
+            QueryWrapper<TeamSet> queryWrapper = new QueryWrapper<>();
+            queryWrapper.in("id",teamIds);
+            List<TeamSet> teams = teamService.list(queryWrapper);
+
+            team= teams.stream()
+                    .map(user -> String.valueOf(user.getTsName()))
+                    .collect(Collectors.joining(","));
         }
 
-        detail.setTeamId(result);
+//        detail.setTeamId(result);
         detail.setTeam(team);
         service.updateById(detail);
         return R.status(true);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml

@@ -182,6 +182,16 @@
         <if test="q.fromType != null">
             AND t.FROM_TYPE = #{q.fromType}
         </if>
+
+        <if test="q.mainProcessingSupplier != null">
+            AND oem.ID = #{q.mainProcessingSupplier}
+        </if>
+        <if test="q.mainProcessingUnit != null">
+            AND ts.ID = #{q.mainProcessingUnit}
+        </if>
+
+
+
         <if test="q.receiveDateStart != null">
             AND rs.RECEIVE_DATE &gt;= #{q.receiveDateStart}
         </if>
@@ -223,7 +233,7 @@
         </if>
 
         <if test="q.cardNo != null and q.cardNo != ''">
-            AND wo.CARD_NO = #{cardNo}
+            AND wo.CARD_NO = #{q.cardNo}
         </if>
         -- ps
         <if test="q.currentProcessId != null">

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -361,18 +361,28 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             wpItemService.updateById(wpItemDB);
             //
 
+
+
+
             if(null != wpItemVO.getWpItemDetailList() && wpItemVO.getWpItemDetailList().size() > 0){
+                QueryWrapper<WorkPlanItemDetail> qw = new QueryWrapper<>();
+                qw.eq("WORK_PLAN_ITEM_ID", wpItemDB.getId());
+                wpItemDetailService.remove(qw);
+
+
                 for (WorkPlanItemDetailVO wpItemDetailVO : wpItemVO.getWpItemDetailList()) {
                     WorkPlanItemDetail wpItemDetail = new WorkPlanItemDetail();
                     BeanUtil.copyProperties(wpItemDetailVO, wpItemDetail);
                     wpItemDetail.setWorkPlanItemId(wpItemDB.getId());
-                    if (IdUtil.isValid(wpItemDetail.getId())) {
-                        // 更新 WorkPlanItemDetail
-                        wpItemDetailService.updateById(wpItemDetail);
-                    } else {
-                        // 保存
-                        wpItemDetailService.save(wpItemDetail);
-                    }
+                    wpItemDetail.setId(null);
+                    wpItemDetailService.save(wpItemDetail);
+//                    if (IdUtil.isValid(wpItemDetail.getId())) {
+//                        // 更新 WorkPlanItemDetail
+//                        wpItemDetailService.updateById(wpItemDetail);
+//                    } else {
+//                        // 保存
+//                        wpItemDetailService.save(wpItemDetail);
+//                    }
                 }
             }