更新产品过站采集

yantian yue

2023-12-12 7c651d6fd79c1fd47056d4aabab55cbd3bb2a022

更新产品过站采集

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,105 @@
package com.jcdm.main.da.passingStationCollection.controller;

import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import org.springframework.security.access.prepost.PreAuthorize;
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.jcdm.common.annotation.Log;
import com.jcdm.common.core.controller.BaseController;
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.enums.BusinessType;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.common.core.page.TableDataInfo;

/**
 * äº§å“è¿‡ç«™é‡‡é›†Controller
 * 
 * @author yyt
 * @date 2023-12-12
 */
@RestController
@RequestMapping("/da/passingStationCollection")
public class DaPassingStationCollectionController extends BaseController
{
    @Autowired
    private IDaPassingStationCollectionService daPassingStationCollectionService;

    /**
     * æŸ¥è¯¢äº§å“è¿‡ç«™é‡‡é›†åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/list")
    public TableDataInfo list(DaPassingStationCollection daPassingStationCollection)
    {
        startPage();
        List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºäº§å“è¿‡ç«™é‡‡é›†åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:export')")
    @Log(title = "产品过站采集", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, DaPassingStationCollection daPassingStationCollection)
    {
        List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
        ExcelUtil<DaPassingStationCollection> util = new ExcelUtil<DaPassingStationCollection>(DaPassingStationCollection.class);
        util.exportExcel(response, list, "产品过站采集数据");
    }

    /**
     * èŽ·å–产品过站采集详细信息
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(daPassingStationCollectionService.selectDaPassingStationCollectionById(id));
    }

    /**
     * æ–°å¢žäº§å“è¿‡ç«™é‡‡é›†
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:add')")
    @Log(title = "产品过站采集", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody DaPassingStationCollection daPassingStationCollection)
    {
        return toAjax(daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection));
    }

    /**
     * ä¿®æ”¹äº§å“è¿‡ç«™é‡‡é›†
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:edit')")
    @Log(title = "产品过站采集", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody DaPassingStationCollection daPassingStationCollection)
    {
        return toAjax(daPassingStationCollectionService.updateDaPassingStationCollection(daPassingStationCollection));
    }

    /**
     * åˆ é™¤äº§å“è¿‡ç«™é‡‡é›†
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:remove')")
    @Log(title = "产品过站采集", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(daPassingStationCollectionService.deleteDaPassingStationCollectionByIds(ids));
    }
}

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,292 @@
package com.jcdm.main.da.passingStationCollection.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.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;

/**
 * äº§å“è¿‡ç«™é‡‡é›†å¯¹è±¡ da_passing_station_collection
 * 
 * @author yyt
 * @date 2023-12-12
 */
public class DaPassingStationCollection extends BaseEntity
{
    private static final long serialVersionUID = 1L;

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

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

    /** æ€»æˆåºåˆ—号 */
    @Excel(name = "总成序列号")
    private String sfcCode;

    /** äº§å“ç¼–号 */
    @Excel(name = "产品编号")
    private String productCode;

    /** äº§çº¿ç¼–号 */
    @Excel(name = "产线编号")
    private String productionLine;

    /** å·¥ä½ç¼–号 */
    @Excel(name = "工位编号")
    private String locationCode;

    /** è®¾å¤‡ç¼–号 */
    @Excel(name = "设备编号")
    private String equipmentNo;

    /** å…¥ç«™æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "入站时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date inboundTime;

    /** å‡ºç«™æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "出站时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date outboundTime;

    /** å…¥ç«™æ˜¯å¦åˆæ ¼ */
    @Excel(name = "入站是否合格")
    private String inRsSign;

    /** å…¥ç«™NG原因 */
    @Excel(name = "入站NG原因")
    private String inMsgSign;

    /** å‡ºç«™æ˜¯å¦åˆæ ¼ */
    @Excel(name = "出站是否合格")
    private String outRsSign;

