Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

sfd

2025-05-21 e3bd647305c6f4e1c8c901741932deda10a8db34

Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

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

@@ -49,6 +49,10 @@
    /** ç„ŠæŽ¥å½¢å¼(hup\lod) */
    @Excel(name = "焊接形式")
    private String type;
    
    /** é€‚用工厂 */
    @Excel(name = "适用工厂")
    private String plant;

    /** æ˜¯å¦åˆ é™¤(0否，1是) */
    private Integer delFlag;

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

@@ -476,7 +476,8 @@
            }
            ApsGasPipingRouteStat queryStatParam = new ApsGasPipingRouteStat();
            BeanUtils.copyProperties(apsGasPipingRouteStat,queryStatParam);
            queryStatParam.setMajor("");
            queryStatParam.setMajor(apsGasPipingRouteStat.getMajor());
            queryStatParam.setPlant(apsGasPipingRouteStat.getPlant());
            apsGasPipingRouteStats = apsGasPipingRouteStatMapper.selectApsGasPipingRouteStatList(queryStatParam);
            //根据开工日进行升序排序
            apsGasPipingRouteStats.sort((a, b)->a.getProcessPlanStartDay().compareTo(b.getProcessPlanStartDay()));
@@ -538,7 +539,7 @@
                        String dateKey = apsResourceDateStat.getPlanDay().toString();
                        if(dayMap.containsKey(dateKey)){
                            ApsResourceDateStat apsResourceDateStatTemp = dayMap.get(dateKey);
                            String capacityKey = processName + "-" + dateKey.substring(0,7);
                            String capacityKey = processName + "-"+ apsResourceDateStat.getPlant() + "-" + dateKey.substring(0,7);
                            apsResourceDateStatTemp.setDesignTimes(apsGasPipingPlanMap.get(capacityKey)!=null?apsGasPipingPlanMap.get(capacityKey).getDayProduceAllNum():new BigDecimal(0));
                            apsResourceDateStatTemp.setRequireTimes(apsResourceDateStatTemp.getRequireTimes().add(apsResourceDateStat.getRequireTimes()));
                            if(apsResourceDateStatTemp.getDesignTimes().compareTo(BigDecimal.ZERO) > 0){

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

@@ -67,6 +67,7 @@
                    and process_name in (select process_name from aps_standard_process where major='气柜')
                </if>
            </if>
            <if test="plant != null and plant != ''"> and plant = #{plant} </if>
        </where>
    </select>
    
@@ -181,7 +182,7 @@
        id,work_order_no, road_process_number, current_process_number, production_quantity, standard_time,
        process_total_time, process_plan_start_day, design_times, del_flag, create_by, process_name,
        create_time, item_number, standard_dosage, process_total_dosage, design_capacity, major,
        plan_start_year, plan_start_month, plan_start_day,batch_number,process_plan_end_day,warning,order_plan_end_day
        plan_start_year, plan_start_month, plan_start_day,batch_number,process_plan_end_day,warning,order_plan_end_day,plant
        )
        VALUES
        <foreach collection="apsGasPipingRouteStatList" item="stat" separator=",">
@@ -190,7 +191,7 @@
            #{stat.standardTime}, #{stat.processTotalTime}, #{stat.processPlanStartDay}, #{stat.designTimes}, #{stat.delFlag},
            #{stat.createBy}, #{stat.processName}, #{stat.createTime}, #{stat.itemNumber}, #{stat.standardDosage},
            #{stat.processTotalDosage}, #{stat.designCapacity}, #{stat.major}, #{stat.planStartYear},
            #{stat.planStartMonth}, #{stat.planStartDay}, #{stat.batchNumber}, #{stat.processPlanEndDay},#{stat.warning},#{stat.orderPlanEndDay}
            #{stat.planStartMonth}, #{stat.planStartDay}, #{stat.batchNumber}, #{stat.processPlanEndDay},#{stat.warning},#{stat.orderPlanEndDay},#{stat.plant}
            )
        </foreach>

