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

zhanghl

2025-05-23 6da289fff756eaecc600422d77c4afff1ddebab0

 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,10 +33,12 @@
    @Autowired
    private IApsStandardProcessRouteLineService apsStandardProcessRouteLineService;

    @Resource
    private ApsStandardProcessRouteLineMapper mapper;
    /**
     * 查询标准工艺路线Line列表
     */
    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:list")
    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsStandardProcessRouteLine apsStandardProcessRouteLine)
    {
@@ -45,7 +50,7 @@
    /**
     * 导出标准工艺路线Line列表
     */
    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:export")
    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:export")
    @Log(title = "标准工艺路线Line", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsStandardProcessRouteLine apsStandardProcessRouteLine)
@@ -58,7 +63,7 @@
    /**
     * 获取标准工艺路线Line详细信息
     */
    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:query")
    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@@ -68,7 +73,7 @@
    /**
     * 新增标准工艺路线Line
     */
    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:add")
    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:add")
    @Log(title = "标准工艺路线Line", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsStandardProcessRouteLine apsStandardProcessRouteLine)
@@ -79,7 +84,7 @@
    /**
     * 修改标准工艺路线Line
     */
    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:edit")
    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:edit")
    @Log(title = "标准工艺路线Line", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsStandardProcessRouteLine apsStandardProcessRouteLine)
@@ -90,11 +95,20 @@
    /**
     * 删除标准工艺路线Line
     */
    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:remove")
    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:remove")
    @Log(title = "标准工艺路线Line", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(apsStandardProcessRouteLineService.deleteApsStandardProcessRouteLineByIds(ids));
    }



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