yzc 1 жил өмнө
parent
commit
209043e40f

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

@@ -93,7 +93,7 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
     public void edit(WorkOrderProductionProcessesDto workOrderProductionProcessesDto) {
         workOrderService.update(q -> q
                 .eq(WorkOrder::getId, workOrderProductionProcessesDto.getWorkOrderId())
-                .set(WorkOrder::getBomStatus, workOrderProductionProcessesDto.getTechnologyStatus())
+                .set(WorkOrder::getTechnologyStatus, workOrderProductionProcessesDto.getTechnologyStatus())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );

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

@@ -20,7 +20,7 @@
             ptd.circulation_status
         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
+            AND ptpd.production_processes_id = ptd.next_production_processes_id
             ${ew.customSqlSegment}
     </select>
     <select id="getWorkOrderByProductionTask" resultType="com.fjhx.mes.entity.work.vo.WorkOrderVo">