@@ -198,7 +199,7 @@

    <select id="queryTempStat"  resultMap="ApsGasPipingRouteStatResult" >
        select row_number() over (partition by rt.work_order_no order by rt.process_number desc ) as num,
                rt.work_order_no,
               rt.work_order_no,
               rt.process_name,
               cast(rt.process_number as numeric(18, 2))           as road_process_number,
               cast(rt.process_number as numeric(18, 2))           as route_process_number,
@@ -209,9 +210,10 @@
               rt.process_plan_start_day,
               rt.process_plan_end_day,
               pl.plan_end_day                         as order_plan_end_day,
                rt.item_no as item_number,
                pl.plan_type as major,
               false as warning
               rt.item_no as item_number,
               pl.plan_type as major,
               false as warning,
               pl.plant
        from aps_gas_piping_plan as pl
                 left join aps_process_route as rt on pl.document_number = rt.work_order_no
        where pl.document_number is not null and rt.work_order_no is not null and pl.plan_end_day is not null

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

@@ -12,11 +12,12 @@
        <result property="hupQty"    column="hup_qty"    />
        <result property="lodQty"    column="lod_qty"    />
        <result property="type"    column="type"    />
        <result property="plant"    column="plant"    />
        <result property="delFlag"    column="del_flag"    />
    </resultMap>

    <sql id="selectApsWeldSeamStandardVo">
        select id, item_code, item_figure, item_figure_version, hup_qty, lod_qty, type, del_flag from aps_weld_seam_standard
        select id, item_code, item_figure, item_figure_version, hup_qty, lod_qty, type, plant, del_flag from aps_weld_seam_standard
    </sql>

    <select id="selectApsWeldSeamStandardList" parameterType="com.aps.core.domain.ApsWeldSeamStandard" resultMap="ApsWeldSeamStandardResult">
@@ -28,6 +29,7 @@
            <if test="hupQty != null "> and hup_qty = #{hupQty}</if>
            <if test="lodQty != null "> and lod_qty = #{lodQty}</if>
            <if test="type != null  and type != ''"> and type = #{type}</if>
            <if test="plant != null  and plant != ''"> and plant = #{plant}</if>
            and del_flag = 0
        </where>
    </select>

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

@@ -164,7 +164,7 @@
                mgm.domain as ä¸“业
            FROM aps_gas_pipeline_mo mo
            LEFT JOIN aps_weld_seam_standard ws ON mo.material_code = ws.item_code AND ws.del_flag = 0
            LEFT JOIN aps_material_product_group_management mgm ON mo.material_code = mgm.material_code
            LEFT JOIN aps_material_product_group_management mgm ON mo.material_code = mgm.material_code AND mo.factory = mgm.factory
        ),
        é¢„测焊缝计算 AS (
            -- è®¡ç®—预测的焊缝数量
@@ -177,7 +177,7 @@
                mgm.domain as ä¸“业
            FROM aps_gas_pipeline_prediction gp
            LEFT JOIN aps_weld_seam_standard ws ON gp.material_code = ws.item_code AND ws.del_flag = 0
            LEFT JOIN aps_material_product_group_management mgm ON gp.material_code = mgm.material_code
            LEFT JOIN aps_material_product_group_management mgm ON gp.material_code = mgm.material_code AND gp.factory = mgm.factory
        ),
        æ±‡æ€»æ•°æ® AS (
            SELECT 

 aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWeldSeamStandardJob.java

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

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.math.BigDecimal;

/**
 * ç„Šç¼æ ‡å‡†å¯¹è±¡ aps_weld_seam_standard_job
 * 
 * @author user
 * @date 2023-11-05
 */
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ApsWeldSeamStandardJob extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ä¸»é”®ID */
    private Long id;

    /** æ–™å·ï¼ˆæŽ¥å£ä¸­å¯¹åº”plantCount或verId） */
    @Excel(name = "料号")
    private String itemCode;

    /** å›¾å· */
    @Excel(name = "图号")
    private String itemFigure;

    /** ç‰ˆæœ¬å· */
    @Excel(name = "版本号")
    private String itemFigureVersion;

    /** å•ä»¶ç„Šç¼æ•°ï¼ˆHup） */
    @Excel(name = "单件焊缝数（Hup）")
    private BigDecimal hupQty;

    /** å•ä»¶ç„Šç¼æ•°ï¼ˆLOD） */
    @Excel(name = "单件焊缝数（LOD）")
    private BigDecimal lodQty;

    /** ç„ŠæŽ¥å½¢å¼(hup\lod) */
    @Excel(name = "焊接形式")
    private String type;

    /** æ˜¯å¦åˆ é™¤(0否，1是) */
    private Integer delFlag;
} 

 aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWeldSeamStandardJobMapper.java

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