    /** å‡ºç«™NG原因 */
    @Excel(name = "出站NG原因")
    private String outMsgSign;

    /** é‡‡é›†æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date collectionTime;

    /** é¢„留字段1 */
    private String spareField1;

    /** é¢„留字段2 */
    private String spareField2;

    /** åˆ›å»ºç”¨æˆ· */
    private String createUser;

    /** æ›´æ”¹ç”¨æˆ· */
    private String updateUser;

    /** èŠ‚拍时间 */
    @Excel(name = "节拍时间")
    private String beatTime;

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

    public Long getId() 
    {
        return id;
    }
    public void setWorkOrderNo(String workOrderNo) 
    {
        this.workOrderNo = workOrderNo;
    }

    public String getWorkOrderNo() 
    {
        return workOrderNo;
    }
    public void setSfcCode(String sfcCode) 
    {
        this.sfcCode = sfcCode;
    }

    public String getSfcCode() 
    {
        return sfcCode;
    }
    public void setProductCode(String productCode) 
    {
        this.productCode = productCode;
    }

    public String getProductCode() 
    {
        return productCode;
    }
    public void setProductionLine(String productionLine) 
    {
        this.productionLine = productionLine;
    }

    public String getProductionLine() 
    {
        return productionLine;
    }
    public void setLocationCode(String locationCode) 
    {
        this.locationCode = locationCode;
    }

    public String getLocationCode() 
    {
        return locationCode;
    }
    public void setEquipmentNo(String equipmentNo) 
    {
        this.equipmentNo = equipmentNo;
    }

    public String getEquipmentNo() 
    {
        return equipmentNo;
    }
    public void setInboundTime(Date inboundTime) 
    {
        this.inboundTime = inboundTime;
    }

    public Date getInboundTime() 
    {
        return inboundTime;
    }
    public void setOutboundTime(Date outboundTime) 
    {
        this.outboundTime = outboundTime;
    }

    public Date getOutboundTime() 
    {
        return outboundTime;
    }
    public void setInRsSign(String inRsSign) 
    {
        this.inRsSign = inRsSign;
    }

    public String getInRsSign() 
    {
        return inRsSign;
    }
    public void setInMsgSign(String inMsgSign) 
    {
        this.inMsgSign = inMsgSign;
    }

    public String getInMsgSign() 
    {
        return inMsgSign;
    }
    public void setOutRsSign(String outRsSign) 
    {
        this.outRsSign = outRsSign;
    }

    public String getOutRsSign() 
    {
        return outRsSign;
    }
    public void setOutMsgSign(String outMsgSign) 
    {
        this.outMsgSign = outMsgSign;
    }

    public String getOutMsgSign() 
    {
        return outMsgSign;
    }
    public void setCollectionTime(Date collectionTime) 
    {
        this.collectionTime = collectionTime;
    }

    public Date getCollectionTime() 
    {
        return collectionTime;
    }
    public void setSpareField1(String spareField1) 
    {
        this.spareField1 = spareField1;
    }

    public String getSpareField1() 
    {
        return spareField1;
    }
    public void setSpareField2(String spareField2) 
    {
        this.spareField2 = spareField2;
    }

    public String getSpareField2() 
    {
        return spareField2;
    }
    public void setCreateUser(String createUser) 
    {
        this.createUser = createUser;
    }

    public String getCreateUser() 
    {
        return createUser;
    }
    public void setUpdateUser(String updateUser) 
    {
        this.updateUser = updateUser;
    }

    public String getUpdateUser() 
    {
        return updateUser;
    }
    public void setBeatTime(String beatTime) 
    {
        this.beatTime = beatTime;
    }

