工序详情接口优化

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorPlanDataVO.java

@@ -2,6 +2,7 @@ package org.springblade.desk.produce.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
 import org.springblade.desk.quality.pojo.entity.PlanTest;
 
 import java.util.List;
@@ -27,6 +28,9 @@ public class ProduceMonitorPlanDataVO {
 	@Schema(description = "报废数量")
 	private Double scrapQty;
 
+	@Schema(description = "打印标记类型：1、生产过程")
+	private Short printType;
+
 	@Schema(description = "加工记录")
 	private List<ProduceMonitorMakeRecVO> mrList;
 
@@ -48,4 +52,7 @@ public class ProduceMonitorPlanDataVO {
 	@Schema(description = "检验项目")
 	private List<ProduceMonitorPlanItemVO> itemList;
 
+	@Schema(name = "生产过程")
+	private List<MesQcProduceRunEntity> prList;
+
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java

@@ -3,6 +3,7 @@
  */
 package org.springblade.desk.quality.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -126,6 +127,11 @@ public class PlanTest extends BaseEntity {
 	 */
 	@Schema(description = "试转[用户]id")
 	private Long testUserId;
+
+	@Schema(description = "试转[用户]姓名")
+	@TableField(exist = false)
+	private String testUserName;
+
 	/**
 	 * 试验员[用户]id
 	 */

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

@@ -28,4 +28,6 @@ public interface MesQcProduceRunMapper extends BaseMapper<MesQcProduceRunEntity>
 
 
     List<MesQcProduceRunEntity> listPrByWpIdIndex(Long id, int i, int i1);
+
+    List<MesQcProduceRunEntity> listPrByWpId(Long wpId);
 }

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

@@ -58,6 +58,9 @@
         </if>
         ORDER BY mtn_code, id
     </select>
+    <select id="listPrByWpId" resultType="org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity">
+        select * from MES_QC_PRODUCE_RUN where mtn_Code in (select mtn_Code from MES_MAC_TOOL_USE where wp_id = #{wpId}) order by in_date asc
+    </select>
 
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMesQcProduceRunService.java

@@ -35,4 +35,6 @@ public interface IMesQcProduceRunService extends BaseService<MesQcProduceRunEnti
     List<MesQcProduceRunEntity> listPrByWpIdIndexAndMtnCode(List<String> list, String mtnCode);
 
 	List<MesQcProduceRunEntity> listPrByWpIdIndex(Long id, int i, Boolean aTrue);
+
+	List<MesQcProduceRunEntity> listPrByWpId(Long id);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesQcProduceRunServiceImpl.java

@@ -45,4 +45,9 @@ public class MesQcProduceRunServiceImpl extends BaseServiceImpl<MesQcProduceRunM
 		return baseMapper.listPrByWpIdIndex(id, i, aTrue ? 1 : 0);
 	}
 
+	@Override
+	public List<MesQcProduceRunEntity> listPrByWpId(Long id) {
+		return baseMapper.listPrByWpId(id);
+	}
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -1311,6 +1311,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         // 转试记录
         List<PlanTest> planTests = planTestService.list(Wrappers.lambdaQuery(PlanTest.class).eq(PlanTest::getWpId, wpId));
         if (CollectionUtils.isNotEmpty(planTests)) {
+            for (PlanTest planTest : planTests) {
+                planTest.setTestUserName(UserCache.getUser(planTest.getTestUserId()) != null ? UserCache.getUser(planTest.getTestUserId()).getRealName() : "");
+            }
             planDataVO.setTrialItemList(planTests);
         }
 
@@ -1333,6 +1336,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public void getProcessByWp(ProduceMonitorPlanDataVO planDataVO, WorkPlan workPlan) {
         List<MesQcProduceRunEntity> qcProduceRunsList;
         if (WorkPlan.PRINT_TYPE_PROCESS.equals(workPlan.getPrintType())) {
+            // 生产过程
+            planDataVO.setPrList(qcProduceRunService.listPrByWpId(workPlan.getId()));
             // 同槽信息
             planDataVO.setSlotList(macToolUseService.listSlotInfo(workPlan));
             // 过程质量记录