import com.aps.job.domain.ApsWeldSeamStandardJob;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * ç„Šç¼æ ‡å‡†Job Mapper接口
 * 
 * @author user
 * @date 2023-11-05
 */
@Mapper
public interface ApsWeldSeamStandardJobMapper 
{
    /**
     * æŸ¥è¯¢ç„Šç¼æ ‡å‡†åˆ—表
     * 
     * @param apsWeldSeamStandardJob ç„Šç¼æ ‡å‡†
     * @return ç„Šç¼æ ‡å‡†é›†åˆ
     */
    public List<ApsWeldSeamStandardJob> selectApsWeldSeamStandardJobList(ApsWeldSeamStandardJob apsWeldSeamStandardJob);

    /**
     * åˆ é™¤æ‰€æœ‰ç„Šç¼æ ‡å‡†Job数据
     * 
     * @return ç»“æžœ
     */
    public int deleteAllApsWeldSeamStandardJob();
    
    /**
     * æ‰¹é‡æ–°å¢žç„Šç¼æ ‡å‡†Job
     * 
     * @param list ç„Šç¼æ ‡å‡†Job列表
     * @return ç»“æžœ
     */
    public int batchInsertApsWeldSeamStandardJob(List<ApsWeldSeamStandardJob> list);
} 

 aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWeldSeamStandardMapper.java

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

import com.aps.job.domain.ApsWeldSeamStandardJob;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * ç„Šç¼æ ‡å‡†ä¸šåŠ¡è¡¨ Mapper接口
 * 
 * @author user
 * @date 2023-11-05
 */
@Mapper
public interface ApsWeldSeamStandardMapper
{
    /**
     * åˆ é™¤æ‰€æœ‰ç„Šç¼æ ‡å‡†æ•°æ®
     * 
     * @return ç»“æžœ
     */
    public int deleteAllApsWeldSeamStandard();
    
    /**
     * æ‰¹é‡æ–°å¢žç„Šç¼æ ‡å‡†
     * 
     * @param list ç„Šç¼æ ‡å‡†Job列表
     * @return ç»“æžœ
     */
    public int batchInsertApsWeldSeamStandard(List<ApsWeldSeamStandardJob> list);
} 

 aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWeldSeamStandardJobService.java

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

import com.aps.job.domain.ApsWeldSeamStandardJob;

import java.util.List;

/**
 * ç„Šç¼æ ‡å‡†Job Service接口
 * 
 * @author user
 * @date 2023-11-05
 */
public interface IApsWeldSeamStandardJobService 
{
    /**
     * æŸ¥è¯¢ç„Šç¼æ ‡å‡†åˆ—表
     * 
     * @param apsWeldSeamStandardJob ç„Šç¼æ ‡å‡†
     * @return ç„Šç¼æ ‡å‡†é›†åˆ
     */
    public List<ApsWeldSeamStandardJob> selectApsWeldSeamStandardJobList(ApsWeldSeamStandardJob apsWeldSeamStandardJob);

    /**
     * åˆ é™¤æ‰€æœ‰ç„Šç¼æ ‡å‡†Job数据
     * 
     * @return ç»“æžœ
     */
    public int deleteAllApsWeldSeamStandardJob();
    