    public String getBeatTime() 
    {
        return beatTime;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("workOrderNo", getWorkOrderNo())
            .append("sfcCode", getSfcCode())
            .append("productCode", getProductCode())
            .append("productionLine", getProductionLine())
            .append("locationCode", getLocationCode())
            .append("equipmentNo", getEquipmentNo())
            .append("inboundTime", getInboundTime())
            .append("outboundTime", getOutboundTime())
            .append("inRsSign", getInRsSign())
            .append("inMsgSign", getInMsgSign())
            .append("outRsSign", getOutRsSign())
            .append("outMsgSign", getOutMsgSign())
            .append("collectionTime", getCollectionTime())
            .append("spareField1", getSpareField1())
            .append("spareField2", getSpareField2())
            .append("createUser", getCreateUser())
            .append("createTime", getCreateTime())
            .append("updateUser", getUpdateUser())
            .append("updateTime", getUpdateTime())
            .append("beatTime", getBeatTime())
            .toString();
    }
}

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.jcdm.main.da.passingStationCollection.mapper;

import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;

import java.util.List;

/**
 * äº§å“è¿‡ç«™é‡‡é›†Mapper接口
 * 
 * @author yyt
 * @date 2023-12-12
 */
public interface DaPassingStationCollectionMapper 
{
    /**
     * æŸ¥è¯¢äº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param id äº§å“è¿‡ç«™é‡‡é›†ä¸»é”®
     * @return äº§å“è¿‡ç«™é‡‡é›†
     */
    public DaPassingStationCollection selectDaPassingStationCollectionById(Long id);

    /**
     * æŸ¥è¯¢äº§å“è¿‡ç«™é‡‡é›†åˆ—表
     * 
     * @param daPassingStationCollection äº§å“è¿‡ç«™é‡‡é›†
     * @return äº§å“è¿‡ç«™é‡‡é›†é›†åˆ
     */
    public List<DaPassingStationCollection> selectDaPassingStationCollectionList(DaPassingStationCollection daPassingStationCollection);

    /**
     * æ–°å¢žäº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param daPassingStationCollection äº§å“è¿‡ç«™é‡‡é›†
     * @return ç»“æžœ
     */
    public int insertDaPassingStationCollection(DaPassingStationCollection daPassingStationCollection);

    /**
     * ä¿®æ”¹äº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param daPassingStationCollection äº§å“è¿‡ç«™é‡‡é›†
     * @return ç»“æžœ
     */
    public int updateDaPassingStationCollection(DaPassingStationCollection daPassingStationCollection);

    /**
     * åˆ é™¤äº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param id äº§å“è¿‡ç«™é‡‡é›†ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteDaPassingStationCollectionById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤äº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteDaPassingStationCollectionByIds(Long[] ids);
}

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.jcdm.main.da.passingStationCollection.service;

import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;

import java.util.List;

/**
 * äº§å“è¿‡ç«™é‡‡é›†Service接口
 * 
 * @author yyt
 * @date 2023-12-12
 */
public interface IDaPassingStationCollectionService 
{
    /**
     * æŸ¥è¯¢äº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param id äº§å“è¿‡ç«™é‡‡é›†ä¸»é”®
     * @return äº§å“è¿‡ç«™é‡‡é›†
     */
    public DaPassingStationCollection selectDaPassingStationCollectionById(Long id);

    /**
     * æŸ¥è¯¢äº§å“è¿‡ç«™é‡‡é›†åˆ—表
     * 
     * @param daPassingStationCollection äº§å“è¿‡ç«™é‡‡é›†
     * @return äº§å“è¿‡ç«™é‡‡é›†é›†åˆ
     */
    public List<DaPassingStationCollection> selectDaPassingStationCollectionList(DaPassingStationCollection daPassingStationCollection);

    /**
     * æ–°å¢žäº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param daPassingStationCollection äº§å“è¿‡ç«™é‡‡é›†
     * @return ç»“æžœ
     */
    public int insertDaPassingStationCollection(DaPassingStationCollection daPassingStationCollection);

    /**
     * ä¿®æ”¹äº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param daPassingStationCollection äº§å“è¿‡ç«™é‡‡é›†
     * @return ç»“æžœ
     */
    public int updateDaPassingStationCollection(DaPassingStationCollection daPassingStationCollection);

