Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-16 fbb90c31d56348ec3fcc49af49c66b19992f58df

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java

@@ -5,9 +5,13 @@
import com.aps.core.domain.ApsPlateOrderPlanManager;
import com.aps.core.domain.ApsPlateOrderPlanRequireDate;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.enums.PLAN_TASK_STATUS;
import com.aps.core.mapper.ApsPlateOrderPlanManagerMapper;
import com.aps.core.service.ApsPlanTaskService;
import com.aps.core.service.IApsPlateOrderPlanManagerService;
import com.aps.core.service.IApsPlateStandardRequireBatchService;
import com.aps.core.service.IApsPlateStandardRequireService;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -27,7 +31,10 @@

    @Autowired
    private IApsPlateStandardRequireService apsPlateStandardRequireService;

    @Resource
    IApsPlateStandardRequireBatchService requireBatchService;
    @Resource
    ApsPlanTaskService planTaskService;
    /**
     * 查询钣金工单计划管理
     *
@@ -68,6 +75,9 @@
                apsPlateOrderPlanManagerMapper.updatePlanDateByBatch(planRequireDate);
            });
        }
        apsPlateStandardRequireService.generatorPlan();
        String batchNum= requireBatchService.getNewBatchNumber();
        planTaskService.savePlanTask(batchNum);
        apsPlateStandardRequireService.generatorPlan(batchNum);
        planTaskService.updateTaskStatus(batchNum, PLAN_TASK_STATUS.FINISHED);
    }
}