    /**
     * æ‰¹é‡æ–°å¢žç„Šç¼æ ‡å‡†Job
     * 
     * @param list ç„Šç¼æ ‡å‡†Job列表
     * @return ç»“æžœ
     */
    public int batchInsertApsWeldSeamStandardJob(List<ApsWeldSeamStandardJob> list);
    
    /**
     * åŒæ­¥ç‰©æ–™æ ‡å‡†ç„Šç¼æ•°æ®
     * 
     * @return ç»“æžœ
     */
    public boolean syncWeldSeamStandardData();
} 

 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java

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

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.aps.common.core.utils.StringUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.job.domain.ApsWeldSeamStandardJob;
import com.aps.job.mapper.ApsWeldSeamStandardMapper;
import com.aps.job.mapper.ApsWeldSeamStandardJobMapper;
import com.aps.job.service.IApsWeldSeamStandardJobService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;

/**
 * ç„Šç¼æ ‡å‡†Job Service业务层处理
 * 
 * @author user
 * @date 2023-11-05
 */
@Slf4j
@Service
public class ApsWeldSeamStandardJobServiceImpl implements IApsWeldSeamStandardJobService 
{
    @Autowired
    private ApsWeldSeamStandardJobMapper apsWeldSeamStandardJobMapper;
    
    @Autowired
    private ApsWeldSeamStandardMapper apsWeldSeamStandardMapper;
    
    @Autowired
    private RestTemplate restTemplate;
    
    @Value("${pipingIntegrationplatform.apsWeldSeamStandard}")
    private String apsWeldSeamStandardUrl;

    /**
     * æŸ¥è¯¢ç„Šç¼æ ‡å‡†åˆ—表
     * 
     * @param apsWeldSeamStandardJob ç„Šç¼æ ‡å‡†
     * @return ç„Šç¼æ ‡å‡†é›†åˆ
     */
    @Override
    public List<ApsWeldSeamStandardJob> selectApsWeldSeamStandardJobList(ApsWeldSeamStandardJob apsWeldSeamStandardJob)
    {
        return apsWeldSeamStandardJobMapper.selectApsWeldSeamStandardJobList(apsWeldSeamStandardJob);
    }

    /**
     * åˆ é™¤æ‰€æœ‰ç„Šç¼æ ‡å‡†Job数据
     * 
     * @return ç»“æžœ
     */
    @Override
    public int deleteAllApsWeldSeamStandardJob()
    {
        return apsWeldSeamStandardJobMapper.deleteAllApsWeldSeamStandardJob();
    }
    
    /**
     * æ‰¹é‡æ–°å¢žç„Šç¼æ ‡å‡†Job
     * 
     * @param list ç„Šç¼æ ‡å‡†Job列表
     * @return ç»“æžœ
     */
    @Override
    public int batchInsertApsWeldSeamStandardJob(List<ApsWeldSeamStandardJob> list)
    {
        return apsWeldSeamStandardJobMapper.batchInsertApsWeldSeamStandardJob(list);
    }
    
