生产进度 增加查看每个工序上传的图片

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionTaskDetailRecordVo.java

@@ -14,4 +14,14 @@ import lombok.Setter;
 @Setter
 public class ProductionTaskDetailRecordVo extends ProductionTaskDetailRecord {
 
+    /**
+     * 工序名称
+     */
+    private String productionProcessesName;
+
+    /**
+     * 负责人名称
+     */
+    private String personLiableName;
+
 }

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

@@ -31,6 +31,7 @@ import com.fjhx.mes.service.production.*;
 import com.fjhx.mes.service.technology.TechnologyService;
 import com.fjhx.mes.service.work.WorkOrderProductionProcessesService;
 import com.fjhx.mes.service.work.WorkOrderService;
+import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
 import com.fjhx.socket.core.PushTypeEnum;
 import com.fjhx.socket.core.WebSocketPush;
 import com.fjhx.wms.entity.monthly.vo.MonthlyInventoryReportVo;
@@ -39,6 +40,7 @@ import com.fjhx.wms.entity.stock.po.StockWait;
 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.core.domain.BasePo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -193,6 +195,14 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
             throw new ServiceException("该任务已被提交，请重试或刷新！");
         }
 
+        //创建任务明细记录
+        ProductionTaskDetailRecord productionTaskDetailRecord = new ProductionTaskDetailRecord();
+        productionTaskDetailRecord.setProductionTaskDetailId(productionTaskDetail.getId());
+        productionTaskDetailRecord.setProductionProcessesId(productionTaskDetail.getProductionProcessesId());
+        productionTaskDetailRecord.setPersonLiableId(SecurityUtils.getUserId());
+        productionTaskDetailRecord.setReceivedTime(productionTaskDetail.getReceivedTime());
+        productionTaskDetailRecordService.save(productionTaskDetailRecord);
+
         //修改流转状态
         productionTaskDetail.setCirculationStatus(1);
         //赋值流转人id
@@ -230,14 +240,6 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
 
         this.updateById(productionTaskDetail);
 
-        //创建任务明细记录
-        ProductionTaskDetailRecord productionTaskDetailRecord = new ProductionTaskDetailRecord();
-        productionTaskDetailRecord.setProductionTaskDetailId(productionTaskDetail.getId());
-        productionTaskDetailRecord.setProductionProcessesId(productionTaskDetail.getProductionProcessesId());
-        productionTaskDetailRecord.setPersonLiableId(SecurityUtils.getUserId());
-        productionTaskDetailRecord.setReceivedTime(productionTaskDetail.getReceivedTime());
-        productionTaskDetailRecordService.save(productionTaskDetailRecord);
-
         //保存附件
         ObsFileUtil.saveFile(dto.getFileList(), productionTaskDetailRecord.getId());
 
@@ -265,13 +267,6 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
             throw new ServiceException("该任务已完工入库，请重试或刷新！");
         }
 
-        productionTaskDetail.setFinishStatus(1);//标记为完成
-        productionTaskDetail.setFinishTime(new Date());//记录完成时间
-
-        //设置当前工序状态完成
-        productionTaskDetail.setProcessesStatus(3);
-        this.updateById(productionTaskDetail);
-
         //创建任务明细记录
         ProductionTaskDetailRecord productionTaskDetailRecord = new ProductionTaskDetailRecord();
         productionTaskDetailRecord.setProductionTaskDetailId(productionTaskDetail.getId());
@@ -280,6 +275,13 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
         productionTaskDetailRecord.setReceivedTime(productionTaskDetail.getReceivedTime());
         productionTaskDetailRecordService.save(productionTaskDetailRecord);
 
+        productionTaskDetail.setFinishStatus(1);//标记为完成
+        productionTaskDetail.setFinishTime(new Date());//记录完成时间
+
+        //设置当前工序状态完成
+        productionTaskDetail.setProcessesStatus(3);
+        this.updateById(productionTaskDetail);
+
         //保存附件
         ObsFileUtil.saveFile(productionTaskDetailDto.getFileList(), productionTaskDetailRecord.getId());
 
@@ -579,16 +581,10 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
                 productionTaskDetailVo.getNextProductionProcessesId()
         );
 
-        Map<Long, String> productionProcessesMap;
-        if (Objects.equals(workOrder.getIsCustomized(), 1)) {
-            //定制
-            productionProcessesMap = workOrderProductionProcessesService.mapKV(WorkOrderProductionProcesses::getId,
-                    WorkOrderProductionProcesses::getName, q -> q.in(WorkOrderProductionProcesses::getId, processesIds));
-        } else {
-            //非定制
-            productionProcessesMap = productionProcessesService.mapKV(ProductionProcesses::getId, ProductionProcesses::getName,
-                    q -> q.in(ProductionProcesses::getId, processesIds));
-        }
+        //获取工序列表
+        List<WorkOrderProductionProcesses> productionProcessesList = workOrderService.getProductionProcessesList(workOrder);
+        Map<Long,String> productionProcessesMap = productionProcessesList.stream().collect(Collectors.toMap(WorkOrderProductionProcesses::getId, WorkOrderProductionProcesses::getName));
+
 
         //赋值产品名称
         ProductInfo productInfo = productInfoService.getById(productionTaskDetailVo.getProductId());
@@ -601,11 +597,21 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
         productionTaskDetailVo.setNextProductionProcessesName(productionProcessesMap.get(productionTaskDetailVo.getNextProductionProcessesId()));
         productionTaskDetailVo.setPreviousProcessesName(productionProcessesMap.get(productionTaskDetailVo.getPreviousProcessesId()));
 
+        //赋值工序提交记录
         List<ProductionTaskDetailRecord> productionTaskDetailRecordList = productionTaskDetailRecordService.list(q -> q
                 .eq(ProductionTaskDetailRecord::getProductionTaskDetailId, id)
                 .orderByDesc(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);
+
         productionTaskDetailVo.setProductionTaskDetailRecordList(productionTaskDetailRecordVos);
 
         return productionTaskDetailVo;

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

@@ -289,12 +289,6 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
             productionTaskDetail.setProcessesStatus(0);
 
             productionTaskDetailList.add(productionTaskDetail);
-            //创建任务明细记录
-            ProductionTaskDetailRecord productionTaskDetailRecord = new ProductionTaskDetailRecord();
-            productionTaskDetailRecord.setProductionTaskDetailId(productionTaskDetail.getId());
-            productionTaskDetailRecord.setProductionProcessesId(productionProcessesId);
-            productionTaskDetailRecord.setPersonLiableId(productionTaskDto.getPersonLiableId());
-            productionTaskDetailRecordList.add(productionTaskDetailRecord);
         }
         productionTaskDetailService.saveBatch(productionTaskDetailList);
         productionTaskDetailRecordService.saveBatch(productionTaskDetailRecordList);