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

hongjli

2025-05-23 48f5220bc5eb826402f43e440dc34867368ff17c

 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteLineController.java

@@ -8,11 +8,14 @@
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsStandardProcessRouteLine;
import com.aps.core.mapper.ApsStandardProcessRouteLineMapper;
import com.aps.core.service.IApsStandardProcessRouteLineService;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -30,6 +33,8 @@
    @Autowired
    private IApsStandardProcessRouteLineService apsStandardProcessRouteLineService;

    @Resource
    private ApsStandardProcessRouteLineMapper mapper;
    /**
     * 查询标准工艺路线Line列表
     */
@@ -97,4 +102,13 @@
    {
        return toAjax(apsStandardProcessRouteLineService.deleteApsStandardProcessRouteLineByIds(ids));
    }



    @PostMapping("/getStandardTime")
    public AjaxResult getStandardTime(@RequestBody ApsStandardProcessRouteLine apsStandardProcessRouteLine)
    {
        BigDecimal standardTime = mapper.selectTotalStandTime(apsStandardProcessRouteLine.getRouteId()).getStandardTime();
        return toAjax(standardTime.intValue());
    }
}