    /**
     * åŒæ­¥ç‰©æ–™æ ‡å‡†ç„Šç¼æ•°æ®
     * 
     * @return ç»“æžœ
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean syncWeldSeamStandardData()
    {
        try {
            // ä½¿ç”¨POST方法调用接口
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            
            // å‡†å¤‡è¯·æ±‚参数 - ä¼ é€’工厂代码字符串数组，设置为空数组
            String[] plantCodeArray = new String[0];
            
            // ç›´æŽ¥ä½¿ç”¨å­—符串数组作为请求体
            HttpEntity<String[]> requestEntity = new HttpEntity<>(plantCodeArray, headers);
            
            ResponseEntity<String> responseEntity = restTemplate.postForEntity(apsWeldSeamStandardUrl, requestEntity, String.class);
            if (!responseEntity.getStatusCode().is2xxSuccessful()) {
                log.error("获取物料标准焊缝数据失败");
                return false;
            }
            
            String responseBody = responseEntity.getBody();
            if (StringUtils.isEmpty(responseBody)) {
                return false;
            }
            
            JSONObject responseJson = JSON.parseObject(responseBody);
            
            // æ£€æŸ¥è¿”回码
            if (responseJson.getIntValue("code") != 0) {
                return false;
            }
            
            // èŽ·å–接口返回的数据
            JSONArray weldSeamList = responseJson.getJSONArray("ok");
            if (weldSeamList == null || weldSeamList.isEmpty()) {
                return false;
            }
            
            // è§£æžæ•°æ®å¹¶è½¬æ¢ä¸ºå®žä½“对象
            List<ApsWeldSeamStandardJob> jobList = new ArrayList<>();
            AtomicLong idCounter = new AtomicLong(System.currentTimeMillis()); // ä½¿ç”¨å½“前时间戳作为起始ID
            
            for (int i = 0; i < weldSeamList.size(); i++) {
                JSONObject item = weldSeamList.getJSONObject(i);
                
                // ä½¿ç”¨æ­£ç¡®çš„字段名称 plantCode
                String plantCode = item.getString("plantCode");
                
                // èŽ·å–UHP和LOD数量
                BigDecimal uhpCount = null;
                BigDecimal lodCount = null;
                
                try {
                    uhpCount = item.getBigDecimal("uhpCount");
                } catch (Exception e) {
                    // å¿½ç•¥å¼‚常
                }
                
                try {
                    lodCount = item.getBigDecimal("lodCount");
                } catch (Exception e) {
                    // å¿½ç•¥å¼‚常
                }
                
                // åˆ¤æ–­æ•°æ®æ˜¯å¦å®Œæ•´
                if (StringUtils.isEmpty(plantCode)) {
                    continue;
                }
                
                ApsWeldSeamStandardJob job = new ApsWeldSeamStandardJob();
                // ä¸ºid赋值，使用自增长整型
                job.setId(idCounter.incrementAndGet());
                job.setItemCode(plantCode);  // æ˜ å°„关系: plantCode -> itemCode
                job.setHupQty(uhpCount);     // æ˜ å°„关系: uhpCount -> hupQty
                job.setLodQty(lodCount);     // æ˜ å°„关系: lodCount -> lodQty
                job.setDelFlag(0);
                // ä¸å†è®¾ç½®createBy和createTime
                jobList.add(job);
            }
            
            if (jobList.isEmpty()) {
                return false;
            }
            
            // æ¸…空旧数据
            deleteAllApsWeldSeamStandardJob();
            
            // æ‰¹é‡æ’入新数据
            batchInsertApsWeldSeamStandardJob(jobList);
            
            // åŒæ­¥æ•°æ®åˆ°ä¸šåŠ¡è¡¨
            syncToBizTable(jobList);
            
            return true;
        } catch (Exception e) {
            log.error("同步物料标准焊缝数据异常", e);
            throw e;
        }
    }
    
    /**
     * åŒæ­¥æ•°æ®åˆ°ä¸šåŠ¡è¡¨
     * 
     * @param jobList ç„Šç¼æ ‡å‡†Job数据列表
     */
    private void syncToBizTable(List<ApsWeldSeamStandardJob> jobList) {
        try {
            // åˆ é™¤ä¸šåŠ¡è¡¨æ•°æ®ï¼ˆå…¨é‡è¦†ç›–）
            apsWeldSeamStandardMapper.deleteAllApsWeldSeamStandard();
            
            if (jobList == null || jobList.isEmpty()) {
                return;
            }
            
            // æ‰¹é‡æ’入数据到业务表
            apsWeldSeamStandardMapper.batchInsertApsWeldSeamStandard(jobList);
        } catch (Exception e) {
            log.error("同步物料标准焊缝数据到业务表异常", e);
            throw e;
        }
    }
} 

 aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java

