工艺路线后端，和其他部分代码优化

wenwj

2025-04-11 0edc9cd23d8787f93fe52afac0577e327f67cbbe

工艺路线后端，和其他部分代码优化

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,140 @@
package com.aps.core.controller.basicData;

import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsProcessRoute;
import com.aps.core.domain.ApsProcessRouteTemp;
import com.aps.core.service.IApsProcessRouteService;
import com.aps.core.service.IApsProcessRouteTempService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

/**
 * å·¥è‰ºè·¯çº¿Controller
 * 
 * @author wwj
 * @date 2025-04-10
 */
@RestController
@RequestMapping("/processRoute")
public class ApsProcessRouteController extends BaseController
{
    @Autowired
    private IApsProcessRouteService apsProcessRouteService;
    @Autowired
    private IApsProcessRouteTempService apsProcessRouteTempService;

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿åˆ—表
     */
    @RequiresPermissions("processRoute:processRoute:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsProcessRoute apsProcessRoute)
    {
//        startPage();
        List<ApsProcessRoute> list = apsProcessRouteService.selectApsProcessRouteList(apsProcessRoute);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºå·¥è‰ºè·¯çº¿åˆ—表
     */
    @RequiresPermissions("processRoute:processRoute:export")
    @Log(title = "工艺路线", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsProcessRoute apsProcessRoute)
    {
        List<ApsProcessRoute> list = apsProcessRouteService.selectApsProcessRouteList(apsProcessRoute);
        ExcelUtil<ApsProcessRoute> util = new ExcelUtil<ApsProcessRoute>(ApsProcessRoute.class);
        util.exportExcel(response, list, "工艺路线数据");
    }

    /**
     * èŽ·å–工艺路线详细信息
     */
    @RequiresPermissions("processRoute:processRoute:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
        return success(apsProcessRouteService.selectApsProcessRouteById(id));
    }

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿
     */
    @RequiresPermissions("processRoute:processRoute:add")
    @Log(title = "工艺路线", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsProcessRoute apsProcessRoute)
    {
        return toAjax(apsProcessRouteService.insertApsProcessRoute(apsProcessRoute));
    }

    /**
     * ä¿®æ”¹å·¥è‰ºè·¯çº¿
     */
    @RequiresPermissions("processRoute:processRoute:edit")
    @Log(title = "工艺路线", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsProcessRoute apsProcessRoute)
    {
        return toAjax(apsProcessRouteService.updateApsProcessRoute(apsProcessRoute));
    }

    /**
     * åˆ é™¤å·¥è‰ºè·¯çº¿
     */
    @RequiresPermissions("processRoute:processRoute:remove")
    @Log(title = "工艺路线", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(apsProcessRouteService.deleteApsProcessRouteByIds(ids));
    }

    /**
     * å·¥è‰ºè·¯çº¿å¯¼å…¥
     */
    @PostMapping("/importData")
    public AjaxResult importData(MultipartFile file) throws Exception {
        ExcelUtil<ApsProcessRouteTemp> util = new ExcelUtil<ApsProcessRouteTemp>(ApsProcessRouteTemp.class);
        List<ApsProcessRouteTemp> apsProcessRouteTemps = util.importExcel(file.getInputStream());
        //判断导入数据是否为空
        if (apsProcessRouteTemps.size() > 0) {
            String batchNum= IdUtils.fastUUID();
            for (int i = 0; i < apsProcessRouteTemps.size(); i++) {
                apsProcessRouteTemps.get(i).setId(IdUtils.fastUUID());
                //插入版本号
                apsProcessRouteTemps.get(i).setBatchNumber(batchNum);
                //插入临时表
                apsProcessRouteTempService.insertApsProcessRouteTemp(apsProcessRouteTemps.get(i));
            }

            return AjaxResult.success("导入成功",batchNum);
        } else {
            return AjaxResult.error("模板内容为空");
        }
    }
    /***
     * @Description: ç¡®è®¤ä¸Šä¼ 
     * @Param: [apsProcessRouteTemp]
     * @return: com.aps.common.core.web.domain.AjaxResult
     * @Author: wwj
     * @Date: 2025/4/9
     */
    @PostMapping("/confirmProcessRoute")
    public AjaxResult confirmProcessRoute(@RequestBody ApsProcessRouteTemp apsProcessRouteTemp) {
        return toAjax(apsProcessRouteService.confirmProcessRoute(apsProcessRouteTemp));
    }

}

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteTempController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package com.aps.core.controller.basicData;

import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsProcessRouteTemp;
import com.aps.core.service.IApsProcessRouteTempService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * å·¥è‰ºè·¯çº¿-临时Controller
 *
 * @author wwj
 * @date 2025-04-10
 */
@RestController
@RequestMapping("/processRouteTemp")
public class ApsProcessRouteTempController extends BaseController {
    @Autowired
    private IApsProcessRouteTempService apsProcessRouteTempService;

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿-临时列表
     */
    @RequiresPermissions("processRouteTemp:processRouteTemp:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsProcessRouteTemp apsProcessRouteTemp) {
//        startPage();
        List<ApsProcessRouteTemp> list = apsProcessRouteTempService.selectApsProcessRouteTempList(apsProcessRouteTemp);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºå·¥è‰ºè·¯çº¿-临时列表
     */
    @RequiresPermissions("processRouteTemp:processRouteTemp:export")
    @Log(title = "工艺路线-临时", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsProcessRouteTemp apsProcessRouteTemp) {
        List<ApsProcessRouteTemp> list = apsProcessRouteTempService.selectApsProcessRouteTempList(apsProcessRouteTemp);
        ExcelUtil<ApsProcessRouteTemp> util = new ExcelUtil<ApsProcessRouteTemp>(ApsProcessRouteTemp.class);
        util.exportExcel(response, list, "工艺路线-临时数据");
    }

    /**
     * èŽ·å–工艺路线-临时详细信息
     */
    @RequiresPermissions("processRouteTemp:processRouteTemp:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id) {
        return success(apsProcessRouteTempService.selectApsProcessRouteTempById(id));
    }

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿-临时
     */
    @RequiresPermissions("processRouteTemp:processRouteTemp:add")
    @Log(title = "工艺路线-临时", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsProcessRouteTemp apsProcessRouteTemp) {
        return toAjax(apsProcessRouteTempService.insertApsProcessRouteTemp(apsProcessRouteTemp));
    }

    /**
     * ä¿®æ”¹å·¥è‰ºè·¯çº¿-临时
     */
    @RequiresPermissions("processRouteTemp:processRouteTemp:edit")
    @Log(title = "工艺路线-临时", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsProcessRouteTemp apsProcessRouteTemp) {
        return toAjax(apsProcessRouteTempService.updateApsProcessRouteTemp(apsProcessRouteTemp));
    }

    /**
     * åˆ é™¤å·¥è‰ºè·¯çº¿-临时
     */
    @RequiresPermissions("processRouteTemp:processRouteTemp:remove")
    @Log(title = "工艺路线-临时", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids) {
        return toAjax(apsProcessRouteTempService.deleteApsProcessRouteTempByIds(ids));
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,220 @@
package com.aps.core.domain;

import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;

/**
 * å·¥è‰ºè·¯çº¿å¯¹è±¡ aps_process_route
 *
 * @author wwj
 * @date 2025-04-10
 */
public class ApsProcessRoute extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ä¸»é”®id */
    private String id;

    /** æ–™å· */
    @Excel(name = "料号")
    private String itemNo;

    /** å·¥å•å· */
    @Excel(name = "工单号")
    private String workOrderNo;

    /** å·¥åºåºå· */
    @Excel(name = "工序序号")
    private Long processNumber;

    /** å·¥åºåç§° */
    @Excel(name = "工序名称")
    private String processName;

    /** å·¥åºè®¡åˆ’开始日期 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "工序计划开始日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date processPlanStartDay;

    /** å·¥åºè®¡åˆ’结束日期 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "工序计划完成日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date processPlanEndDay;

    /** æœªå¼€å·¥æ•°é‡ */
    @Excel(name = "未开工数量")
    private Long notStartWorkCount;

    /** å·²å®Œæˆæ•°é‡ */
    @Excel(name = "已完成数量")
    private Long completedCount;
    /** åºŸå¼ƒæ•°é‡ */
    @Excel(name = "废弃数量")
    private Long discardCount;
    /** é›†æˆæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "集成日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date integrationDay;

    /** å·¥åŽ‚ */
//    @Excel(name = "工厂")
    private String plant;

    /** åˆ é™¤æ ‡å¿—（0代表存在 2代表删除） */
    private String delFlag;

    public void setId(String id)
    {
        this.id = id;
    }

    public String getId()
    {
        return id;
    }

    public void setItemNo(String itemNo)
    {
        this.itemNo = itemNo;
    }

    public String getItemNo()
    {
        return itemNo;
    }

    public void setWorkOrderNo(String workOrderNo)
    {
        this.workOrderNo = workOrderNo;
    }

    public String getWorkOrderNo()
    {
        return workOrderNo;
    }

    public void setProcessNumber(Long processNumber)
    {
        this.processNumber = processNumber;
    }

    public Long getProcessNumber()
    {
        return processNumber;
    }

    public void setProcessName(String processName)
    {
        this.processName = processName;
    }

    public String getProcessName()
    {
        return processName;
    }

    public void setProcessPlanStartDay(Date processPlanStartDay)
    {
        this.processPlanStartDay = processPlanStartDay;
    }

    public Date getProcessPlanStartDay()
    {
        return processPlanStartDay;
    }

    public void setProcessPlanEndDay(Date processPlanEndDay)
    {
        this.processPlanEndDay = processPlanEndDay;
    }

    public Date getProcessPlanEndDay()
    {
        return processPlanEndDay;
    }

    public void setNotStartWorkCount(Long notStartWorkCount)
    {
        this.notStartWorkCount = notStartWorkCount;
    }

    public Long getNotStartWorkCount()
    {
        return notStartWorkCount;
    }

    public void setCompletedCount(Long completedCount)
    {
        this.completedCount = completedCount;
    }

    public Long getCompletedCount()
    {
        return completedCount;
    }

    public void setIntegrationDay(Date integrationDay)
    {
        this.integrationDay = integrationDay;
    }

    public Date getIntegrationDay()
    {
        return integrationDay;
    }

    public void setPlant(String plant)
    {
        this.plant = plant;
    }

    public String getPlant()
    {
        return plant;
    }

    public void setDelFlag(String delFlag)
    {
        this.delFlag = delFlag;
    }

    public String getDelFlag()
    {
        return delFlag;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                .append("id", getId())
                .append("itemNo", getItemNo())
                .append("workOrderNo", getWorkOrderNo())
                .append("processNumber", getProcessNumber())
                .append("processName", getProcessName())
                .append("processPlanStartDay", getProcessPlanStartDay())
                .append("processPlanEndDay", getProcessPlanEndDay())
                .append("notStartWorkCount", getNotStartWorkCount())
                .append("completedCount", getCompletedCount())
                .append("integrationDay", getIntegrationDay())
                .append("plant", getPlant())
                .append("delFlag", getDelFlag())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .toString();
    }

    public Long getDiscardCount() {
        return discardCount;
    }

    public void setDiscardCount(Long discardCount) {
        this.discardCount = discardCount;
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,235 @@
package com.aps.core.domain;

import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;

/**
 * å·¥è‰ºè·¯çº¿-临时对象 aps_process_route_temp
 * 
 * @author wwj
 * @date 2025-04-10
 */
public class ApsProcessRouteTemp extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ä¸»é”®id */
    private String id;

    /** æ–™å· */
    @Excel(name = "料号")
    private String itemNo;

    /** å·¥å•å· */
    @Excel(name = "工单号")
    private String workOrderNo;

    /** å·¥åºåºå· */
    @Excel(name = "工序序号")
    private Long processNumber;

    /** å·¥åºåç§° */
    @Excel(name = "工序名称")
    private String processName;

    /** å·¥åºè®¡åˆ’开始日期 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "工序计划开始日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date processPlanStartDay;

    /** å·¥åºè®¡åˆ’结束日期 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "工序计划完成日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date processPlanEndDay;

    /** æœªå¼€å·¥æ•°é‡ */
    @Excel(name = "未开工数量")
    private Long notStartWorkCount;

    /** å·²å®Œæˆæ•°é‡ */
    @Excel(name = "已完成数量")
    private Long completedCount;
    /** åºŸå¼ƒæ•°é‡ */
    @Excel(name = "废弃数量")
    private Long discardCount;
    /** é›†æˆæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "集成日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date integrationDay;

    /** æ‰¹æ¬¡å· */
    @Excel(name = "批次号")
    private String batchNumber;

    /** å·¥åŽ‚ */
    @Excel(name = "工厂")
    private String plant;

    /** åˆ é™¤æ ‡å¿—（0代表存在 2代表删除） */
    private String delFlag;

    public void setId(String id) 
    {
        this.id = id;
    }

    public String getId() 
    {
        return id;
    }

    public void setItemNo(String itemNo) 
    {
        this.itemNo = itemNo;
    }

    public String getItemNo() 
    {
        return itemNo;
    }

    public void setWorkOrderNo(String workOrderNo) 
    {
        this.workOrderNo = workOrderNo;
    }

    public String getWorkOrderNo() 
    {
        return workOrderNo;
    }

    public void setProcessNumber(Long processNumber) 
    {
        this.processNumber = processNumber;
    }

    public Long getProcessNumber() 
    {
        return processNumber;
    }

    public void setProcessName(String processName) 
    {
        this.processName = processName;
    }

    public String getProcessName() 
    {
        return processName;
    }

    public void setProcessPlanStartDay(Date processPlanStartDay) 
    {
        this.processPlanStartDay = processPlanStartDay;
    }

    public Date getProcessPlanStartDay() 
    {
        return processPlanStartDay;
    }

    public void setProcessPlanEndDay(Date processPlanEndDay) 
    {
        this.processPlanEndDay = processPlanEndDay;
    }

    public Date getProcessPlanEndDay() 
    {
        return processPlanEndDay;
    }

    public void setNotStartWorkCount(Long notStartWorkCount) 
    {
        this.notStartWorkCount = notStartWorkCount;
    }

    public Long getNotStartWorkCount() 
    {
        return notStartWorkCount;
    }

    public void setCompletedCount(Long completedCount) 
    {
        this.completedCount = completedCount;
    }

    public Long getCompletedCount() 
    {
        return completedCount;
    }

    public void setIntegrationDay(Date integrationDay) 
    {
        this.integrationDay = integrationDay;
    }

    public Date getIntegrationDay() 
    {
        return integrationDay;
    }

    public void setBatchNumber(String batchNumber) 
    {
        this.batchNumber = batchNumber;
    }

    public String getBatchNumber() 
    {
        return batchNumber;
    }

    public void setPlant(String plant) 
    {
        this.plant = plant;
    }

    public String getPlant() 
    {
        return plant;
    }

    public void setDelFlag(String delFlag) 
    {
        this.delFlag = delFlag;
    }

    public String getDelFlag() 
    {
        return delFlag;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("itemNo", getItemNo())
            .append("workOrderNo", getWorkOrderNo())
            .append("processNumber", getProcessNumber())
            .append("processName", getProcessName())
            .append("processPlanStartDay", getProcessPlanStartDay())
            .append("processPlanEndDay", getProcessPlanEndDay())
            .append("notStartWorkCount", getNotStartWorkCount())
            .append("completedCount", getCompletedCount())
            .append("integrationDay", getIntegrationDay())
            .append("batchNumber", getBatchNumber())
            .append("plant", getPlant())
            .append("delFlag", getDelFlag())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .toString();
    }

    public Long getDiscardCount() {
        return discardCount;
    }

    public void setDiscardCount(Long discardCount) {
        this.discardCount = discardCount;
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProcessRouteMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.aps.core.mapper;

import java.util.List;
import com.aps.core.domain.ApsProcessRoute;
import org.apache.ibatis.annotations.Mapper;

/**
 * å·¥è‰ºè·¯çº¿Mapper接口
 * 
 * @author wwj
 * @date 2025-04-10
 */
@Mapper
public interface ApsProcessRouteMapper 
{
    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿
     * 
     * @param id å·¥è‰ºè·¯çº¿ä¸»é”®
     * @return å·¥è‰ºè·¯çº¿
     */
    public ApsProcessRoute selectApsProcessRouteById(String id);

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿åˆ—表
     * 
     * @param apsProcessRoute å·¥è‰ºè·¯çº¿
     * @return å·¥è‰ºè·¯çº¿é›†åˆ
     */
    public List<ApsProcessRoute> selectApsProcessRouteList(ApsProcessRoute apsProcessRoute);

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿
     * 
     * @param apsProcessRoute å·¥è‰ºè·¯çº¿
     * @return ç»“æžœ
     */
    public int insertApsProcessRoute(ApsProcessRoute apsProcessRoute);

    /**
     * ä¿®æ”¹å·¥è‰ºè·¯çº¿
     * 
     * @param apsProcessRoute å·¥è‰ºè·¯çº¿
     * @return ç»“æžœ
     */
    public int updateApsProcessRoute(ApsProcessRoute apsProcessRoute);

    /**
     * åˆ é™¤å·¥è‰ºè·¯çº¿
     * 
     * @param id å·¥è‰ºè·¯çº¿ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsProcessRouteById(String id);

    /**
     * æ‰¹é‡åˆ é™¤å·¥è‰ºè·¯çº¿
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteApsProcessRouteByIds(String[] ids);
}

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProcessRouteTempMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.aps.core.mapper;

import java.util.List;
import com.aps.core.domain.ApsProcessRouteTemp;
import org.apache.ibatis.annotations.Mapper;

/**
 * å·¥è‰ºè·¯çº¿-临时Mapper接口
 * 
 * @author wwj
 * @date 2025-04-10
 */
@Mapper
public interface ApsProcessRouteTempMapper 
{
    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿-临时
     * 
     * @param id å·¥è‰ºè·¯çº¿-临时主键
     * @return å·¥è‰ºè·¯çº¿-临时
     */
    public ApsProcessRouteTemp selectApsProcessRouteTempById(String id);

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿-临时列表
     * 
     * @param apsProcessRouteTemp å·¥è‰ºè·¯çº¿-临时
     * @return å·¥è‰ºè·¯çº¿-临时集合
     */
    public List<ApsProcessRouteTemp> selectApsProcessRouteTempList(ApsProcessRouteTemp apsProcessRouteTemp);

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿-临时
     * 
     * @param apsProcessRouteTemp å·¥è‰ºè·¯çº¿-临时
     * @return ç»“æžœ
     */
    public int insertApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp);

    /**
     * ä¿®æ”¹å·¥è‰ºè·¯çº¿-临时
     * 
     * @param apsProcessRouteTemp å·¥è‰ºè·¯çº¿-临时
     * @return ç»“æžœ
     */
    public int updateApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp);

    /**
     * åˆ é™¤å·¥è‰ºè·¯çº¿-临时
     * 
     * @param id å·¥è‰ºè·¯çº¿-临时主键
     * @return ç»“æžœ
     */
    public int deleteApsProcessRouteTempById(String id);

    /**
     * æ‰¹é‡åˆ é™¤å·¥è‰ºè·¯çº¿-临时
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteApsProcessRouteTempByIds(String[] ids);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProcessRouteService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
package com.aps.core.service;

import java.util.List;
import com.aps.core.domain.ApsProcessRoute;
import com.aps.core.domain.ApsProcessRouteTemp;

/**
 * å·¥è‰ºè·¯çº¿Service接口
 * 
 * @author wwj
 * @date 2025-04-10
 */
public interface IApsProcessRouteService 
{
    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿
     * 
     * @param id å·¥è‰ºè·¯çº¿ä¸»é”®
     * @return å·¥è‰ºè·¯çº¿
     */
    public ApsProcessRoute selectApsProcessRouteById(String id);

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿åˆ—表
     * 
     * @param apsProcessRoute å·¥è‰ºè·¯çº¿
     * @return å·¥è‰ºè·¯çº¿é›†åˆ
     */
    public List<ApsProcessRoute> selectApsProcessRouteList(ApsProcessRoute apsProcessRoute);

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿
     * 
     * @param apsProcessRoute å·¥è‰ºè·¯çº¿
     * @return ç»“æžœ
     */
    public int insertApsProcessRoute(ApsProcessRoute apsProcessRoute);

    /**
     * ä¿®æ”¹å·¥è‰ºè·¯çº¿
     * 
     * @param apsProcessRoute å·¥è‰ºè·¯çº¿
     * @return ç»“æžœ
     */
    public int updateApsProcessRoute(ApsProcessRoute apsProcessRoute);

    /**
     * æ‰¹é‡åˆ é™¤å·¥è‰ºè·¯çº¿
     * 
     * @param ids éœ€è¦åˆ é™¤çš„工艺路线主键集合
     * @return ç»“æžœ
     */
    public int deleteApsProcessRouteByIds(String[] ids);

    /**
     * åˆ é™¤å·¥è‰ºè·¯çº¿ä¿¡æ¯
     * 
     * @param id å·¥è‰ºè·¯çº¿ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsProcessRouteById(String id);

    int confirmProcessRoute(ApsProcessRouteTemp apsProcessRouteTemp);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProcessRouteTempService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.aps.core.service;

import java.util.List;
import com.aps.core.domain.ApsProcessRouteTemp;

/**
 * å·¥è‰ºè·¯çº¿-临时Service接口
 * 
 * @author wwj
 * @date 2025-04-10
 */
public interface IApsProcessRouteTempService 
{
    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿-临时
     * 
     * @param id å·¥è‰ºè·¯çº¿-临时主键
     * @return å·¥è‰ºè·¯çº¿-临时
     */
    public ApsProcessRouteTemp selectApsProcessRouteTempById(String id);

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿-临时列表
     * 
     * @param apsProcessRouteTemp å·¥è‰ºè·¯çº¿-临时
     * @return å·¥è‰ºè·¯çº¿-临时集合
     */
    public List<ApsProcessRouteTemp> selectApsProcessRouteTempList(ApsProcessRouteTemp apsProcessRouteTemp);

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿-临时
     * 
     * @param apsProcessRouteTemp å·¥è‰ºè·¯çº¿-临时
     * @return ç»“æžœ
     */
    public int insertApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp);

    /**
     * ä¿®æ”¹å·¥è‰ºè·¯çº¿-临时
     * 
     * @param apsProcessRouteTemp å·¥è‰ºè·¯çº¿-临时
     * @return ç»“æžœ
     */
    public int updateApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp);

    /**
     * æ‰¹é‡åˆ é™¤å·¥è‰ºè·¯çº¿-临时
     * 
     * @param ids éœ€è¦åˆ é™¤çš„工艺路线-临时主键集合
     * @return ç»“æžœ
     */
    public int deleteApsProcessRouteTempByIds(String[] ids);

    /**
     * åˆ é™¤å·¥è‰ºè·¯çº¿-临时信息
     * 
     * @param id å·¥è‰ºè·¯çº¿-临时主键
     * @return ç»“æžœ
     */
    public int deleteApsProcessRouteTempById(String id);
}

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

@@ -2,6 +2,7 @@

import java.util.List;

import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsGasPipingPlanTemp;
import com.aps.core.domain.ApsPartPlan;
@@ -63,6 +64,7 @@
    public int insertApsGasPipingPlan(ApsGasPipingPlan apsGasPipingPlan)
    {
        apsGasPipingPlan.setId(IdUtils.fastUUID());
        apsGasPipingPlan.setCreateTime(DateUtils.getNowDate());
        return apsGasPipingPlanMapper.insertApsGasPipingPlan(apsGasPipingPlan);
    }


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

@@ -2,6 +2,7 @@

import java.util.List;

import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,6 +56,7 @@
    public int insertApsGasPipingPlanTemp(ApsGasPipingPlanTemp apsGasPipingPlanTemp)
    {
        apsGasPipingPlanTemp.setId(IdUtils.fastUUID());
        apsGasPipingPlanTemp.setCreateTime(DateUtils.getNowDate());
        return apsGasPipingPlanTempMapper.insertApsGasPipingPlanTemp(apsGasPipingPlanTemp);
    }


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

@@ -2,6 +2,7 @@

import java.util.List;

import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsPartPlanTemp;
import com.aps.core.mapper.ApsPartPlanTempMapper;
@@ -61,6 +62,7 @@
    public int insertApsPartPlan(ApsPartPlan apsPartPlan)
    {
        apsPartPlan.setId(IdUtils.fastUUID());
        apsPartPlan.setCreateTime(DateUtils.getNowDate());
        return apsPartPlanMapper.insertApsPartPlan(apsPartPlan);
    }


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

@@ -2,6 +2,7 @@

import java.util.List;

import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,6 +56,7 @@
    public int insertApsPartPlanTemp(ApsPartPlanTemp apsPartPlanTemp)
    {
        apsPartPlanTemp.setId(IdUtils.fastUUID());
        apsPartPlanTemp.setCreateTime(DateUtils.getNowDate());
        return apsPartPlanTempMapper.insertApsPartPlanTemp(apsPartPlanTemp);
    }


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

@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Optional;

import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
import com.aps.core.domain.ApsPlatePlanTemp;
@@ -68,6 +69,7 @@
    public int insertApsPlatePlan(ApsPlatePlan apsPlatePlan)
    {
        apsPlatePlan.setId(IdUtils.fastUUID());
        apsPlatePlan.setCreateTime(DateUtils.getNowDate());
        return apsPlatePlanMapper.insertApsPlatePlan(apsPlatePlan);
    }


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

@@ -1,6 +1,8 @@
package com.aps.core.service.impl;

import java.util.List;

import com.aps.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlatePlanTempMapper;
@@ -52,6 +54,7 @@
    @Override
    public int insertApsPlatePlanTemp(ApsPlatePlanTemp apsPlatePlanTemp)
    {
        apsPlatePlanTemp.setCreateTime(DateUtils.getNowDate());
        return apsPlatePlanTempMapper.insertApsPlatePlanTemp(apsPlatePlanTemp);
    }


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
package com.aps.core.service.impl;

import java.util.List;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsProcessRouteTemp;
import com.aps.core.mapper.ApsProcessRouteTempMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsProcessRouteMapper;
import com.aps.core.domain.ApsProcessRoute;
import com.aps.core.service.IApsProcessRouteService;

/**
 * å·¥è‰ºè·¯çº¿Service业务层处理
 * 
 * @author wwj
 * @date 2025-04-10
 */
@Service
public class ApsProcessRouteServiceImpl implements IApsProcessRouteService 
{
    @Autowired
    private ApsProcessRouteMapper apsProcessRouteMapper;
    @Autowired
    private ApsProcessRouteTempMapper apsProcessRouteTempMapper;

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿
     * 
     * @param id å·¥è‰ºè·¯çº¿ä¸»é”®
     * @return å·¥è‰ºè·¯çº¿
     */
    @Override
    public ApsProcessRoute selectApsProcessRouteById(String id)
    {
        return apsProcessRouteMapper.selectApsProcessRouteById(id);
    }

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿åˆ—表
     * 
     * @param apsProcessRoute å·¥è‰ºè·¯çº¿
     * @return å·¥è‰ºè·¯çº¿
     */
    @Override
    public List<ApsProcessRoute> selectApsProcessRouteList(ApsProcessRoute apsProcessRoute)
    {
        return apsProcessRouteMapper.selectApsProcessRouteList(apsProcessRoute);
    }

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿
     * 
     * @param apsProcessRoute å·¥è‰ºè·¯çº¿
     * @return ç»“æžœ
     */
    @Override
    public int insertApsProcessRoute(ApsProcessRoute apsProcessRoute)
    {
        apsProcessRoute.setId(IdUtils.fastUUID());
        apsProcessRoute.setCreateTime(DateUtils.getNowDate());
        return apsProcessRouteMapper.insertApsProcessRoute(apsProcessRoute);
    }

    /**
     * ä¿®æ”¹å·¥è‰ºè·¯çº¿
     * 
     * @param apsProcessRoute å·¥è‰ºè·¯çº¿
     * @return ç»“æžœ
     */
    @Override
    public int updateApsProcessRoute(ApsProcessRoute apsProcessRoute)
    {
        apsProcessRoute.setUpdateTime(DateUtils.getNowDate());
        return apsProcessRouteMapper.updateApsProcessRoute(apsProcessRoute);
    }

    /**
     * æ‰¹é‡åˆ é™¤å·¥è‰ºè·¯çº¿
     * 
     * @param ids éœ€è¦åˆ é™¤çš„工艺路线主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsProcessRouteByIds(String[] ids)
    {
        return apsProcessRouteMapper.deleteApsProcessRouteByIds(ids);
    }

    /**
     * åˆ é™¤å·¥è‰ºè·¯çº¿ä¿¡æ¯
     * 
     * @param id å·¥è‰ºè·¯çº¿ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsProcessRouteById(String id)
    {
        return apsProcessRouteMapper.deleteApsProcessRouteById(id);
    }

    @Override
    public int confirmProcessRoute(ApsProcessRouteTemp apsProcessRouteTemp) {
        //查询临时表数据
        List<ApsProcessRouteTemp> apsProcessRouteTemps =apsProcessRouteTempMapper.selectApsProcessRouteTempList(apsProcessRouteTemp);
        int count=0;
        String[] ids=new String[apsProcessRouteTemps.size()];
        for (int i = 0; i < apsProcessRouteTemps.size() ; i++) {
            //记录临时表id
            ids[i]= apsProcessRouteTemps.get(i).getId();
            ApsProcessRoute apsProcessRoute =new ApsProcessRoute();
            BeanUtils.copyProperties(apsProcessRouteTemps.get(i), apsProcessRoute);
            apsProcessRoute.setId(IdUtils.fastUUID());
            //插入正式表，并记录
            apsProcessRoute.setCreateTime(DateUtils.getNowDate());
            apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
            apsProcessRouteMapper.insertApsProcessRoute(apsProcessRoute);
            count++;
        }
        //插入数量与临时表查询一直则删除临时表数据
        if (count== apsProcessRouteTemps.size()) {
            apsProcessRouteTempMapper.deleteApsProcessRouteTempByIds(ids);
        }
        return 1;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package com.aps.core.service.impl;

import java.util.List;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsProcessRouteTempMapper;
import com.aps.core.domain.ApsProcessRouteTemp;
import com.aps.core.service.IApsProcessRouteTempService;

/**
 * å·¥è‰ºè·¯çº¿-临时Service业务层处理
 * 
 * @author wwj
 * @date 2025-04-10
 */
@Service
public class ApsProcessRouteTempServiceImpl implements IApsProcessRouteTempService 
{
    @Autowired
    private ApsProcessRouteTempMapper apsProcessRouteTempMapper;

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿-临时
     * 
     * @param id å·¥è‰ºè·¯çº¿-临时主键
     * @return å·¥è‰ºè·¯çº¿-临时
     */
    @Override
    public ApsProcessRouteTemp selectApsProcessRouteTempById(String id)
    {
        return apsProcessRouteTempMapper.selectApsProcessRouteTempById(id);
    }

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿-临时列表
     * 
     * @param apsProcessRouteTemp å·¥è‰ºè·¯çº¿-临时
     * @return å·¥è‰ºè·¯çº¿-临时
     */
    @Override
    public List<ApsProcessRouteTemp> selectApsProcessRouteTempList(ApsProcessRouteTemp apsProcessRouteTemp)
    {
        return apsProcessRouteTempMapper.selectApsProcessRouteTempList(apsProcessRouteTemp);
    }

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿-临时
     * 
     * @param apsProcessRouteTemp å·¥è‰ºè·¯çº¿-临时
     * @return ç»“æžœ
     */
    @Override
    public int insertApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp)
    {
        apsProcessRouteTemp.setId(IdUtils.fastUUID());
        apsProcessRouteTemp.setCreateTime(DateUtils.getNowDate());
        return apsProcessRouteTempMapper.insertApsProcessRouteTemp(apsProcessRouteTemp);
    }

    /**
     * ä¿®æ”¹å·¥è‰ºè·¯çº¿-临时
     * 
     * @param apsProcessRouteTemp å·¥è‰ºè·¯çº¿-临时
     * @return ç»“æžœ
     */
    @Override
    public int updateApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp)
    {
        apsProcessRouteTemp.setUpdateTime(DateUtils.getNowDate());
        return apsProcessRouteTempMapper.updateApsProcessRouteTemp(apsProcessRouteTemp);
    }

    /**
     * æ‰¹é‡åˆ é™¤å·¥è‰ºè·¯çº¿-临时
     * 
     * @param ids éœ€è¦åˆ é™¤çš„工艺路线-临时主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsProcessRouteTempByIds(String[] ids)
    {
        return apsProcessRouteTempMapper.deleteApsProcessRouteTempByIds(ids);
    }

    /**
     * åˆ é™¤å·¥è‰ºè·¯çº¿-临时信息
     * 
     * @param id å·¥è‰ºè·¯çº¿-临时主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsProcessRouteTempById(String id)
    {
        return apsProcessRouteTempMapper.deleteApsProcessRouteTempById(id);
    }
}

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

@@ -2,6 +2,7 @@

import java.util.List;

import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsPartPlan;
@@ -64,6 +65,7 @@
    public int insertApsWeldSeam(ApsWeldSeam apsWeldSeam)
    {
        apsWeldSeam.setId(IdUtils.fastUUID());
        apsWeldSeam.setCreateTime(DateUtils.getNowDate());
        return apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
    }


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

@@ -2,6 +2,7 @@

import java.util.List;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsWeldSeamStatisticsMapper;
@@ -53,6 +54,7 @@
    @Override
    public int insertApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics)
    {
        apsWeldSeamStatistics.setId(IdUtils.fastUUID());
        apsWeldSeamStatistics.setCreateTime(DateUtils.getNowDate());
        return apsWeldSeamStatisticsMapper.insertApsWeldSeamStatistics(apsWeldSeamStatistics);
    }

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

@@ -2,6 +2,7 @@

import java.util.List;

import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,6 +56,7 @@
    public int insertApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp)
    {
        apsWeldSeamTemp.setId(IdUtils.fastUUID());
        apsWeldSeamTemp.setCreateTime(DateUtils.getNowDate());
        return apsWeldSeamTempMapper.insertApsWeldSeamTemp(apsWeldSeamTemp);
    }


 aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProcessRouteMapper">

    <resultMap type="ApsProcessRoute" id="ApsProcessRouteResult">
        <result property="id"    column="id"    />
        <result property="itemNo"    column="item_no"    />
        <result property="workOrderNo"    column="work_order_no"    />
        <result property="processNumber"    column="process_number"    />
        <result property="processName"    column="process_name"    />
        <result property="processPlanStartDay"    column="process_plan_start_day"    />
        <result property="processPlanEndDay"    column="process_plan_end_day"    />
        <result property="notStartWorkCount"    column="not_start_work_count"    />
        <result property="completedCount"    column="completed_count"    />
        <result property="discardCount"    column="discard_count"    />
        <result property="integrationDay"    column="integration_day"    />
        <result property="plant"    column="plant"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>

    <sql id="selectApsProcessRouteVo">
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, plant, del_flag, create_by, create_time, update_by, update_time from aps_process_route
    </sql>

    <select id="selectApsProcessRouteList" parameterType="ApsProcessRoute" resultMap="ApsProcessRouteResult">
        <include refid="selectApsProcessRouteVo"/>
        <where>
            <if test="itemNo != null  and itemNo != ''"> and item_no like  '%' || #{itemNo} || '%' </if>
            <if test="workOrderNo != null  and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
            <if test="processNumber != null "> and process_number = #{processNumber}</if>
            <if test="processName != null  and processName != ''"> and process_name like concat('%', #{processName}, '%')</if>
            <if test="processPlanStartDay != null "> and process_plan_start_day = #{processPlanStartDay}</if>
            <if test="processPlanEndDay != null "> and process_plan_end_day = #{processPlanEndDay}</if>
            <if test="notStartWorkCount != null "> and not_start_work_count = #{notStartWorkCount}</if>
            <if test="completedCount != null "> and completed_count = #{completedCount}</if>
            <if test="discardCount != null "> and discard_count = #{discardCount}</if>
            <if test="integrationDay != null "> and integration_day = #{integrationDay}</if>
            <if test="plant != null  and plant != ''"> and plant = #{plant}</if>
        </where>
    </select>

    <select id="selectApsProcessRouteById" parameterType="String" resultMap="ApsProcessRouteResult">
    </select>

    <insert id="insertApsProcessRoute" parameterType="ApsProcessRoute">
        insert into aps_process_route
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="itemNo != null">item_no,</if>
            <if test="workOrderNo != null">work_order_no,</if>
            <if test="processNumber != null">process_number,</if>
            <if test="processName != null">process_name,</if>
            <if test="processPlanStartDay != null">process_plan_start_day,</if>
            <if test="processPlanEndDay != null">process_plan_end_day,</if>
            <if test="notStartWorkCount != null">not_start_work_count,</if>
            <if test="completedCount != null">completed_count,</if>
            <if test="discardCount != null">discard_count,</if>
            <if test="integrationDay != null">integration_day,</if>
            <if test="plant != null">plant,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="itemNo != null">#{itemNo},</if>
            <if test="workOrderNo != null">#{workOrderNo},</if>
            <if test="processNumber != null">#{processNumber},</if>
            <if test="processName != null">#{processName},</if>
            <if test="processPlanStartDay != null">#{processPlanStartDay},</if>
            <if test="processPlanEndDay != null">#{processPlanEndDay},</if>
            <if test="notStartWorkCount != null">#{notStartWorkCount},</if>
            <if test="completedCount != null">#{completedCount},</if>
            <if test="discardCount != null">#{discardCount},</if>
            <if test="integrationDay != null">#{integrationDay},</if>
            <if test="plant != null">#{plant},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
        </trim>
    </insert>

    <update id="updateApsProcessRoute" parameterType="ApsProcessRoute">
        update aps_process_route
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNo != null">item_no = #{itemNo},</if>
            <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
            <if test="processNumber != null">process_number = #{processNumber},</if>
            <if test="processName != null">process_name = #{processName},</if>
            <if test="processPlanStartDay != null">process_plan_start_day = #{processPlanStartDay},</if>
            <if test="processPlanEndDay != null">process_plan_end_day = #{processPlanEndDay},</if>
            <if test="notStartWorkCount != null">not_start_work_count = #{notStartWorkCount},</if>
            <if test="completedCount != null">completed_count = #{completedCount},</if>
            <if test="discardCount != null">discard_count = #{discardCount},</if>
            <if test="integrationDay != null">integration_day = #{integrationDay},</if>
            <if test="plant != null">plant = #{plant},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteApsProcessRouteById" parameterType="String">
        delete from aps_process_route where id = #{id}
    </delete>

    <delete id="deleteApsProcessRouteByIds" parameterType="String">
        delete from aps_process_route where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteTempMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,131 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProcessRouteTempMapper">

    <resultMap type="ApsProcessRouteTemp" id="ApsProcessRouteTempResult">
        <result property="id"    column="id"    />
        <result property="itemNo"    column="item_no"    />
        <result property="workOrderNo"    column="work_order_no"    />
        <result property="processNumber"    column="process_number"    />
        <result property="processName"    column="process_name"    />
        <result property="processPlanStartDay"    column="process_plan_start_day"    />
        <result property="processPlanEndDay"    column="process_plan_end_day"    />
        <result property="notStartWorkCount"    column="not_start_work_count"    />
        <result property="completedCount"    column="completed_count"    />
        <result property="discardCount"    column="discard_count"    />
        <result property="integrationDay"    column="integration_day"    />
        <result property="batchNumber"    column="batch_number"    />
        <result property="plant"    column="plant"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>

    <sql id="selectApsProcessRouteTempVo">
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, batch_number, plant, del_flag, create_by, create_time, update_by, update_time from aps_process_route_temp
    </sql>

    <select id="selectApsProcessRouteTempList" parameterType="ApsProcessRouteTemp" resultMap="ApsProcessRouteTempResult">
        <include refid="selectApsProcessRouteTempVo"/>
        <where>
            <if test="itemNo != null  and itemNo != ''"> and item_no = #{itemNo}</if>
            <if test="workOrderNo != null  and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
            <if test="processNumber != null "> and process_number = #{processNumber}</if>
            <if test="processName != null  and processName != ''"> and process_name like concat('%', #{processName}, '%')</if>
            <if test="processPlanStartDay != null "> and process_plan_start_day = #{processPlanStartDay}</if>
            <if test="processPlanEndDay != null "> and process_plan_end_day = #{processPlanEndDay}</if>
            <if test="notStartWorkCount != null "> and not_start_work_count = #{notStartWorkCount}</if>
            <if test="completedCount != null "> and completed_count = #{completedCount}</if>
            <if test="discardCount != null "> and discard_count = #{discardCount}</if>
            <if test="integrationDay != null "> and integration_day = #{integrationDay}</if>
            <if test="batchNumber != null  and batchNumber != ''"> and batch_number = #{batchNumber}</if>
            <if test="plant != null  and plant != ''"> and plant = #{plant}</if>
        </where>
    </select>

    <select id="selectApsProcessRouteTempById" parameterType="String" resultMap="ApsProcessRouteTempResult">
    </select>

    <insert id="insertApsProcessRouteTemp" parameterType="ApsProcessRouteTemp">
        insert into aps_process_route_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="itemNo != null">item_no,</if>
            <if test="workOrderNo != null">work_order_no,</if>
            <if test="processNumber != null">process_number,</if>
            <if test="processName != null">process_name,</if>
            <if test="processPlanStartDay != null">process_plan_start_day,</if>
            <if test="processPlanEndDay != null">process_plan_end_day,</if>
            <if test="notStartWorkCount != null">not_start_work_count,</if>
            <if test="completedCount != null">completed_count,</if>
            <if test="discardCount != null">discard_count,</if>
            <if test="integrationDay != null">integration_day,</if>
            <if test="batchNumber != null">batch_number,</if>
            <if test="plant != null">plant,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="itemNo != null">#{itemNo},</if>
            <if test="workOrderNo != null">#{workOrderNo},</if>
            <if test="processNumber != null">#{processNumber},</if>
            <if test="processName != null">#{processName},</if>
            <if test="processPlanStartDay != null">#{processPlanStartDay},</if>
            <if test="processPlanEndDay != null">#{processPlanEndDay},</if>
            <if test="notStartWorkCount != null">#{notStartWorkCount},</if>
            <if test="completedCount != null">#{completedCount},</if>
            <if test="discardCount != null">#{discardCount},</if>
            <if test="integrationDay != null">#{integrationDay},</if>
            <if test="batchNumber != null">#{batchNumber},</if>
            <if test="plant != null">#{plant},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
        </trim>
    </insert>

    <update id="updateApsProcessRouteTemp" parameterType="ApsProcessRouteTemp">
        update aps_process_route_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNo != null">item_no = #{itemNo},</if>
            <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
            <if test="processNumber != null">process_number = #{processNumber},</if>
            <if test="processName != null">process_name = #{processName},</if>
            <if test="processPlanStartDay != null">process_plan_start_day = #{processPlanStartDay},</if>
            <if test="processPlanEndDay != null">process_plan_end_day = #{processPlanEndDay},</if>
            <if test="notStartWorkCount != null">not_start_work_count = #{notStartWorkCount},</if>
            <if test="completedCount != null">completed_count = #{completedCount},</if>
            <if test="discardCount != null">discard_count = #{discardCount},</if>
            <if test="integrationDay != null">integration_day = #{integrationDay},</if>
            <if test="batchNumber != null">batch_number = #{batchNumber},</if>
            <if test="plant != null">plant = #{plant},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteApsProcessRouteTempById" parameterType="String">
        delete from aps_process_route_temp where id = #{id}
    </delete>

    <delete id="deleteApsProcessRouteTempByIds" parameterType="String">
        delete from aps_process_route_temp where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

 aps-modules/aps-system/src/main/resources/bootstrap.yml

@@ -16,8 +16,8 @@
        # æœåŠ¡æ³¨å†Œåœ°å€
        server-addr: 192.168.50.160:8848
#        ip: 192.168.50.13
        metadata:
          local: wwj
#        metadata:
#          local: wwj
        namespace: 8e9f8829-4286-4925-943a-a6c242767ac2
      config:
        # é…ç½®ä¸­å¿ƒåœ°å€