焊缝相关

wenwj

2025-04-09 c701dc41e6dc5935165c2835547e898d2d1565d9

焊缝相关

 aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamController.java

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

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.common.security.utils.DictUtils;
import com.aps.core.domain.ApsWeldSeam;
import com.aps.core.domain.ApsWeldSeamTemp;
import com.aps.core.service.IApsWeldSeamService;
import com.aps.core.service.IApsWeldSeamTempService;
import com.aps.system.api.domain.SysDictData;
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-09
 */
@RestController
@RequestMapping("/weldSeam")
public class ApsWeldSeamController extends BaseController {
    @Autowired
    private IApsWeldSeamService apsWeldSeamService;
    @Autowired
    private IApsWeldSeamTempService apsWeldSeamTempService;

    /**
     * æŸ¥è¯¢ç„Šç¼åˆ—表
     */
    @RequiresPermissions("gasPiping:gasPiping:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsWeldSeam apsWeldSeam) {
//        startPage();
        List<ApsWeldSeam> list = apsWeldSeamService.selectApsWeldSeamList(apsWeldSeam);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºç„Šç¼åˆ—表
     */
    @RequiresPermissions("gasPiping:gasPiping:export")
    @Log(title = "焊缝", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsWeldSeam apsWeldSeam) {
        List<ApsWeldSeam> apsWeldSeams = apsWeldSeamService.selectApsWeldSeamList(apsWeldSeam);
        //工单类型
        List<SysDictData> listTypes = DictUtils.getDictCache("aps_weld_work_order_type");
        //分类
        List<SysDictData> list = DictUtils.getDictCache("aps_weld_classification");
        for (int i = 0; i < apsWeldSeams.size(); i++) {
            //分类
            for (int j = 0; j < list.size(); j++) {
                if (apsWeldSeams.get(i).getClassification().equals(list.get(j).getDictValue())) {
                    apsWeldSeams.get(i).setClassificationTxt(list.get(j).getDictLabel());
                }
            }
            //工单类型
            for (int j = 0; j < listTypes.size(); j++) {
                if (apsWeldSeams.get(i).getWorkOrderType().equals(listTypes.get(j).getDictValue())) {
                    apsWeldSeams.get(i).setWorkOrderTypeTxt(listTypes.get(j).getDictLabel());
                }
            }
        }
        ExcelUtil<ApsWeldSeam> util = new ExcelUtil<ApsWeldSeam>(ApsWeldSeam.class);
        util.exportExcel(response, apsWeldSeams, "焊缝数据");
    }

    /**
     * èŽ·å–焊缝详细信息
     */
    @RequiresPermissions("gasPiping:gasPiping:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id) {
        return success(apsWeldSeamService.selectApsWeldSeamById(id));
    }

    /**
     * æ–°å¢žç„Šç¼
     */
    @RequiresPermissions("gasPiping:gasPiping:add")
    @Log(title = "焊缝", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsWeldSeam apsWeldSeam) {
        return toAjax(apsWeldSeamService.insertApsWeldSeam(apsWeldSeam));
    }

    /**
     * ä¿®æ”¹ç„Šç¼
     */
    @RequiresPermissions("gasPiping:gasPiping:edit")
    @Log(title = "焊缝", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsWeldSeam apsWeldSeam) {
        return toAjax(apsWeldSeamService.updateApsWeldSeam(apsWeldSeam));
    }

    /**
     * åˆ é™¤ç„Šç¼
     */
    @RequiresPermissions("gasPiping:gasPiping:remove")
    @Log(title = "焊缝", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids) {
        return toAjax(apsWeldSeamService.deleteApsWeldSeamByIds(ids));
    }

    /**
     * ç„Šç¼å¯¼å…¥
     */
    @PostMapping("/importData")
    public AjaxResult importData(MultipartFile file) throws Exception {
        ExcelUtil<ApsWeldSeamTemp> util = new ExcelUtil<ApsWeldSeamTemp>(ApsWeldSeamTemp.class);
        List<ApsWeldSeamTemp> apsWeldSeamTemps = util.importExcel(file.getInputStream());
        //判断导入数据是否为空
        if (apsWeldSeamTemps.size() > 0) {
            String batchNum = IdUtils.fastUUID();
            //工单类型
            List<SysDictData> listTypes = DictUtils.getDictCache("aps_weld_work_order_type");
            //分类
            List<SysDictData> list = DictUtils.getDictCache("aps_weld_classification");
            for (int i = 0; i < apsWeldSeamTemps.size(); i++) {
                //分类
                for (int j = 0; j < list.size(); j++) {
                    if (apsWeldSeamTemps.get(i).getClassificationTxt().equals(list.get(j).getDictLabel())) {
                        apsWeldSeamTemps.get(i).setClassification(list.get(j).getDictValue());
                    }
                }
                //工单类型
                for (int j = 0; j < listTypes.size(); j++) {
                    if (apsWeldSeamTemps.get(i).getWorkOrderTypeTxt().equals(listTypes.get(j).getDictLabel())) {
                        apsWeldSeamTemps.get(i).setWorkOrderType(listTypes.get(j).getDictValue());
                    }
                }
                //插入版本号
                apsWeldSeamTemps.get(i).setBatchNumber(batchNum);
                //插入临时表
                apsWeldSeamTemps.get(i).setTotalWeldSeam(apsWeldSeamTemps.get(i).getSingleWeldSeam().longValue()*apsWeldSeamTemps.get(i).getProductionQuantity().longValue());
                apsWeldSeamTempService.insertApsWeldSeamTemp(apsWeldSeamTemps.get(i));
            }

            return AjaxResult.success("导入成功", batchNum);
        } else {
            return AjaxResult.error("模板内容为空");
        }
    }

    /***
     * @Description: ç¡®è®¤ä¸Šä¼ 
     * @Param: [apsPartPlan]
     * @return: com.aps.common.core.web.domain.AjaxResult
     * @Author: wwj
     * @Date: 2025/4/9
     */
    @GetMapping("/confirmWeldSeam")
    public AjaxResult confirmWeldSeam(ApsWeldSeamTemp apsWeldSeamTemp) {
        return toAjax(apsWeldSeamService.confirmWeldSeam(apsWeldSeamTemp));
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamTempController.java

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

import java.util.List;
import java.io.IOException;

import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
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.ApsWeldSeamTemp;
import com.aps.core.service.IApsWeldSeamTempService;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.page.TableDataInfo;

/**
 * ç„Šç¼-临时Controller
 * 
 * @author wwj
 * @date 2025-04-09
 */
@RestController
@RequestMapping("/weldSeamTemp")
public class ApsWeldSeamTempController extends BaseController
{
    @Autowired
    private IApsWeldSeamTempService apsWeldSeamTempService;

    /**
     * æŸ¥è¯¢ç„Šç¼-临时列表
     */
    @RequiresPermissions("gasPipingTemp:gasPipingTemp:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsWeldSeamTemp apsWeldSeamTemp)
    {
//        startPage();
        List<ApsWeldSeamTemp> list = apsWeldSeamTempService.selectApsWeldSeamTempList(apsWeldSeamTemp);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºç„Šç¼-临时列表
     */
    @RequiresPermissions("gasPipingTemp:gasPipingTemp:export")
    @Log(title = "焊缝-临时", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsWeldSeamTemp apsWeldSeamTemp)
    {
        List<ApsWeldSeamTemp> list = apsWeldSeamTempService.selectApsWeldSeamTempList(apsWeldSeamTemp);
        ExcelUtil<ApsWeldSeamTemp> util = new ExcelUtil<ApsWeldSeamTemp>(ApsWeldSeamTemp.class);
        util.exportExcel(response, list, "焊缝-临时数据");
    }

    /**
     * èŽ·å–焊缝-临时详细信息
     */
    @RequiresPermissions("gasPipingTemp:gasPipingTemp:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
        return success(apsWeldSeamTempService.selectApsWeldSeamTempById(id));
    }

    /**
     * æ–°å¢žç„Šç¼-临时
     */
    @RequiresPermissions("gasPipingTemp:gasPipingTemp:add")
    @Log(title = "焊缝-临时", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp)
    {
        return toAjax(apsWeldSeamTempService.insertApsWeldSeamTemp(apsWeldSeamTemp));
    }

    /**
     * ä¿®æ”¹ç„Šç¼-临时
     */
    @RequiresPermissions("gasPipingTemp:gasPipingTemp:edit")
    @Log(title = "焊缝-临时", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp)
    {
        return toAjax(apsWeldSeamTempService.updateApsWeldSeamTemp(apsWeldSeamTemp));
    }

    /**
     * åˆ é™¤ç„Šç¼-临时
     */
    @RequiresPermissions("gasPipingTemp:gasPipingTemp:remove")
    @Log(title = "焊缝-临时", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(apsWeldSeamTempService.deleteApsWeldSeamTempByIds(ids));
    }
}

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

@@ -160,7 +160,7 @@
    /** é£Žé™©æ ‡è¯† */
    @Excel(name = "风险标识")
    private Integer hasRisk;

    private String plant;
    public void setId(String id)
    {
        this.id = id;
@@ -559,4 +559,12 @@
    public void setIsSuspendedTxt(String isSuspendedTxt) {
        this.isSuspendedTxt = isSuspendedTxt;
    }

    public String getPlant() {
        return plant;
    }

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

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

@@ -165,6 +165,7 @@
    /** æ‰¹æ¬¡å· */
    @Excel(name = "批次号")
    private String batchNumber;
    private String plant;

    public void setId(String id)
    {
@@ -575,4 +576,12 @@
    public void setIsSuspendedTxt(String isSuspendedTxt) {
        this.isSuspendedTxt = isSuspendedTxt;
    }

    public String getPlant() {
        return plant;
    }

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

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

@@ -168,7 +168,7 @@
    private Integer hasRisk;

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

    public void setId(String id) 

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

@@ -167,7 +167,7 @@
    private String batchNumber;

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



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

@@ -161,7 +161,7 @@
    private Integer hasRisk;

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

    public void setId(String id) 

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

@@ -167,7 +167,7 @@
    private String batchNumber;

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

    public void setId(String id) 

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,362 @@
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_weld_seam
 * 
 * @author wwj
 * @date 2025-04-09
 */
public class ApsWeldSeam extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ä¸»é”®id */
    private String id;
    /** é”€å”®è®¢å•å· */
    @Excel(name = "销售订单号")
    private String saleOrderNo;

    /** é”€å”®è®¢å•è¡Œ */
    @Excel(name = "销售订单行")
    private Long saleOrderLine;

    /** ä¸»å·¥å•å· */
    @Excel(name = "主工单号")
    private String mainWorkOrderNo;

    /** ä¸Šçº§å·¥å•å· */
    @Excel(name = "上级工单号")
    private String superiorWorkOrderNo;

    /** å·¥å•å· */
    @Excel(name = "工单号")
    private String workOrderNo;
    /** å·¥å•ç±»åž‹ */
//    @Excel(name = "工单类型")
    private String workOrderType;
    @Excel(name = "工单类型")
    private String workOrderTypeTxt;

    /** ç‰©æ–™ç¼–码 */
    @Excel(name = "物料编码")
    private String materialCode;

    /** å®¢æˆ·å›¾å· */
    @Excel(name = "客户图号")
    private String customerDrawingNumber;

    /** ç”Ÿäº§æ•°é‡ */
    @Excel(name = "生产数量")
    private Long productionQuantity;
    /** ç»„织账号 */
    @Excel(name = "组织账号")
    private String organizeNumber;
    /** ç‰©æ–™éœ€æ±‚日期 */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "物料需求日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date materialsRequirementDay;
    /** æœ¬æ¬¡åé¦ˆæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "本次反馈日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date thisFeedbackDay;
    /** ç”Ÿäº§åŸºåœ° */
    @Excel(name = "生产基地")
    private String productionBase;

    /** åˆ†ç±»(气柜/管路) */
//    @Excel(name = "分类(气柜/管路)")
    private String classification;
    @Excel(name = "分类")
    private String classificationTxt;

    /** ç”Ÿäº§å¹´ä»½ */
    @Excel(name = "生产年份")
    private Long produceYear;

    /** ç”Ÿäº§æœˆä»½ */
    @Excel(name = "生产月份")
    private Long produceMonth;


    /** å®¢æˆ· */
    @Excel(name = "客户")
    private String customer;

    /** å•ä»¶ç„Šç¼ */
    @Excel(name = "单件焊缝")
    private Long singleWeldSeam;

    /** æ€»ç„Šç¼ */
    @Excel(name = "总焊缝")
    private Long totalWeldSeam;







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

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

    public String getId() 
    {
        return id;
    }

    public void setWorkOrderType(String workOrderType) 
    {
        this.workOrderType = workOrderType;
    }

    public String getWorkOrderType() 
    {
        return workOrderType;
    }

    public void setMaterialCode(String materialCode) 
    {
        this.materialCode = materialCode;
    }

    public String getMaterialCode() 
    {
        return materialCode;
    }

    public void setCustomerDrawingNumber(String customerDrawingNumber) 
    {
        this.customerDrawingNumber = customerDrawingNumber;
    }

    public String getCustomerDrawingNumber() 
    {
        return customerDrawingNumber;
    }

    public void setOrganizeNumber(String organizeNumber) 
    {
        this.organizeNumber = organizeNumber;
    }

    public String getOrganizeNumber() 
    {
        return organizeNumber;
    }

    public void setProductionBase(String productionBase) 
    {
        this.productionBase = productionBase;
    }

    public String getProductionBase() 
    {
        return productionBase;
    }

    public void setClassification(String classification) 
    {
        this.classification = classification;
    }

    public String getClassification() 
    {
        return classification;
    }

    public void setProduceYear(Long produceYear) 
    {
        this.produceYear = produceYear;
    }

    public Long getProduceYear() 
    {
        return produceYear;
    }

    public void setProduceMonth(Long produceMonth) 
    {
        this.produceMonth = produceMonth;
    }

    public Long getProduceMonth() 
    {
        return produceMonth;
    }

    public void setProductionQuantity(Long productionQuantity) 
    {
        this.productionQuantity = productionQuantity;
    }

    public Long getProductionQuantity() 
    {
        return productionQuantity;
    }

    public void setCustomer(String customer) 
    {
        this.customer = customer;
    }

    public String getCustomer() 
    {
        return customer;
    }

    public void setSingleWeldSeam(Long singleWeldSeam) 
    {
        this.singleWeldSeam = singleWeldSeam;
    }

    public Long getSingleWeldSeam() 
    {
        return singleWeldSeam;
    }

    public void setTotalWeldSeam(Long totalWeldSeam) 
    {
        this.totalWeldSeam = totalWeldSeam;
    }

    public Long getTotalWeldSeam() 
    {
        return totalWeldSeam;
    }

    public void setThisFeedbackDay(Date thisFeedbackDay) 
    {
        this.thisFeedbackDay = thisFeedbackDay;
    }

    public Date getThisFeedbackDay() 
    {
        return thisFeedbackDay;
    }

    public void setMaterialsRequirementDay(Date materialsRequirementDay) 
    {
        this.materialsRequirementDay = materialsRequirementDay;
    }

    public Date getMaterialsRequirementDay() 
    {
        return materialsRequirementDay;
    }

    public void setSaleOrderNo(String saleOrderNo) 
    {
        this.saleOrderNo = saleOrderNo;
    }

    public String getSaleOrderNo() 
    {
        return saleOrderNo;
    }

    public void setSaleOrderLine(Long saleOrderLine) 
    {
        this.saleOrderLine = saleOrderLine;
    }

    public Long getSaleOrderLine() 
    {
        return saleOrderLine;
    }

    public void setMainWorkOrderNo(String mainWorkOrderNo) 
    {
        this.mainWorkOrderNo = mainWorkOrderNo;
    }

    public String getMainWorkOrderNo() 
    {
        return mainWorkOrderNo;
    }

    public void setSuperiorWorkOrderNo(String superiorWorkOrderNo) 
    {
        this.superiorWorkOrderNo = superiorWorkOrderNo;
    }

    public String getSuperiorWorkOrderNo() 
    {
        return superiorWorkOrderNo;
    }

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

    public String getWorkOrderNo() 
    {
        return workOrderNo;
    }

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

    public String getPlant() 
    {
        return plant;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("workOrderType", getWorkOrderType())
            .append("materialCode", getMaterialCode())
            .append("customerDrawingNumber", getCustomerDrawingNumber())
            .append("organizeNumber", getOrganizeNumber())
            .append("productionBase", getProductionBase())
            .append("classification", getClassification())
            .append("produceYear", getProduceYear())
            .append("produceMonth", getProduceMonth())
            .append("productionQuantity", getProductionQuantity())
            .append("customer", getCustomer())
            .append("singleWeldSeam", getSingleWeldSeam())
            .append("totalWeldSeam", getTotalWeldSeam())
            .append("thisFeedbackDay", getThisFeedbackDay())
            .append("materialsRequirementDay", getMaterialsRequirementDay())
            .append("saleOrderNo", getSaleOrderNo())
            .append("saleOrderLine", getSaleOrderLine())
            .append("mainWorkOrderNo", getMainWorkOrderNo())
            .append("superiorWorkOrderNo", getSuperiorWorkOrderNo())
            .append("workOrderNo", getWorkOrderNo())
            .append("plant", getPlant())
            .toString();
    }

    public String getClassificationTxt() {
        return classificationTxt;
    }

    public void setClassificationTxt(String classificationTxt) {
        this.classificationTxt = classificationTxt;
    }

    public String getWorkOrderTypeTxt() {
        return workOrderTypeTxt;
    }

    public void setWorkOrderTypeTxt(String workOrderTypeTxt) {
        this.workOrderTypeTxt = workOrderTypeTxt;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,376 @@
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_weld_seam_temp
 * 
 * @author wwj
 * @date 2025-04-09
 */
public class ApsWeldSeamTemp extends BaseEntity
{
    private static final long serialVersionUID = 1L;

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

    /** å·¥å•ç±»åž‹ */
//    @Excel(name = "工单类型")
    private String workOrderType;
    @Excel(name = "工单类型")
    private String workOrderTypeTxt;

    /** ç‰©æ–™ç¼–码 */
    @Excel(name = "物料编码")
    private String materialCode;

    /** å®¢æˆ·å›¾å· */
    @Excel(name = "客户图号")
    private String customerDrawingNumber;

    /** ç»„织账号 */
    @Excel(name = "组织账号")
    private String organizeNumber;

    /** ç”Ÿäº§åŸºåœ° */
    @Excel(name = "生产基地")
    private String productionBase;

    /** åˆ†ç±»(气柜/管路) */
//    @Excel(name = "分类(气柜/管路)")
    private String classification;
    @Excel(name = "分类")
    private String classificationTxt;

    /** ç”Ÿäº§å¹´ä»½ */
    @Excel(name = "生产年份")
    private Long produceYear;

    /** ç”Ÿäº§æœˆä»½ */
    @Excel(name = "生产月份")
    private Long produceMonth;

    /** ç”Ÿæˆæ•°é‡ */
    @Excel(name = "生产数量")
    private Long productionQuantity;

    /** å®¢æˆ· */
    @Excel(name = "客户")
    private String customer;

    /** å•ä»¶ç„Šç¼ */
    @Excel(name = "单件焊缝")
    private Long singleWeldSeam;

    /** æ€»ç„Šç¼ */
    @Excel(name = "总焊缝")
    private Long totalWeldSeam;

    /** æœ¬æ¬¡åé¦ˆæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "本次反馈日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date thisFeedbackDay;

    /** ç‰©æ–™éœ€æ±‚日期 */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "物料需求日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date materialsRequirementDay;

    /** é”€å”®è®¢å•å· */
    @Excel(name = "销售订单号")
    private String saleOrderNo;

    /** é”€å”®è®¢å•è¡Œ */
    @Excel(name = "销售订单行")
    private Long saleOrderLine;

    /** ä¸»å·¥å•å· */
    @Excel(name = "主工单号")
    private String mainWorkOrderNo;

    /** ä¸Šçº§å·¥å•å· */
    @Excel(name = "上级工单号")
    private String superiorWorkOrderNo;

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

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

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

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

    public String getId() 
    {
        return id;
    }

    public void setWorkOrderType(String workOrderType) 
    {
        this.workOrderType = workOrderType;
    }

    public String getWorkOrderType() 
    {
        return workOrderType;
    }

    public void setMaterialCode(String materialCode) 
    {
        this.materialCode = materialCode;
    }

    public String getMaterialCode() 
    {
        return materialCode;
    }

    public void setCustomerDrawingNumber(String customerDrawingNumber) 
    {
        this.customerDrawingNumber = customerDrawingNumber;
    }

    public String getCustomerDrawingNumber() 
    {
        return customerDrawingNumber;
    }

    public void setOrganizeNumber(String organizeNumber) 
    {
        this.organizeNumber = organizeNumber;
    }

    public String getOrganizeNumber() 
    {
        return organizeNumber;
    }

    public void setProductionBase(String productionBase) 
    {
        this.productionBase = productionBase;
    }

    public String getProductionBase() 
    {
        return productionBase;
    }

    public void setClassification(String classification) 
    {
        this.classification = classification;
    }

    public String getClassification() 
    {
        return classification;
    }

    public void setProduceYear(Long produceYear) 
    {
        this.produceYear = produceYear;
    }

    public Long getProduceYear() 
    {
        return produceYear;
    }

    public void setProduceMonth(Long produceMonth) 
    {
        this.produceMonth = produceMonth;
    }

    public Long getProduceMonth() 
    {
        return produceMonth;
    }

    public void setProductionQuantity(Long productionQuantity) 
    {
        this.productionQuantity = productionQuantity;
    }

    public Long getProductionQuantity() 
    {
        return productionQuantity;
    }

    public void setCustomer(String customer) 
    {
        this.customer = customer;
    }

    public String getCustomer() 
    {
        return customer;
    }

    public void setSingleWeldSeam(Long singleWeldSeam) 
    {
        this.singleWeldSeam = singleWeldSeam;
    }

    public Long getSingleWeldSeam() 
    {
        return singleWeldSeam;
    }

    public void setTotalWeldSeam(Long totalWeldSeam) 
    {
        this.totalWeldSeam = totalWeldSeam;
    }

    public Long getTotalWeldSeam() 
    {
        return totalWeldSeam;
    }

    public void setThisFeedbackDay(Date thisFeedbackDay) 
    {
        this.thisFeedbackDay = thisFeedbackDay;
    }

    public Date getThisFeedbackDay() 
    {
        return thisFeedbackDay;
    }

    public void setMaterialsRequirementDay(Date materialsRequirementDay) 
    {
        this.materialsRequirementDay = materialsRequirementDay;
    }

    public Date getMaterialsRequirementDay() 
    {
        return materialsRequirementDay;
    }

    public void setSaleOrderNo(String saleOrderNo) 
    {
        this.saleOrderNo = saleOrderNo;
    }

    public String getSaleOrderNo() 
    {
        return saleOrderNo;
    }

    public void setSaleOrderLine(Long saleOrderLine) 
    {
        this.saleOrderLine = saleOrderLine;
    }

    public Long getSaleOrderLine() 
    {
        return saleOrderLine;
    }

    public void setMainWorkOrderNo(String mainWorkOrderNo) 
    {
        this.mainWorkOrderNo = mainWorkOrderNo;
    }

    public String getMainWorkOrderNo() 
    {
        return mainWorkOrderNo;
    }

    public void setSuperiorWorkOrderNo(String superiorWorkOrderNo) 
    {
        this.superiorWorkOrderNo = superiorWorkOrderNo;
    }

    public String getSuperiorWorkOrderNo() 
    {
        return superiorWorkOrderNo;
    }

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

    public String getWorkOrderNo() 
    {
        return workOrderNo;
    }

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

    public String getPlant() 
    {
        return plant;
    }

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

    public String getBatchNumber() 
    {
        return batchNumber;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("workOrderType", getWorkOrderType())
            .append("materialCode", getMaterialCode())
            .append("customerDrawingNumber", getCustomerDrawingNumber())
            .append("organizeNumber", getOrganizeNumber())
            .append("productionBase", getProductionBase())
            .append("classification", getClassification())
            .append("produceYear", getProduceYear())
            .append("produceMonth", getProduceMonth())
            .append("productionQuantity", getProductionQuantity())
            .append("customer", getCustomer())
            .append("singleWeldSeam", getSingleWeldSeam())
            .append("totalWeldSeam", getTotalWeldSeam())
            .append("thisFeedbackDay", getThisFeedbackDay())
            .append("materialsRequirementDay", getMaterialsRequirementDay())
            .append("saleOrderNo", getSaleOrderNo())
            .append("saleOrderLine", getSaleOrderLine())
            .append("mainWorkOrderNo", getMainWorkOrderNo())
            .append("superiorWorkOrderNo", getSuperiorWorkOrderNo())
            .append("workOrderNo", getWorkOrderNo())
            .append("plant", getPlant())
            .append("batchNumber", getBatchNumber())
            .toString();
    }

    public String getWorkOrderTypeTxt() {
        return workOrderTypeTxt;
    }

    public void setWorkOrderTypeTxt(String workOrderTypeTxt) {
        this.workOrderTypeTxt = workOrderTypeTxt;
    }

    public String getClassificationTxt() {
        return classificationTxt;
    }

    public void setClassificationTxt(String classificationTxt) {
        this.classificationTxt = classificationTxt;
    }
}

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

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

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

/**
 * ç„Šç¼Mapper接口
 * 
 * @author wwj
 * @date 2025-04-09
 */
@Mapper
public interface ApsWeldSeamMapper 
{
    /**
     * æŸ¥è¯¢ç„Šç¼
     * 
     * @param id ç„Šç¼ä¸»é”®
     * @return ç„Šç¼
     */
    public ApsWeldSeam selectApsWeldSeamById(String id);

    /**
     * æŸ¥è¯¢ç„Šç¼åˆ—表
     * 
     * @param apsWeldSeam ç„Šç¼
     * @return ç„Šç¼é›†åˆ
     */
    public List<ApsWeldSeam> selectApsWeldSeamList(ApsWeldSeam apsWeldSeam);

    /**
     * æ–°å¢žç„Šç¼
     * 
     * @param apsWeldSeam ç„Šç¼
     * @return ç»“æžœ
     */
    public int insertApsWeldSeam(ApsWeldSeam apsWeldSeam);

    /**
     * ä¿®æ”¹ç„Šç¼
     * 
     * @param apsWeldSeam ç„Šç¼
     * @return ç»“æžœ
     */
    public int updateApsWeldSeam(ApsWeldSeam apsWeldSeam);

    /**
     * åˆ é™¤ç„Šç¼
     * 
     * @param id ç„Šç¼ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsWeldSeamById(String id);

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

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

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

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

/**
 * ç„Šç¼-临时Mapper接口
 * 
 * @author wwj
 * @date 2025-04-09
 */
@Mapper
public interface ApsWeldSeamTempMapper 
{
    /**
     * æŸ¥è¯¢ç„Šç¼-临时
     * 
     * @param id ç„Šç¼-临时主键
     * @return ç„Šç¼-临时
     */
    public ApsWeldSeamTemp selectApsWeldSeamTempById(String id);

    /**
     * æŸ¥è¯¢ç„Šç¼-临时列表
     * 
     * @param apsWeldSeamTemp ç„Šç¼-临时
     * @return ç„Šç¼-临时集合
     */
    public List<ApsWeldSeamTemp> selectApsWeldSeamTempList(ApsWeldSeamTemp apsWeldSeamTemp);

    /**
     * æ–°å¢žç„Šç¼-临时
     * 
     * @param apsWeldSeamTemp ç„Šç¼-临时
     * @return ç»“æžœ
     */
    public int insertApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp);

    /**
     * ä¿®æ”¹ç„Šç¼-临时
     * 
     * @param apsWeldSeamTemp ç„Šç¼-临时
     * @return ç»“æžœ
     */
    public int updateApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp);

    /**
     * åˆ é™¤ç„Šç¼-临时
     * 
     * @param id ç„Šç¼-临时主键
     * @return ç»“æžœ
     */
    public int deleteApsWeldSeamTempById(String id);

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

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

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

import java.util.List;
import com.aps.core.domain.ApsWeldSeam;
import com.aps.core.domain.ApsWeldSeamTemp;

/**
 * ç„Šç¼Service接口
 * 
 * @author wwj
 * @date 2025-04-09
 */
public interface IApsWeldSeamService 
{
    /**
     * æŸ¥è¯¢ç„Šç¼
     * 
     * @param id ç„Šç¼ä¸»é”®
     * @return ç„Šç¼
     */
    public ApsWeldSeam selectApsWeldSeamById(String id);

    /**
     * æŸ¥è¯¢ç„Šç¼åˆ—表
     * 
     * @param apsWeldSeam ç„Šç¼
     * @return ç„Šç¼é›†åˆ
     */
    public List<ApsWeldSeam> selectApsWeldSeamList(ApsWeldSeam apsWeldSeam);

    /**
     * æ–°å¢žç„Šç¼
     * 
     * @param apsWeldSeam ç„Šç¼
     * @return ç»“æžœ
     */
    public int insertApsWeldSeam(ApsWeldSeam apsWeldSeam);

    /**
     * ä¿®æ”¹ç„Šç¼
     * 
     * @param apsWeldSeam ç„Šç¼
     * @return ç»“æžœ
     */
    public int updateApsWeldSeam(ApsWeldSeam apsWeldSeam);

    /**
     * æ‰¹é‡åˆ é™¤ç„Šç¼
     * 
     * @param ids éœ€è¦åˆ é™¤çš„焊缝主键集合
     * @return ç»“æžœ
     */
    public int deleteApsWeldSeamByIds(String[] ids);

    /**
     * åˆ é™¤ç„Šç¼ä¿¡æ¯
     * 
     * @param id ç„Šç¼ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsWeldSeamById(String id);

    int confirmWeldSeam(ApsWeldSeamTemp apsWeldSeamTemp);
}

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

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

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

/**
 * ç„Šç¼-临时Service接口
 * 
 * @author wwj
 * @date 2025-04-09
 */
public interface IApsWeldSeamTempService 
{
    /**
     * æŸ¥è¯¢ç„Šç¼-临时
     * 
     * @param id ç„Šç¼-临时主键
     * @return ç„Šç¼-临时
     */
    public ApsWeldSeamTemp selectApsWeldSeamTempById(String id);

    /**
     * æŸ¥è¯¢ç„Šç¼-临时列表
     * 
     * @param apsWeldSeamTemp ç„Šç¼-临时
     * @return ç„Šç¼-临时集合
     */
    public List<ApsWeldSeamTemp> selectApsWeldSeamTempList(ApsWeldSeamTemp apsWeldSeamTemp);

    /**
     * æ–°å¢žç„Šç¼-临时
     * 
     * @param apsWeldSeamTemp ç„Šç¼-临时
     * @return ç»“æžœ
     */
    public int insertApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp);

    /**
     * ä¿®æ”¹ç„Šç¼-临时
     * 
     * @param apsWeldSeamTemp ç„Šç¼-临时
     * @return ç»“æžœ
     */
    public int updateApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp);

    /**
     * æ‰¹é‡åˆ é™¤ç„Šç¼-临时
     * 
     * @param ids éœ€è¦åˆ é™¤çš„焊缝-临时主键集合
     * @return ç»“æžœ
     */
    public int deleteApsWeldSeamTempByIds(String[] ids);

    /**
     * åˆ é™¤ç„Šç¼-临时信息
     * 
     * @param id ç„Šç¼-临时主键
     * @return ç»“æžœ
     */
    public int deleteApsWeldSeamTempById(String id);
}

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

@@ -122,6 +122,6 @@
        if (count==apsGasPipingPlanTemps.size()) {
            apsGasPipingPlanTempMapper.deleteApsGasPipingPlanTempByIds(ids);
        }
        return 0;
        return 1;
    }
}

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

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

import java.util.List;

import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsPartPlan;
import com.aps.core.domain.ApsPartPlanTemp;
import com.aps.core.domain.ApsWeldSeamTemp;
import com.aps.core.mapper.ApsWeldSeamTempMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsWeldSeamMapper;
import com.aps.core.domain.ApsWeldSeam;
import com.aps.core.service.IApsWeldSeamService;

/**
 * ç„Šç¼Service业务层处理
 * 
 * @author wwj
 * @date 2025-04-09
 */
@Service
public class ApsWeldSeamServiceImpl implements IApsWeldSeamService 
{
    @Autowired
    private ApsWeldSeamMapper apsWeldSeamMapper;
    @Autowired
    private ApsWeldSeamTempMapper apsWeldSeamTempMapper;

    /**
     * æŸ¥è¯¢ç„Šç¼
     * 
     * @param id ç„Šç¼ä¸»é”®
     * @return ç„Šç¼
     */
    @Override
    public ApsWeldSeam selectApsWeldSeamById(String id)
    {
        return apsWeldSeamMapper.selectApsWeldSeamById(id);
    }

    /**
     * æŸ¥è¯¢ç„Šç¼åˆ—表
     * 
     * @param apsWeldSeam ç„Šç¼
     * @return ç„Šç¼
     */
    @Override
    public List<ApsWeldSeam> selectApsWeldSeamList(ApsWeldSeam apsWeldSeam)
    {
        return apsWeldSeamMapper.selectApsWeldSeamList(apsWeldSeam);
    }

    /**
     * æ–°å¢žç„Šç¼
     * 
     * @param apsWeldSeam ç„Šç¼
     * @return ç»“æžœ
     */
    @Override
    public int insertApsWeldSeam(ApsWeldSeam apsWeldSeam)
    {
        apsWeldSeam.setId(IdUtils.fastUUID());
        return apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
    }

    /**
     * ä¿®æ”¹ç„Šç¼
     * 
     * @param apsWeldSeam ç„Šç¼
     * @return ç»“æžœ
     */
    @Override
    public int updateApsWeldSeam(ApsWeldSeam apsWeldSeam)
    {
        return apsWeldSeamMapper.updateApsWeldSeam(apsWeldSeam);
    }

    /**
     * æ‰¹é‡åˆ é™¤ç„Šç¼
     * 
     * @param ids éœ€è¦åˆ é™¤çš„焊缝主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsWeldSeamByIds(String[] ids)
    {
        return apsWeldSeamMapper.deleteApsWeldSeamByIds(ids);
    }

    /**
     * åˆ é™¤ç„Šç¼ä¿¡æ¯
     * 
     * @param id ç„Šç¼ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsWeldSeamById(String id)
    {
        return apsWeldSeamMapper.deleteApsWeldSeamById(id);
    }

    @Override
    public int confirmWeldSeam(ApsWeldSeamTemp apsWeldSeamTemp) {
        //查询临时表数据
        List<ApsWeldSeamTemp> apsWeldSeamTemps=apsWeldSeamTempMapper.selectApsWeldSeamTempList(apsWeldSeamTemp);
        int count=0;
        String[] ids=new String[apsWeldSeamTemps.size()];
        for (int i = 0; i <apsWeldSeamTemps.size() ; i++) {
            //记录临时表id
            ids[i]=apsWeldSeamTemps.get(i).getId();
            ApsWeldSeam apsWeldSeam=new ApsWeldSeam();
            BeanUtils.copyProperties(apsWeldSeamTemps.get(i), apsWeldSeam);
            apsWeldSeam.setId(IdUtils.fastUUID());
            //插入正式表，并记录
            apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
            count++;
        }
        //插入数量与临时表查询一直则删除临时表数据
        if (count==apsWeldSeamTemps.size()) {
            apsWeldSeamTempMapper.deleteApsWeldSeamTempByIds(ids);
        }
        return 1;
    }
}

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

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

import java.util.List;

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.ApsWeldSeamTempMapper;
import com.aps.core.domain.ApsWeldSeamTemp;
import com.aps.core.service.IApsWeldSeamTempService;

/**
 * ç„Šç¼-临时Service业务层处理
 * 
 * @author wwj
 * @date 2025-04-09
 */
@Service
public class ApsWeldSeamTempServiceImpl implements IApsWeldSeamTempService 
{
    @Autowired
    private ApsWeldSeamTempMapper apsWeldSeamTempMapper;

    /**
     * æŸ¥è¯¢ç„Šç¼-临时
     * 
     * @param id ç„Šç¼-临时主键
     * @return ç„Šç¼-临时
     */
    @Override
    public ApsWeldSeamTemp selectApsWeldSeamTempById(String id)
    {
        return apsWeldSeamTempMapper.selectApsWeldSeamTempById(id);
    }

    /**
     * æŸ¥è¯¢ç„Šç¼-临时列表
     * 
     * @param apsWeldSeamTemp ç„Šç¼-临时
     * @return ç„Šç¼-临时
     */
    @Override
    public List<ApsWeldSeamTemp> selectApsWeldSeamTempList(ApsWeldSeamTemp apsWeldSeamTemp)
    {
        return apsWeldSeamTempMapper.selectApsWeldSeamTempList(apsWeldSeamTemp);
    }

    /**
     * æ–°å¢žç„Šç¼-临时
     * 
     * @param apsWeldSeamTemp ç„Šç¼-临时
     * @return ç»“æžœ
     */
    @Override
    public int insertApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp)
    {
        apsWeldSeamTemp.setId(IdUtils.fastUUID());
        return apsWeldSeamTempMapper.insertApsWeldSeamTemp(apsWeldSeamTemp);
    }

    /**
     * ä¿®æ”¹ç„Šç¼-临时
     * 
     * @param apsWeldSeamTemp ç„Šç¼-临时
     * @return ç»“æžœ
     */
    @Override
    public int updateApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp)
    {
        return apsWeldSeamTempMapper.updateApsWeldSeamTemp(apsWeldSeamTemp);
    }

    /**
     * æ‰¹é‡åˆ é™¤ç„Šç¼-临时
     * 
     * @param ids éœ€è¦åˆ é™¤çš„焊缝-临时主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsWeldSeamTempByIds(String[] ids)
    {
        return apsWeldSeamTempMapper.deleteApsWeldSeamTempByIds(ids);
    }

    /**
     * åˆ é™¤ç„Šç¼-临时信息
     * 
     * @param id ç„Šç¼-临时主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsWeldSeamTempById(String id)
    {
        return apsWeldSeamTempMapper.deleteApsWeldSeamTempById(id);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,153 @@
<?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.ApsWeldSeamMapper">
    
    <resultMap type="ApsWeldSeam" id="ApsWeldSeamResult">
        <result property="id"    column="id"    />
        <result property="workOrderType"    column="work_order_type"    />
        <result property="materialCode"    column="material_code"    />
        <result property="customerDrawingNumber"    column="customer_drawing_number"    />
        <result property="organizeNumber"    column="organize_number"    />
        <result property="productionBase"    column="production_base"    />
        <result property="classification"    column="classification"    />
        <result property="produceYear"    column="produce_year"    />
        <result property="produceMonth"    column="produce_month"    />
        <result property="productionQuantity"    column="production_quantity"    />
        <result property="customer"    column="customer"    />
        <result property="singleWeldSeam"    column="single_weld_seam"    />
        <result property="totalWeldSeam"    column="total_weld_seam"    />
        <result property="thisFeedbackDay"    column="this_feedback_day"    />
        <result property="materialsRequirementDay"    column="materials_requirement_day"    />
        <result property="saleOrderNo"    column="sale_order_no"    />
        <result property="saleOrderLine"    column="sale_order_line"    />
        <result property="mainWorkOrderNo"    column="main_work_order_no"    />
        <result property="superiorWorkOrderNo"    column="superior_work_order_no"    />
        <result property="workOrderNo"    column="work_order_no"    />
        <result property="plant"    column="plant"    />
    </resultMap>

    <sql id="selectApsWeldSeamVo">
        select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant from aps_weld_seam
    </sql>

    <select id="selectApsWeldSeamList" parameterType="ApsWeldSeam" resultMap="ApsWeldSeamResult">
        <include refid="selectApsWeldSeamVo"/>
        <where>  
            <if test="workOrderType != null  and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
            <if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
            <if test="customerDrawingNumber != null  and customerDrawingNumber != ''"> and customer_drawing_number = #{customerDrawingNumber}</if>
            <if test="organizeNumber != null  and organizeNumber != ''"> and organize_number = #{organizeNumber}</if>
            <if test="productionBase != null  and productionBase != ''"> and production_base = #{productionBase}</if>
            <if test="classification != null  and classification != ''"> and classification = #{classification}</if>
            <if test="produceYear != null "> and produce_year = #{produceYear}</if>
            <if test="produceMonth != null "> and produce_month = #{produceMonth}</if>
            <if test="productionQuantity != null "> and production_quantity = #{productionQuantity}</if>
            <if test="customer != null  and customer != ''"> and customer = #{customer}</if>
            <if test="singleWeldSeam != null "> and single_weld_seam = #{singleWeldSeam}</if>
            <if test="totalWeldSeam != null "> and total_weld_seam = #{totalWeldSeam}</if>
            <if test="params.beginThisFeedbackDay != null and params.beginThisFeedbackDay != '' and params.endThisFeedbackDay != null and params.endThisFeedbackDay != ''"> and this_feedback_day between #{params.beginThisFeedbackDay} and #{params.endThisFeedbackDay}</if>
            <if test="params.beginMaterialsRequirementDay != null and params.beginMaterialsRequirementDay != '' and params.endMaterialsRequirementDay != null and params.endMaterialsRequirementDay != ''"> and materials_requirement_day between #{params.beginMaterialsRequirementDay} and #{params.endMaterialsRequirementDay}</if>
            <if test="saleOrderNo != null  and saleOrderNo != ''"> and sale_order_no = #{saleOrderNo}</if>
            <if test="saleOrderLine != null "> and sale_order_line = #{saleOrderLine}</if>
            <if test="mainWorkOrderNo != null  and mainWorkOrderNo != ''"> and main_work_order_no = #{mainWorkOrderNo}</if>
            <if test="superiorWorkOrderNo != null  and superiorWorkOrderNo != ''"> and superior_work_order_no = #{superiorWorkOrderNo}</if>
            <if test="workOrderNo != null  and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
            <if test="plant != null  and plant != ''"> and plant = #{plant}</if>
        </where>
    </select>
    
    <select id="selectApsWeldSeamById" parameterType="String" resultMap="ApsWeldSeamResult">
        <include refid="selectApsWeldSeamVo"/>
        where id = #{id}
    </select>

    <insert id="insertApsWeldSeam" parameterType="ApsWeldSeam">
        insert into aps_weld_seam
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="workOrderType != null">work_order_type,</if>
            <if test="materialCode != null">material_code,</if>
            <if test="customerDrawingNumber != null">customer_drawing_number,</if>
            <if test="organizeNumber != null">organize_number,</if>
            <if test="productionBase != null">production_base,</if>
            <if test="classification != null">classification,</if>
            <if test="produceYear != null">produce_year,</if>
            <if test="produceMonth != null">produce_month,</if>
            <if test="productionQuantity != null">production_quantity,</if>
            <if test="customer != null">customer,</if>
            <if test="singleWeldSeam != null">single_weld_seam,</if>
            <if test="totalWeldSeam != null">total_weld_seam,</if>
            <if test="thisFeedbackDay != null">this_feedback_day,</if>
            <if test="materialsRequirementDay != null">materials_requirement_day,</if>
            <if test="saleOrderNo != null">sale_order_no,</if>
            <if test="saleOrderLine != null">sale_order_line,</if>
            <if test="mainWorkOrderNo != null">main_work_order_no,</if>
            <if test="superiorWorkOrderNo != null">superior_work_order_no,</if>
            <if test="workOrderNo != null">work_order_no,</if>
            <if test="plant != null">plant,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="workOrderType != null">#{workOrderType},</if>
            <if test="materialCode != null">#{materialCode},</if>
            <if test="customerDrawingNumber != null">#{customerDrawingNumber},</if>
            <if test="organizeNumber != null">#{organizeNumber},</if>
            <if test="productionBase != null">#{productionBase},</if>
            <if test="classification != null">#{classification},</if>
            <if test="produceYear != null">#{produceYear},</if>
            <if test="produceMonth != null">#{produceMonth},</if>
            <if test="productionQuantity != null">#{productionQuantity},</if>
            <if test="customer != null">#{customer},</if>
            <if test="singleWeldSeam != null">#{singleWeldSeam},</if>
            <if test="totalWeldSeam != null">#{totalWeldSeam},</if>
            <if test="thisFeedbackDay != null">#{thisFeedbackDay},</if>
            <if test="materialsRequirementDay != null">#{materialsRequirementDay},</if>
            <if test="saleOrderNo != null">#{saleOrderNo},</if>
            <if test="saleOrderLine != null">#{saleOrderLine},</if>
            <if test="mainWorkOrderNo != null">#{mainWorkOrderNo},</if>
            <if test="superiorWorkOrderNo != null">#{superiorWorkOrderNo},</if>
            <if test="workOrderNo != null">#{workOrderNo},</if>
            <if test="plant != null">#{plant},</if>
         </trim>
    </insert>

    <update id="updateApsWeldSeam" parameterType="ApsWeldSeam">
        update aps_weld_seam
        <trim prefix="SET" suffixOverrides=",">
            <if test="workOrderType != null">work_order_type = #{workOrderType},</if>
            <if test="materialCode != null">material_code = #{materialCode},</if>
            <if test="customerDrawingNumber != null">customer_drawing_number = #{customerDrawingNumber},</if>
            <if test="organizeNumber != null">organize_number = #{organizeNumber},</if>
            <if test="productionBase != null">production_base = #{productionBase},</if>
            <if test="classification != null">classification = #{classification},</if>
            <if test="produceYear != null">produce_year = #{produceYear},</if>
            <if test="produceMonth != null">produce_month = #{produceMonth},</if>
            <if test="productionQuantity != null">production_quantity = #{productionQuantity},</if>
            <if test="customer != null">customer = #{customer},</if>
            <if test="singleWeldSeam != null">single_weld_seam = #{singleWeldSeam},</if>
            <if test="totalWeldSeam != null">total_weld_seam = #{totalWeldSeam},</if>
            <if test="thisFeedbackDay != null">this_feedback_day = #{thisFeedbackDay},</if>
            <if test="materialsRequirementDay != null">materials_requirement_day = #{materialsRequirementDay},</if>
            <if test="saleOrderNo != null">sale_order_no = #{saleOrderNo},</if>
            <if test="saleOrderLine != null">sale_order_line = #{saleOrderLine},</if>
            <if test="mainWorkOrderNo != null">main_work_order_no = #{mainWorkOrderNo},</if>
            <if test="superiorWorkOrderNo != null">superior_work_order_no = #{superiorWorkOrderNo},</if>
            <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
            <if test="plant != null">plant = #{plant},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteApsWeldSeamById" parameterType="String">
        delete from aps_weld_seam where id = #{id}
    </delete>

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

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,158 @@
<?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.ApsWeldSeamTempMapper">
    
    <resultMap type="ApsWeldSeamTemp" id="ApsWeldSeamTempResult">
        <result property="id"    column="id"    />
        <result property="workOrderType"    column="work_order_type"    />
        <result property="materialCode"    column="material_code"    />
        <result property="customerDrawingNumber"    column="customer_drawing_number"    />
        <result property="organizeNumber"    column="organize_number"    />
        <result property="productionBase"    column="production_base"    />
        <result property="classification"    column="classification"    />
        <result property="produceYear"    column="produce_year"    />
        <result property="produceMonth"    column="produce_month"    />
        <result property="productionQuantity"    column="production_quantity"    />
        <result property="customer"    column="customer"    />
        <result property="singleWeldSeam"    column="single_weld_seam"    />
        <result property="totalWeldSeam"    column="total_weld_seam"    />
        <result property="thisFeedbackDay"    column="this_feedback_day"    />
        <result property="materialsRequirementDay"    column="materials_requirement_day"    />
        <result property="saleOrderNo"    column="sale_order_no"    />
        <result property="saleOrderLine"    column="sale_order_line"    />
        <result property="mainWorkOrderNo"    column="main_work_order_no"    />
        <result property="superiorWorkOrderNo"    column="superior_work_order_no"    />
        <result property="workOrderNo"    column="work_order_no"    />
        <result property="plant"    column="plant"    />
        <result property="batchNumber"    column="batch_number"    />
    </resultMap>

    <sql id="selectApsWeldSeamTempVo">
        select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant, batch_number from aps_weld_seam_temp
    </sql>

    <select id="selectApsWeldSeamTempList" parameterType="ApsWeldSeamTemp" resultMap="ApsWeldSeamTempResult">
        <include refid="selectApsWeldSeamTempVo"/>
        <where>  
            <if test="workOrderType != null  and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
            <if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
            <if test="customerDrawingNumber != null  and customerDrawingNumber != ''"> and customer_drawing_number = #{customerDrawingNumber}</if>
            <if test="organizeNumber != null  and organizeNumber != ''"> and organize_number = #{organizeNumber}</if>
            <if test="productionBase != null  and productionBase != ''"> and production_base = #{productionBase}</if>
            <if test="classification != null  and classification != ''"> and classification = #{classification}</if>
            <if test="produceYear != null "> and produce_year = #{produceYear}</if>
            <if test="produceMonth != null "> and produce_month = #{produceMonth}</if>
            <if test="productionQuantity != null "> and production_quantity = #{productionQuantity}</if>
            <if test="customer != null  and customer != ''"> and customer = #{customer}</if>
            <if test="singleWeldSeam != null "> and single_weld_seam = #{singleWeldSeam}</if>
            <if test="totalWeldSeam != null "> and total_weld_seam = #{totalWeldSeam}</if>
            <if test="params.beginThisFeedbackDay != null and params.beginThisFeedbackDay != '' and params.endThisFeedbackDay != null and params.endThisFeedbackDay != ''"> and this_feedback_day between #{params.beginThisFeedbackDay} and #{params.endThisFeedbackDay}</if>
            <if test="params.beginMaterialsRequirementDay != null and params.beginMaterialsRequirementDay != '' and params.endMaterialsRequirementDay != null and params.endMaterialsRequirementDay != ''"> and materials_requirement_day between #{params.beginMaterialsRequirementDay} and #{params.endMaterialsRequirementDay}</if>
            <if test="saleOrderNo != null  and saleOrderNo != ''"> and sale_order_no = #{saleOrderNo}</if>
            <if test="saleOrderLine != null "> and sale_order_line = #{saleOrderLine}</if>
            <if test="mainWorkOrderNo != null  and mainWorkOrderNo != ''"> and main_work_order_no = #{mainWorkOrderNo}</if>
            <if test="superiorWorkOrderNo != null  and superiorWorkOrderNo != ''"> and superior_work_order_no = #{superiorWorkOrderNo}</if>
            <if test="workOrderNo != null  and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
            <if test="plant != null  and plant != ''"> and plant = #{plant}</if>
            <if test="batchNumber != null  and batchNumber != ''"> and batch_number = #{batchNumber}</if>
        </where>
    </select>
    
    <select id="selectApsWeldSeamTempById" parameterType="String" resultMap="ApsWeldSeamTempResult">
        <include refid="selectApsWeldSeamTempVo"/>
        where id = #{id}
    </select>

    <insert id="insertApsWeldSeamTemp" parameterType="ApsWeldSeamTemp">
        insert into aps_weld_seam_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="workOrderType != null">work_order_type,</if>
            <if test="materialCode != null">material_code,</if>
            <if test="customerDrawingNumber != null">customer_drawing_number,</if>
            <if test="organizeNumber != null">organize_number,</if>
            <if test="productionBase != null">production_base,</if>
            <if test="classification != null">classification,</if>
            <if test="produceYear != null">produce_year,</if>
            <if test="produceMonth != null">produce_month,</if>
            <if test="productionQuantity != null">production_quantity,</if>
            <if test="customer != null">customer,</if>
            <if test="singleWeldSeam != null">single_weld_seam,</if>
            <if test="totalWeldSeam != null">total_weld_seam,</if>
            <if test="thisFeedbackDay != null">this_feedback_day,</if>
            <if test="materialsRequirementDay != null">materials_requirement_day,</if>
            <if test="saleOrderNo != null">sale_order_no,</if>
            <if test="saleOrderLine != null">sale_order_line,</if>
            <if test="mainWorkOrderNo != null">main_work_order_no,</if>
            <if test="superiorWorkOrderNo != null">superior_work_order_no,</if>
            <if test="workOrderNo != null">work_order_no,</if>
            <if test="plant != null">plant,</if>
            <if test="batchNumber != null">batch_number,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="workOrderType != null">#{workOrderType},</if>
            <if test="materialCode != null">#{materialCode},</if>
            <if test="customerDrawingNumber != null">#{customerDrawingNumber},</if>
            <if test="organizeNumber != null">#{organizeNumber},</if>
            <if test="productionBase != null">#{productionBase},</if>
            <if test="classification != null">#{classification},</if>
            <if test="produceYear != null">#{produceYear},</if>
            <if test="produceMonth != null">#{produceMonth},</if>
            <if test="productionQuantity != null">#{productionQuantity},</if>
            <if test="customer != null">#{customer},</if>
            <if test="singleWeldSeam != null">#{singleWeldSeam},</if>
            <if test="totalWeldSeam != null">#{totalWeldSeam},</if>
            <if test="thisFeedbackDay != null">#{thisFeedbackDay},</if>
            <if test="materialsRequirementDay != null">#{materialsRequirementDay},</if>
            <if test="saleOrderNo != null">#{saleOrderNo},</if>
            <if test="saleOrderLine != null">#{saleOrderLine},</if>
            <if test="mainWorkOrderNo != null">#{mainWorkOrderNo},</if>
            <if test="superiorWorkOrderNo != null">#{superiorWorkOrderNo},</if>
            <if test="workOrderNo != null">#{workOrderNo},</if>
            <if test="plant != null">#{plant},</if>
            <if test="batchNumber != null">#{batchNumber},</if>
         </trim>
    </insert>

    <update id="updateApsWeldSeamTemp" parameterType="ApsWeldSeamTemp">
        update aps_weld_seam_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="workOrderType != null">work_order_type = #{workOrderType},</if>
            <if test="materialCode != null">material_code = #{materialCode},</if>
            <if test="customerDrawingNumber != null">customer_drawing_number = #{customerDrawingNumber},</if>
            <if test="organizeNumber != null">organize_number = #{organizeNumber},</if>
            <if test="productionBase != null">production_base = #{productionBase},</if>
            <if test="classification != null">classification = #{classification},</if>
            <if test="produceYear != null">produce_year = #{produceYear},</if>
            <if test="produceMonth != null">produce_month = #{produceMonth},</if>
            <if test="productionQuantity != null">production_quantity = #{productionQuantity},</if>
            <if test="customer != null">customer = #{customer},</if>
            <if test="singleWeldSeam != null">single_weld_seam = #{singleWeldSeam},</if>
            <if test="totalWeldSeam != null">total_weld_seam = #{totalWeldSeam},</if>
            <if test="thisFeedbackDay != null">this_feedback_day = #{thisFeedbackDay},</if>
            <if test="materialsRequirementDay != null">materials_requirement_day = #{materialsRequirementDay},</if>
            <if test="saleOrderNo != null">sale_order_no = #{saleOrderNo},</if>
            <if test="saleOrderLine != null">sale_order_line = #{saleOrderLine},</if>
            <if test="mainWorkOrderNo != null">main_work_order_no = #{mainWorkOrderNo},</if>
            <if test="superiorWorkOrderNo != null">superior_work_order_no = #{superiorWorkOrderNo},</if>
            <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
            <if test="plant != null">plant = #{plant},</if>
            <if test="batchNumber != null">batch_number = #{batchNumber},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteApsWeldSeamTempById" parameterType="String">
        delete from aps_weld_seam_temp where id = #{id}
    </delete>

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

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

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