@@ -43,6 +43,9 @@

    @Autowired
    private IApsMaterialManagementJobService apsMaterialManagementJobService;
    
    @Autowired
    private IApsWeldSeamStandardJobService apsWeldSeamStandardJobService;

    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
    {
@@ -202,5 +205,12 @@
    public void setPlateSubPlansToRedis(){
        remoteCoreService.setPlateSubPlansToRedis(SecurityConstants.INNER);
    }
    
    /**
     * åŒæ­¥ç‰©æ–™æ ‡å‡†ç„Šç¼æ•°æ®
     */
    public void syncWeldSeamStandardData() {
        apsWeldSeamStandardJobService.syncWeldSeamStandardData();
    }

}

 aps-modules/aps-job/src/main/resources/mapper/job/ApsWeldSeamStandardJobMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
<?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.job.mapper.ApsWeldSeamStandardJobMapper">
    
    <resultMap type="com.aps.job.domain.ApsWeldSeamStandardJob" id="ApsWeldSeamStandardJobResult">
        <result property="id"    column="id"    />
        <result property="itemCode"    column="item_code"    />
        <result property="itemFigure"    column="item_figure"    />
        <result property="itemFigureVersion"    column="item_figure_version"    />
        <result property="hupQty"    column="hup_qty"    />
        <result property="lodQty"    column="lod_qty"    />
        <result property="type"    column="type"    />
        <result property="delFlag"    column="del_flag"    />
    </resultMap>

    <sql id="selectApsWeldSeamStandardJobVo">
        select id, item_code, item_figure, item_figure_version, hup_qty, lod_qty, type, del_flag from aps_weld_seam_standard_job
    </sql>

    <select id="selectApsWeldSeamStandardJobList" parameterType="com.aps.job.domain.ApsWeldSeamStandardJob" resultMap="ApsWeldSeamStandardJobResult">
        <include refid="selectApsWeldSeamStandardJobVo"/>
        <where>  
            <if test="itemCode != null  and itemCode != ''"> and item_code LIKE '%' || #{itemCode} || '%'</if>
            <if test="itemFigure != null  and itemFigure != ''"> and item_figure = #{itemFigure}</if>
            <if test="itemFigureVersion != null  and itemFigureVersion != ''"> and item_figure_version = #{itemFigureVersion}</if>
            <if test="hupQty != null "> and hup_qty = #{hupQty}</if>
            <if test="lodQty != null "> and lod_qty = #{lodQty}</if>
            <if test="type != null  and type != ''"> and type = #{type}</if>
            and del_flag = 0
        </where>
    </select>
    
    <delete id="deleteAllApsWeldSeamStandardJob">
        delete from aps_weld_seam_standard_job
    </delete>
    
    <insert id="batchInsertApsWeldSeamStandardJob" parameterType="java.util.List">
        insert into aps_weld_seam_standard_job(
        id,
        item_code, 
        item_figure,
        item_figure_version, 
        hup_qty, 
        lod_qty, 
        type, 
        del_flag)
        values
        <foreach collection="list" item="item" index="index" separator=",">
        (
            #{item.id},
            #{item.itemCode},
            #{item.itemFigure},
            #{item.itemFigureVersion},
            #{item.hupQty},
            #{item.lodQty},
            #{item.type},
            0
        )
        </foreach>
    </insert>
    
</mapper> 

 aps-modules/aps-job/src/main/resources/mapper/job/ApsWeldSeamStandardMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
<?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.job.mapper.ApsWeldSeamStandardMapper">
    
    <delete id="deleteAllApsWeldSeamStandard">
        delete from aps_weld_seam_standard
    </delete>
    
    <insert id="batchInsertApsWeldSeamStandard" parameterType="java.util.List">
        insert into aps_weld_seam_standard(
        id,
        item_code, 
        item_figure, 
        item_figure_version, 
        hup_qty, 
        lod_qty, 
        type, 
        del_flag)
        values
        <foreach collection="list" item="item" index="index" separator=",">
        (
            #{item.id},
            #{item.itemCode},
            #{item.itemFigure},
            #{item.itemFigureVersion},
            #{item.hupQty},
            #{item.lodQty},
            #{item.type},
            0
        )
        </foreach>
    </insert>
</mapper>