工艺调整附件问题处理

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionTaskDetail.java

@@ -88,9 +88,4 @@ public class ProductionTaskDetail extends BasePo {
      */
     private Integer processesStatus;
 
-    /**
-     * 前一道工序记录id
-     */
-    private Long previousProcessesRecordId;
-
 }

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

@@ -143,4 +143,9 @@ public class ProductionTaskDetailVo extends ProductionTaskDetail {
      * 合同交货期限
      */
     private String contractDeliveryDate;
+
+    /**
+     * 前一道工序记录id
+     */
+    private Long previousProcessesRecordId;
 }

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

@@ -96,12 +96,9 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
             }
             i++;
 
-            //处理附件信息
-            if (ObjectUtil.isEmpty(workOrderProductionProcesses.getId())) {
-                ObsFileUtil.saveFile(workOrderProductionProcesses.getFileList(), workOrderProductionProcesses.getId());
-            } else {
-                ObsFileUtil.editFile(workOrderProductionProcesses.getFileList(), workOrderProductionProcesses.getId());
-            }
+            this.saveOrUpdate(workOrderProductionProcesses);
+
+            ObsFileUtil.editFile(workOrderProductionProcesses.getFileList(), workOrderProductionProcesses.getId());
         }
         List<WorkOrderProductionProcesses> workOrderProductionProcessesList1 = BeanUtil.copyToList(workOrderProductionProcessesList, WorkOrderProductionProcesses.class);
         this.editLinked(workOrderProductionProcessesList1, WorkOrderProductionProcesses::getWorkOrderId, dto.getWorkOrderId());

hx-mes/src/main/resources/mapper/work/WorkOrderMapper.xml

@@ -21,7 +21,8 @@
                      wo.bom_status,
                      wo.technology_status,
                      wo.production_quantity,
-                     wo.stock_wait_quantity
+                     wo.stock_wait_quantity,
+                     wo.research_status
               FROM work_order wo
                        LEFT JOIN bytesailing_jxst.sales_contract sc ON wo.source_id = sc.id
                        LEFT JOIN production_plan pp ON pp.work_order_id = wo.id