烧结数据打印未完成003.举手免责

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.desk.produce.pojo.dto.PrintChildCheck;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
+import org.springblade.desk.quality.pojo.entity.AuditFile;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
 
@@ -334,5 +335,7 @@ public class WorkPlan extends BaseEntity {
 	private List<MesRbFilePreserveSlotEntity> dsRbFilePreserveSlotList;
 	@TableField(exist = false)
 	private List<PrintChildCheck> printChildCheck;
+	@TableField(exist = false)
+	private AuditFile auditFile;
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml

@@ -243,7 +243,7 @@
     <select id="getDataByWpIdAndIndexList" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
         select a.* from MES_MAC_TOOL_USE a
         left join MES_WORK_PLAN wp on a.WP_ID = wp.ID
-        where wp.Id=#{wpId} and a.mtu_index=#{indexNum} order by a.Id
+        where a.WP_ID=#{wpId} and a.mtu_index=#{indexNum} order by a.Id
     </select>
 
     <select id="getDataByWpIdAndIndex" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RaiseHandController.java

@@ -190,6 +190,13 @@ public class RaiseHandController extends BladeController {
 
 		IPage<RaiseHand> pages = service.page(Condition.getPage(query), qw);
 		IPage<RaiseHandVO> pagesVO = RaiseHandWrapper.build().pageVO(pages);
+		List<RaiseHandVO> listVO = pagesVO.getRecords();
+		for(RaiseHandVO vo : listVO){
+			R<User> user = userClient.userInfoById(vo.getReportUserId());
+			if(null != user && null != user.getData()){
+				vo.setReportUserName(user.getData().getRealName());
+			}
+		}
 		return R.data(pagesVO);
 	}
 
@@ -362,7 +369,7 @@ public class RaiseHandController extends BladeController {
 	@ApiOperationSupport(order = 61)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(service.deleteLogic(Func.toLongList(ids)));
+		return R.status(service.removeByIds(Func.toLongList(ids)));
 	}
 
 	/**

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

@@ -479,6 +479,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
 
         // 生产过程(放在获取检验记录下面，这个方法会排除数据)
         this.getNewProcess(wpList, jsonObj, planList);
+        jsonObj.put("modelTwo", wpList);
         if (moduleList.get(3)) {
             // 审理单记录
 //            PrWorkOrder wor = this.getByKey(woId);
@@ -517,7 +518,19 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
     }
 
 
+    @Resource
+    private IAuditFileService auditFileService;
+
     public void getProcessByWp(WorkPlan workPlan) {
+
+
+        QueryWrapper<AuditFile> qw = new QueryWrapper<>();
+        qw.eq("WC_ID", workPlan.getId());
+        List<AuditFile> auditFileList = auditFileService.list(qw);
+        if(auditFileList != null && auditFileList.size() > 0){
+            workPlan.setAuditFile(auditFileList.get(0));
+        }
+
         MesQcProduceRunEntity box = null;
         // 生产追溯数据（从生产追溯表中获取）
         if (WorkPlan.PRINT_TYPE_PROCESS.equals(workPlan.getPrintType())) {
@@ -791,9 +804,10 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             }
 
             workPlan.setDsRbFilePreserveSlotList(dsRbFilePreserveSlotList);
+            workPlan.setQcProduceRunsList(qcProduceRunsList);
         }
 
-
+//        workPlan.setQcProduceRunsList(qcProduceRunsList);
     }
 
     public void setRbFilePreserveData(List<MesRbFilePreserveSlotEntity> preserveSlotList, List<MesQcProduceRunEntity> qcProduceRunsList,
@@ -1598,8 +1612,11 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         return checkList;
     }
 
+
+
     @Override
     public Object pagePrintSjEleFiles(Long woId, Integer yieldType, List<Boolean> planList, List<Boolean> moduleList) {
+
         if (yieldType == YieldOrder.YIELD_TYPE_4 || yieldType == YieldOrder.YIELD_TYPE_5) {
             return this.metalParts(woId);
         } else if (yieldType == YieldOrder.YIELD_TYPE_6) {  // 石墨模
@@ -1629,14 +1646,19 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         List<WorkPlanItem> prWorkPlanItems;
         List<PrintChildCheck> printChildCheckList = new ArrayList<>();
         for (WorkPlan prWorkPlan : prWorkPlanList) {
-
+            QueryWrapper<AuditFile> qw = new QueryWrapper<>();
+            qw.eq("WC_ID", prWorkPlan.getId());
+            List<AuditFile> auditFileList = auditFileService.list(qw);
+            if(auditFileList != null && auditFileList.size() > 0){
+                prWorkPlan.setAuditFile(auditFileList.get(0));
+            }
             // 同槽信息
             List<ProduceMonitorSlotListVO> slotList = workPlanMapper.listSjSlotInfoMes(prWorkPlan.getId(), Boolean.FALSE);
             prWorkPlan.setSlotList(slotList);
 
             // 设备绑定记录
-            List<MesQcProduceRunEntity> prList = workPlanMapper.listPrByWpId(prWorkPlan.getId());
-            prWorkPlan.setPrList(prList);
+            List<MesQcProduceRunEntity> qcProduceRunsList = workPlanMapper.listPrByWpId(prWorkPlan.getId());
+            prWorkPlan.setQcProduceRunsList(qcProduceRunsList);
 
             prWorkPlanItems = workPlanMapper.listByWpIdMes(prWorkPlan.getId());
             if (prWorkPlanItems != null && prWorkPlanItems.size() > 0) {

blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java

@@ -56,11 +56,15 @@ import org.springblade.desk.basic.feign.IWorkCenterClient;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.system.excel.UserExcel;
 import org.springblade.system.excel.UserImporter;
+import org.springblade.system.pojo.entity.Post;
 import org.springblade.system.pojo.entity.User;
+import org.springblade.system.pojo.vo.PostVO;
 import org.springblade.system.pojo.vo.UserVO;
+import org.springblade.system.service.IPostService;
 import org.springblade.system.service.IUserExtService;
 import org.springblade.system.service.IUserService;
 import org.springblade.system.config.RoleConfig;
+import org.springblade.system.wrapper.PostWrapper;
 import org.springblade.system.wrapper.UserWrapper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -86,6 +90,7 @@ public class UserController {
     private final IUserService userService;
     private final IUserExtService userExtService;
     private final IWorkCenterClient workCenterClient;
+    private final IPostService postService;
     /**
      * 查询单条
      */
@@ -210,6 +215,19 @@ public class UserController {
 //        return R.data(pages);
     }
 
+    @GetMapping("/getPost")
+    @ApiOperationSupport(order = 1)
+    @Operation(summary = "详情", description = "传入post")
+    public R<List<Post>> getPost(Long userId) {
+
+        User detail = userService.getById(userId);
+        List<Long> postIds = Func.toLongList(detail.getPostId());
+        QueryWrapper<Post> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id",postIds);
+        List<Post> posts = postService.list(queryWrapper);
+        return R.data(posts);
+    }
+
     /**
      * 新增或修改
      */

blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml

@@ -82,7 +82,8 @@
             and role_id like '%' || #{user.roleId} || '%'
         </if>
         <if test="user.realName!=null and user.realName != ''">
-            and real_name = #{user.realName}
+--             and real_name = #{user.realName}
+            and real_name  like '%' || #{user.realName} || '%'
         </if>
         <if test="user.userType!=null and user.userType != ''">
             and user_type = #{user.userType}