sn详情接口

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskDetailServiceImpl.java

@@ -412,7 +412,29 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
 
         //赋值工序列表
         WorkOrder workOrder = workOrderService.getById(result.getWorkOrderId());
-        result.setProductionProcessesList(workOrderService.getProductionProcessesList(workOrder));
+        List<WorkOrderProductionProcesses> productionProcessesList = workOrderService.getProductionProcessesList(workOrder);
+
+        result.setProductionProcessesList(productionProcessesList);
+
+        Map<Long,String> productionProcessesMap = productionProcessesList.stream().collect(Collectors.toMap(WorkOrderProductionProcesses::getId, WorkOrderProductionProcesses::getName));
+
+
+        //赋值工序提交记录
+        List<ProductionTaskDetailRecord> productionTaskDetailRecordList = productionTaskDetailRecordService.list(q -> q
+                .eq(ProductionTaskDetailRecord::getProductionTaskDetailId, result.getId())
+                .orderByAsc(ProductionTaskDetailRecord::getCreateTime)
+        );
+        List<ProductionTaskDetailRecordVo> productionTaskDetailRecordVos = BeanUtil.copyToList(productionTaskDetailRecordList, ProductionTaskDetailRecordVo.class);
+        //赋值工序名称
+        for (ProductionTaskDetailRecordVo productionTaskDetailRecordVo : productionTaskDetailRecordVos) {
+            Long productionProcessesId = productionTaskDetailRecordVo.getProductionProcessesId();
+            String productionProcessesName = productionProcessesMap.get(productionProcessesId);
+            productionTaskDetailRecordVo.setProductionProcessesName(productionProcessesName);
+        }
+        //赋值负责人名称
+        UserUtil.assignmentNickName(productionTaskDetailRecordVos, ProductionTaskDetailRecordVo::getPersonLiableId, ProductionTaskDetailRecordVo::setPersonLiableName);
+
+        result.setProductionTaskDetailRecordList(productionTaskDetailRecordVos);
 
         //获取BOM信息
         List<BomDetail> bomInfo = workOrderService.getBomInfo(workOrder);

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -160,7 +160,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
 
     @Override
     public WorkOrderVo detail(Long id) {
-        WorkOrderVo result = baseMapper.detail(IWrapper.<WorkOrder>getWrapper().eq(WorkOrder::getId, id));
+        WorkOrderVo result = baseMapper.detail(IWrapper.<WorkOrder>getWrapper().eq("wo",WorkOrder::getId, id));
         List<ProductionPlan> list = productionPlanService.list(q -> q.eq(ProductionPlan::getWorkOrderId, id));
         result.setProductionPlans(list);
         ProductInfo productInfo = productInfoService.getById(result.getProductId());

hx-mes/src/main/resources/mapper/production/ProductionTaskDetailMapper.xml

@@ -45,6 +45,7 @@
     </select>
     <select id="snInfo" resultType="com.fjhx.mes.entity.production.vo.ProductionTaskDetailVo">
         SELECT
+            ptd.id,
             ptd.product_id,
             ptd.product_sn,
             sc.`code` as contractCode,