结束流转当前工序名称问题

hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionTaskDetailController.java

@@ -123,7 +123,7 @@ public class ProductionTaskDetailController {
      * 生产任务明细
      */
     @PostMapping("/detail")
-    public ProductionTaskDetailVo detail(@RequestBody BaseSelectDto dto) {
-        return productionTaskDetailService.detail(dto.getId());
+    public ProductionTaskDetailVo detail(@RequestBody ProductionTaskDetailDto dto) {
+        return productionTaskDetailService.detail(dto);
     }
 }

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

@@ -73,5 +73,5 @@ public interface ProductionTaskDetailService extends BaseService<ProductionTaskD
     /**
      * 任务明细
      */
-    ProductionTaskDetailVo detail(Long id);
+    ProductionTaskDetailVo detail(ProductionTaskDetailDto dto);
 }

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

@@ -19,7 +19,6 @@ import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.applicable.po.ApplicableProducts;
-import com.fjhx.mes.entity.bom.po.BomDetail;
 import com.fjhx.mes.entity.bom.vo.BomDetailVo;
 import com.fjhx.mes.entity.production.dto.ProductionTaskDetailDto;
 import com.fjhx.mes.entity.production.dto.ProductionTaskDetailSelectDto;
@@ -56,14 +55,12 @@ import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
 import com.fjhx.wms.service.stock.StockWaitService;
 import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
@@ -776,9 +773,9 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
      * 生产任务明细
      */
     @Override
-    public ProductionTaskDetailVo detail(Long id) {
+    public ProductionTaskDetailVo detail(ProductionTaskDetailDto dto) {
         ProductionTaskDetailVo productionTaskDetailVo = baseMapper.getDetail(IWrapper.<ProductionTaskDetail>getWrapper()
-                .eq("ptd", ProductionTaskDetail::getId, id)
+                .eq("ptd", ProductionTaskDetail::getId, dto.getId())
         );
 //        ProductionTaskDetail productionTaskDetail = this.getById(id);
         ProductionTask productionTask = productionTaskService.getById(productionTaskDetailVo.getProductionTaskId());
@@ -802,13 +799,17 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
             productionTaskDetailVo.setProductSpec(productInfo.getSpec());
         }
 
-        productionTaskDetailVo.setProductionProcessesName(productionProcessesMap.get(productionTaskDetailVo.getProductionProcessesId()));
+        //赋值当前工序名称
+        TaskProgress taskProgress = taskProgressService.getById(dto.getTaskProgressId());
+        if(ObjectUtil.isNotEmpty(taskProgress)) {
+            productionTaskDetailVo.setProductionProcessesName(productionProcessesMap.get(taskProgress.getProcessesId()));
+        }
 //        productionTaskDetailVo.setNextProductionProcessesName(productionProcessesMap.get(productionTaskDetailVo.getNextProductionProcessesId()));
 //        productionTaskDetailVo.setPreviousProcessesName(productionProcessesMap.get(productionTaskDetailVo.getPreviousProcessesId()));
 
         //赋值工序提交记录
         List<ProductionTaskDetailRecord> productionTaskDetailRecordList = productionTaskDetailRecordService.list(q -> q
-                .eq(ProductionTaskDetailRecord::getProductionTaskDetailId, id)
+                .eq(ProductionTaskDetailRecord::getProductionTaskDetailId, dto.getId())
                 .orderByAsc(ProductionTaskDetailRecord::getCreateTime)
         );
         List<ProductionTaskDetailRecordVo> productionTaskDetailRecordVos = BeanUtil.copyToList(productionTaskDetailRecordList, ProductionTaskDetailRecordVo.class);