任务流转 任务接收 添加产品备注

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

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

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

@@ -97,4 +97,9 @@ public class ProductionTaskDetailVo extends ProductionTaskDetail {
      * 当前工序名称
      */
     private String productionProcessesNames;
+
+    /**
+     * 产品备注
+     */
+    private String productRemark;
 }

hx-mes/src/main/java/com/fjhx/mes/mapper/production/ProductionTaskDetailMapper.java

@@ -35,4 +35,10 @@ public interface ProductionTaskDetailMapper extends BaseMapper<ProductionTaskDet
      */
     Page<ProductionTaskDetailVo> taskProgressPage(@Param("page") Page<Object> page,@Param("ew") IWrapper<ProductionTaskDetail> wrapper);
 
+    /**
+     * 获取明细
+     */
+    ProductionTaskDetailVo getDetail(@Param("ew") IWrapper<ProductionTaskDetail> wrapper);
+
+
 }

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

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

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

@@ -464,15 +464,18 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
      * 生产任务明细
      */
     @Override
-    public ProductionTaskDetail detail(Long id) {
-        ProductionTaskDetail productionTaskDetail = this.getById(id);
-        ProductionTask productionTask = productionTaskService.getById(productionTaskDetail.getProductionTaskId());
+    public ProductionTaskDetailVo detail(Long id) {
+        ProductionTaskDetailVo productionTaskDetailVo = baseMapper.getDetail(IWrapper.<ProductionTaskDetail>getWrapper()
+                .eq(ProductionTaskDetail::getId,id)
+        );
+//        ProductionTaskDetail productionTaskDetail = this.getById(id);
+        ProductionTask productionTask = productionTaskService.getById(productionTaskDetailVo.getProductionTaskId());
         ProductionPlan productionPlan = productionPlanService.getById(productionTask.getProductionPlanId());
         WorkOrder workOrder = workOrderService.getById(productionPlan.getWorkOrderId());
 
-        List<Long> processesIds = Arrays.asList(productionTaskDetail.getPreviousProcessesId(),
-                productionTaskDetail.getProductionProcessesId(),
-                productionTaskDetail.getNextProductionProcessesId()
+        List<Long> processesIds = Arrays.asList(productionTaskDetailVo.getPreviousProcessesId(),
+                productionTaskDetailVo.getProductionProcessesId(),
+                productionTaskDetailVo.getNextProductionProcessesId()
         );
 
         Map<Long,String> productionProcessesMap;
@@ -486,11 +489,10 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
                     q -> q.in(ProductionProcesses::getId, processesIds));
         }
 
-        ProductionTaskDetailVo productionTaskDetailVo = BeanUtil.copyProperties(productionTaskDetail, ProductionTaskDetailVo.class);
 
-        productionTaskDetailVo.setProductionProcessesName(productionProcessesMap.get(productionTaskDetail.getProductionProcessesId()));
-        productionTaskDetailVo.setNextProductionProcessesName(productionProcessesMap.get(productionTaskDetail.getNextProductionProcessesId()));
-        productionTaskDetailVo.setPreviousProcessesName(productionProcessesMap.get(productionTaskDetail.getPreviousProcessesId()));
+        productionTaskDetailVo.setProductionProcessesName(productionProcessesMap.get(productionTaskDetailVo.getProductionProcessesId()));
+        productionTaskDetailVo.setNextProductionProcessesName(productionProcessesMap.get(productionTaskDetailVo.getNextProductionProcessesId()));
+        productionTaskDetailVo.setPreviousProcessesName(productionProcessesMap.get(productionTaskDetailVo.getPreviousProcessesId()));
 
         List<ProductionTaskDetailRecord> productionTaskDetailRecordList = productionTaskDetailRecordService.list(q -> q
                 .eq(ProductionTaskDetailRecord::getProductionTaskDetailId, id)

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

@@ -18,10 +18,13 @@
             ptd.next_production_processes_id,
             ptd.circulation_user_id,
             ptd.circulation_status,
-            ptd.previous_processes_id
+            ptd.previous_processes_id,
+            scd.product_remark
         from production_task_detail ptd
             left JOIN production_task_processes_detail ptpd ON ptpd.production_task_id = ptd.production_task_id
             AND ptpd.production_processes_id = ptd.production_processes_id
+            LEFT JOIN bytesailing_jxst.sales_contract_details scd ON scd.sales_contract_id = ptd.id
+            AND scd.del_flag =0
             ${ew.customSqlSegment}
     </select>
     <select id="getWorkOrderByProductionTask" resultType="com.fjhx.mes.entity.work.vo.WorkOrderVo">
@@ -96,5 +99,34 @@
             ) t1
             ${ew.customSqlSegment}
     </select>
+    <select id="getDetail" resultType="com.fjhx.mes.entity.production.vo.ProductionTaskDetailVo">
+        SELECT
+            ptd.id,
+            ptd.product_id,
+            ptd.production_task_id,
+            ptd.product_sn,
+            ptd.production_processes_id,
+            ptd.finish_time,
+            ptd.finish_status,
+            ptd.person_liable_id,
+            ptd.tenant_id,
+            ptd.create_user,
+            ptd.create_time,
+            ptd.update_user,
+            ptd.update_time,
+            ptd.del_flag,
+            ptd.next_production_processes_id,
+            ptd.circulation_user_id,
+            ptd.circulation_status,
+            ptd.received_user_id,
+            ptd.received_time,
+            ptd.previous_processes_id,
+            ptd.processes_status,
+            scd.product_remark
+        FROM
+            production_task_detail ptd
+                LEFT JOIN bytesailing_jxst.sales_contract_details scd ON scd.sales_contract_id = ptd.id
+            ${ew.customSqlSegment}
+    </select>
 
 </mapper>