    /**
     * æ‰¹é‡åˆ é™¤äº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param ids éœ€è¦åˆ é™¤çš„产品过站采集主键集合
     * @return ç»“æžœ
     */
    public int deleteDaPassingStationCollectionByIds(Long[] ids);

    /**
     * åˆ é™¤äº§å“è¿‡ç«™é‡‡é›†ä¿¡æ¯
     * 
     * @param id äº§å“è¿‡ç«™é‡‡é›†ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteDaPassingStationCollectionById(Long id);
}

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
package com.jcdm.main.da.passingStationCollection.service.impl;

import java.util.List;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
 * äº§å“è¿‡ç«™é‡‡é›†Service业务层处理
 * 
 * @author yyt
 * @date 2023-12-12
 */
@Service
public class DaPassingStationCollectionServiceImpl implements IDaPassingStationCollectionService
{
    @Autowired
    private DaPassingStationCollectionMapper daPassingStationCollectionMapper;

    /**
     * æŸ¥è¯¢äº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param id äº§å“è¿‡ç«™é‡‡é›†ä¸»é”®
     * @return äº§å“è¿‡ç«™é‡‡é›†
     */
    @Override
    public DaPassingStationCollection selectDaPassingStationCollectionById(Long id)
    {
        return daPassingStationCollectionMapper.selectDaPassingStationCollectionById(id);
    }

    /**
     * æŸ¥è¯¢äº§å“è¿‡ç«™é‡‡é›†åˆ—表
     * 
     * @param daPassingStationCollection äº§å“è¿‡ç«™é‡‡é›†
     * @return äº§å“è¿‡ç«™é‡‡é›†
     */
    @Override
    public List<DaPassingStationCollection> selectDaPassingStationCollectionList(DaPassingStationCollection daPassingStationCollection)
    {
        return daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
    }

    /**
     * æ–°å¢žäº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param daPassingStationCollection äº§å“è¿‡ç«™é‡‡é›†
     * @return ç»“æžœ
     */
    @Override
    public int insertDaPassingStationCollection(DaPassingStationCollection daPassingStationCollection)
    {
        daPassingStationCollection.setCreateTime(DateUtils.getNowDate());
        return daPassingStationCollectionMapper.insertDaPassingStationCollection(daPassingStationCollection);
    }

    /**
     * ä¿®æ”¹äº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param daPassingStationCollection äº§å“è¿‡ç«™é‡‡é›†
     * @return ç»“æžœ
     */
    @Override
    public int updateDaPassingStationCollection(DaPassingStationCollection daPassingStationCollection)
    {
        daPassingStationCollection.setUpdateTime(DateUtils.getNowDate());
        return daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollection);
    }

    /**
     * æ‰¹é‡åˆ é™¤äº§å“è¿‡ç«™é‡‡é›†
     * 
     * @param ids éœ€è¦åˆ é™¤çš„产品过站采集主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteDaPassingStationCollectionByIds(Long[] ids)
    {
        return daPassingStationCollectionMapper.deleteDaPassingStationCollectionByIds(ids);
    }

    /**
     * åˆ é™¤äº§å“è¿‡ç«™é‡‡é›†ä¿¡æ¯
     * 
     * @param id äº§å“è¿‡ç«™é‡‡é›†ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteDaPassingStationCollectionById(Long id)
    {
        return daPassingStationCollectionMapper.deleteDaPassingStationCollectionById(id);
    }
}

 jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,141 @@
<?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.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper">
    
    <resultMap type="DaPassingStationCollection" id="DaPassingStationCollectionResult">
        <result property="id"    column="id"    />
        <result property="workOrderNo"    column="work_order_no"    />
        <result property="sfcCode"    column="sfc_code"    />
        <result property="productCode"    column="product_code"    />
        <result property="productionLine"    column="production_line"    />
        <result property="locationCode"    column="location_code"    />
        <result property="equipmentNo"    column="equipment_no"    />
        <result property="inboundTime"    column="inbound_time"    />
        <result property="outboundTime"    column="outbound_time"    />
        <result property="inRsSign"    column="in_rs_sign"    />
        <result property="inMsgSign"    column="in_msg_sign"    />
        <result property="outRsSign"    column="out_rs_sign"    />
        <result property="outMsgSign"    column="out_msg_sign"    />
        <result property="collectionTime"    column="collection_time"    />
        <result property="spareField1"    column="spare_field_1"    />
        <result property="spareField2"    column="spare_field_2"    />
        <result property="createUser"    column="create_user"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateUser"    column="update_user"    />
        <result property="updateTime"    column="update_time"    />
        <result property="beatTime"    column="beat_time"    />
    </resultMap>

    <sql id="selectDaPassingStationCollectionVo">
        select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, inbound_time, outbound_time, in_rs_sign, in_msg_sign, out_rs_sign, out_msg_sign, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, beat_time from da_passing_station_collection
    </sql>

    <select id="selectDaPassingStationCollectionList" parameterType="DaPassingStationCollection" resultMap="DaPassingStationCollectionResult">
        <include refid="selectDaPassingStationCollectionVo"/>
        <where>  
            <if test="workOrderNo != null  and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
            <if test="sfcCode != null  and sfcCode != ''"> and sfc_code = #{sfcCode}</if>
            <if test="productCode != null  and productCode != ''"> and product_code = #{productCode}</if>
            <if test="productionLine != null  and productionLine != ''"> and production_line = #{productionLine}</if>
            <if test="locationCode != null  and locationCode != ''"> and location_code = #{locationCode}</if>
            <if test="equipmentNo != null  and equipmentNo != ''"> and equipment_no = #{equipmentNo}</if>
            <if test="inboundTime != null "> and inbound_time = #{inboundTime}</if>
            <if test="outboundTime != null "> and outbound_time = #{outboundTime}</if>
        </where>
    </select>
    
    <select id="selectDaPassingStationCollectionById" parameterType="Long" resultMap="DaPassingStationCollectionResult">
        <include refid="selectDaPassingStationCollectionVo"/>
        where id = #{id}
    </select>
        
    <insert id="insertDaPassingStationCollection" parameterType="DaPassingStationCollection">
        insert into da_passing_station_collection
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="workOrderNo != null">work_order_no,</if>
            <if test="sfcCode != null">sfc_code,</if>
            <if test="productCode != null">product_code,</if>
            <if test="productionLine != null">production_line,</if>
            <if test="locationCode != null">location_code,</if>
            <if test="equipmentNo != null">equipment_no,</if>
            <if test="inboundTime != null">inbound_time,</if>
            <if test="outboundTime != null">outbound_time,</if>
            <if test="inRsSign != null">in_rs_sign,</if>
            <if test="inMsgSign != null">in_msg_sign,</if>
            <if test="outRsSign != null">out_rs_sign,</if>
            <if test="outMsgSign != null">out_msg_sign,</if>
            <if test="collectionTime != null">collection_time,</if>
            <if test="spareField1 != null">spare_field_1,</if>
            <if test="spareField2 != null">spare_field_2,</if>
            <if test="createUser != null">create_user,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateUser != null">update_user,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="beatTime != null">beat_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="workOrderNo != null">#{workOrderNo},</if>
            <if test="sfcCode != null">#{sfcCode},</if>
            <if test="productCode != null">#{productCode},</if>
            <if test="productionLine != null">#{productionLine},</if>
            <if test="locationCode != null">#{locationCode},</if>
            <if test="equipmentNo != null">#{equipmentNo},</if>
            <if test="inboundTime != null">#{inboundTime},</if>
            <if test="outboundTime != null">#{outboundTime},</if>
            <if test="inRsSign != null">#{inRsSign},</if>
            <if test="inMsgSign != null">#{inMsgSign},</if>
            <if test="outRsSign != null">#{outRsSign},</if>
            <if test="outMsgSign != null">#{outMsgSign},</if>
            <if test="collectionTime != null">#{collectionTime},</if>
            <if test="spareField1 != null">#{spareField1},</if>
            <if test="spareField2 != null">#{spareField2},</if>
            <if test="createUser != null">#{createUser},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateUser != null">#{updateUser},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="beatTime != null">#{beatTime},</if>
         </trim>
    </insert>

    <update id="updateDaPassingStationCollection" parameterType="DaPassingStationCollection">
        update da_passing_station_collection
        <trim prefix="SET" suffixOverrides=",">
            <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
            <if test="sfcCode != null">sfc_code = #{sfcCode},</if>
            <if test="productCode != null">product_code = #{productCode},</if>
            <if test="productionLine != null">production_line = #{productionLine},</if>
            <if test="locationCode != null">location_code = #{locationCode},</if>
            <if test="equipmentNo != null">equipment_no = #{equipmentNo},</if>
            <if test="inboundTime != null">inbound_time = #{inboundTime},</if>
            <if test="outboundTime != null">outbound_time = #{outboundTime},</if>
            <if test="inRsSign != null">in_rs_sign = #{inRsSign},</if>
            <if test="inMsgSign != null">in_msg_sign = #{inMsgSign},</if>
            <if test="outRsSign != null">out_rs_sign = #{outRsSign},</if>
            <if test="outMsgSign != null">out_msg_sign = #{outMsgSign},</if>
            <if test="collectionTime != null">collection_time = #{collectionTime},</if>
            <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
            <if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
            <if test="createUser != null">create_user = #{createUser},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateUser != null">update_user = #{updateUser},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="beatTime != null">beat_time = #{beatTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteDaPassingStationCollectionById" parameterType="Long">
        delete from da_passing_station_collection where id = #{id}
    </delete>

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

 jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
import request from '@/utils/request'

// æŸ¥è¯¢äº§å“è¿‡ç«™é‡‡é›†åˆ—表
export function listPassingStationCollection(query) {
  return request({
    url: '/da/passingStationCollection/list',
    method: 'get',
    params: query
  })
}

// æŸ¥è¯¢äº§å“è¿‡ç«™é‡‡é›†è¯¦ç»†
export function getPassingStationCollection(id) {
  return request({
    url: '/da/passingStationCollection/' + id,
    method: 'get'
  })
}

// æ–°å¢žäº§å“è¿‡ç«™é‡‡é›†
export function addPassingStationCollection(data) {
  return request({
    url: '/da/passingStationCollection',
    method: 'post',
    data: data
  })
}

// ä¿®æ”¹äº§å“è¿‡ç«™é‡‡é›†
export function updatePassingStationCollection(data) {
  return request({
    url: '/da/passingStationCollection',
    method: 'put',
    data: data
  })
}

// åˆ é™¤äº§å“è¿‡ç«™é‡‡é›†
export function delPassingStationCollection(id) {
  return request({
    url: '/da/passingStationCollection/' + id,
    method: 'delete'
  })
}

 jcdm-ui/src/views/main/bs/material/index.vue

@@ -315,9 +315,9 @@
        <el-form-item label="单位" prop="unit">
          <el-input v-model="form.unit" placeholder="请输入单位" />
        </el-form-item>
        <el-form-item label="版本" prop="matterVersion">
          <el-input v-model="form.matterVersion" placeholder="请输入版本" />
        </el-form-item>
<!--        <el-form-item label="版本" prop="matterVersion">-->
<!--          <el-input v-model="form.matterVersion" placeholder="请输入版本" />-->
<!--        </el-form-item>-->
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
        </el-form-item>
@@ -333,9 +333,9 @@
        <el-form-item label="数据来源" prop="dataSource">
          <el-input v-model="form.dataSource" placeholder="请输入数据来源" />
        </el-form-item>
        <el-form-item label="版本" prop="version">
          <el-input v-model="form.version" placeholder="请输入版本" />
        </el-form-item>
<!--        <el-form-item label="版本" prop="version">-->
<!--          <el-input v-model="form.version" placeholder="请输入版本" />-->
<!--        </el-form-item>-->
        <el-form-item label="状态" prop="status">
          <el-radio-group v-model="form.status">
            <el-radio

 jcdm-ui/src/views/main/da/passingStationCollection/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,417 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="入站时间" prop="inboundTime">
        <el-date-picker clearable
          v-model="queryParams.inboundTime"
          type="date"
          value-format="yyyy-MM-dd"
          placeholder="请选择入站时间">
        </el-date-picker>
      </el-form-item>
      <el-form-item label="出站时间" prop="outboundTime">
        <el-date-picker clearable
          v-model="queryParams.outboundTime"
          type="date"
          value-format="yyyy-MM-dd"
          placeholder="请选择出站时间">
        </el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['da:passingStationCollection:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['da:passingStationCollection:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['da:passingStationCollection:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['da:passingStationCollection:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="passingStationCollectionList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
<!--      <el-table-column label="主键id" align="center" prop="id" />-->
      <el-table-column label="工单编号" align="center" prop="workOrderNo">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.workOrderNo"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="总成序列号" align="center" prop="sfcCode">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.sfcCode"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="产品编号" align="center" prop="productCode">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productCode"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="产线编号" align="center" prop="productionLine">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productionLine"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="工位编号" align="center" prop="locationCode">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.locationCode"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="设备编号" align="center" prop="equipmentNo">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.equipmentNo"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="入站时间" align="center" prop="inboundTime" width="100">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="出站时间" align="center" prop="outboundTime" width="100">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="入站是否合格" align="center" prop="inRsSign">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.inRsSign"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="入站NG原因" align="center" prop="inMsgSign">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.inMsgSign"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="出站是否合格" align="center" prop="outRsSign">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.outRsSign"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="出站NG原因" align="center" prop="outMsgSign">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.outMsgSign"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="采集时间" align="center" prop="collectionTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="节拍时间" align="center" prop="beatTime">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.beatTime"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['da:passingStationCollection:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['da:passingStationCollection:remove']"
          >删除</el-button>
        </template>
      </el-table-column>
    </el-table>

    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />

    <!-- æ·»åŠ æˆ–修改产品过站采集对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-form-item label="工单编号" prop="workOrderNo">
          <el-input v-model="form.workOrderNo" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="总成序列号" prop="sfcCode">
          <el-input v-model="form.sfcCode" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="产品编号" prop="productCode">
          <el-input v-model="form.productCode" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="产线编号" prop="productionLine">
          <el-input v-model="form.productionLine" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="工位编号" prop="locationCode">
          <el-input v-model="form.locationCode" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="设备编号" prop="equipmentNo">
          <el-input v-model="form.equipmentNo" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="入站时间" prop="inboundTime">
          <el-date-picker clearable
            v-model="form.inboundTime"
            type="date"
            value-format="yyyy-MM-dd"
            placeholder="请选择入站时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="出站时间" prop="outboundTime">
          <el-date-picker clearable
            v-model="form.outboundTime"
            type="date"
            value-format="yyyy-MM-dd"
            placeholder="请选择出站时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="入站是否合格" prop="inRsSign">
          <el-input v-model="form.inRsSign" placeholder="请输入入站是否合格" />
        </el-form-item>
        <el-form-item label="入站NG原因" prop="inMsgSign">
          <el-input v-model="form.inMsgSign" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="出站是否合格" prop="outRsSign">
          <el-input v-model="form.outRsSign" placeholder="请输入出站是否合格" />
        </el-form-item>
        <el-form-item label="出站NG原因" prop="outMsgSign">
          <el-input v-model="form.outMsgSign" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="采集时间" prop="collectionTime">
          <el-date-picker clearable
            v-model="form.collectionTime"
            type="date"
            value-format="yyyy-MM-dd"
            placeholder="请选择采集时间">
          </el-date-picker>
        </el-form-item>
<!--        <el-form-item label="预留字段1" prop="spareField1">-->
<!--          <el-input v-model="form.spareField1" type="textarea" placeholder="请输入内容" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="预留字段2" prop="spareField2">-->
<!--          <el-input v-model="form.spareField2" type="textarea" placeholder="请输入内容" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="创建用户" prop="createUser">-->
<!--          <el-input v-model="form.createUser" type="textarea" placeholder="请输入内容" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="更改用户" prop="updateUser">-->
<!--          <el-input v-model="form.updateUser" type="textarea" placeholder="请输入内容" />-->
<!--        </el-form-item>-->
        <el-form-item label="节拍时间" prop="beatTime">
          <el-input v-model="form.beatTime" placeholder="请输入节拍时间" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">ç¡® å®š</el-button>
        <el-button @click="cancel">取 æ¶ˆ</el-button>
      </div>
    </el-dialog>
  </div>
</template>

<script>
import { listPassingStationCollection, getPassingStationCollection, delPassingStationCollection, addPassingStationCollection, updatePassingStationCollection } from "@/api/main/da/passingStationCollection/passingStationCollection";

export default {
  name: "PassingStationCollection",
  data() {
    return {
      // é®ç½©å±‚
      loading: true,
      // é€‰ä¸­æ•°ç»„
      ids: [],
      // éžå•ä¸ªç¦ç”¨
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // äº§å“è¿‡ç«™é‡‡é›†è¡¨æ ¼æ•°æ®
      passingStationCollectionList: [],
      // å¼¹å‡ºå±‚标题
      title: "",
      // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚
      open: false,
      // æŸ¥è¯¢å‚æ•°
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        workOrderNo: null,
        sfcCode: null,
        productCode: null,
        productionLine: null,
        locationCode: null,
        equipmentNo: null,
        inboundTime: null,
        outboundTime: null,
      },
      // è¡¨å•å‚æ•°
      form: {},
      // è¡¨å•æ ¡éªŒ
      rules: {
        id: [
          { required: true, message: "主键id不能为空", trigger: "blur" }
        ],
      }
    };
  },
  created() {
    this.getList();
  },
  methods: {
    /** æŸ¥è¯¢äº§å“è¿‡ç«™é‡‡é›†åˆ—表 */
    getList() {
      this.loading = true;
      listPassingStationCollection(this.queryParams).then(response => {
        this.passingStationCollectionList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
    // å–消按钮
    cancel() {
      this.open = false;
      this.reset();
    },
    // è¡¨å•é‡ç½®
    reset() {
      this.form = {
        id: null,
        workOrderNo: null,
        sfcCode: null,
        productCode: null,
        productionLine: null,
        locationCode: null,
        equipmentNo: null,
        inboundTime: null,
        outboundTime: null,
        inRsSign: null,
        inMsgSign: null,
        outRsSign: null,
        outMsgSign: null,
        collectionTime: null,
        spareField1: null,
        spareField2: null,
        createUser: null,
        createTime: null,
        updateUser: null,
        updateTime: null,
        beatTime: null
      };
      this.resetForm("form");
    },
    /** æœç´¢æŒ‰é’®æ“ä½œ */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** é‡ç½®æŒ‰é’®æ“ä½œ */
    resetQuery() {
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.multiple = !selection.length
    },
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加产品过站采集";
    },
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleUpdate(row) {
      this.reset();
      const id = row.id || this.ids
      getPassingStationCollection(id).then(response => {
        this.form = response.data;
        this.open = true;
        this.title = "修改产品过站采集";
      });
    },
    /** æäº¤æŒ‰é’® */
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.id != null) {
            updatePassingStationCollection(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addPassingStationCollection(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
          }
        }
      });
    },
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除产品过站采集编号为"' + ids + '"的数据项？').then(function() {
        return delPassingStationCollection(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {
      this.download('da/passingStationCollection/export', {
        ...this.queryParams
      }, `passingStationCollection_${new Date().getTime()}.xlsx`)
    }
  }
};
</script>