From c9c1560eeffdc73c38ab8ef6e1492b164b2360f5 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 16 六月 2024 09:32:56 +0800
Subject: [PATCH] 临时表功能上传
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/mapper/DaParamCollectionTempMapper.java | 63 ++
jcdm-main/src/main/resources/mapper/da/paramCollectionTemp/DaParamCollectionTempMapper.xml | 179 ++++++
jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/controller/DaParamCollectionTempController.java | 104 ++++
jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java | 63 ++
jcdm-ui/src/api/main/da/paramCollectionTemp/paramCollectionTemp.js | 44 +
jcdm-ui/src/views/main/da/paramCollectionTemp/index.vue | 587 ++++++++++++++++++++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 15
jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/domain/DaParamCollectionTemp.java | 377 ++++++++++++++
jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java | 101 +++
9 files changed, 1,531 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/controller/DaParamCollectionTempController.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/controller/DaParamCollectionTempController.java
new file mode 100644
index 0000000..8afc595
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/controller/DaParamCollectionTempController.java
@@ -0,0 +1,104 @@
+package com.jcdm.main.da.paramCollectionTemp.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.main.da.paramCollectionTemp.domain.DaParamCollectionTemp;
+import com.jcdm.main.da.paramCollectionTemp.service.IDaParamCollectionTempService;
+import com.jcdm.common.utils.poi.ExcelUtil;
+import com.jcdm.common.core.page.TableDataInfo;
+
+/**
+ * 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛–ontroller
+ *
+ * @author Yi
+ * @date 2024-06-13
+ */
+@RestController
+@RequestMapping("/da/paramCollectionTemp")
+public class DaParamCollectionTempController extends BaseController
+{
+ @Autowired
+ private IDaParamCollectionTempService daParamCollectionTempService;
+
+ /**
+ * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄥ垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('da:paramCollectionTemp:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(DaParamCollectionTemp daParamCollectionTemp)
+ {
+ startPage();
+ List<DaParamCollectionTemp> list = daParamCollectionTempService.selectDaParamCollectionTempList(daParamCollectionTemp);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄥ垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('da:paramCollectionTemp:export')")
+ @Log(title = "璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, DaParamCollectionTemp daParamCollectionTemp)
+ {
+ List<DaParamCollectionTemp> list = daParamCollectionTempService.selectDaParamCollectionTempList(daParamCollectionTemp);
+ ExcelUtil<DaParamCollectionTemp> util = new ExcelUtil<DaParamCollectionTemp>(DaParamCollectionTemp.class);
+ util.exportExcel(response, list, "璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄦ暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄨ缁嗕俊鎭�
+ */
+ @PreAuthorize("@ss.hasPermi('da:paramCollectionTemp:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(daParamCollectionTempService.selectDaParamCollectionTempById(id));
+ }
+
+ /**
+ * 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ */
+ @PreAuthorize("@ss.hasPermi('da:paramCollectionTemp:add')")
+ @Log(title = "璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody DaParamCollectionTemp daParamCollectionTemp)
+ {
+ return toAjax(daParamCollectionTempService.insertDaParamCollectionTemp(daParamCollectionTemp));
+ }
+
+ /**
+ * 淇敼璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ */
+ @PreAuthorize("@ss.hasPermi('da:paramCollectionTemp:edit')")
+ @Log(title = "璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody DaParamCollectionTemp daParamCollectionTemp)
+ {
+ return toAjax(daParamCollectionTempService.updateDaParamCollectionTemp(daParamCollectionTemp));
+ }
+
+ /**
+ * 鍒犻櫎璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ */
+ @PreAuthorize("@ss.hasPermi('da:paramCollectionTemp:remove')")
+ @Log(title = "璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(daParamCollectionTempService.deleteDaParamCollectionTempByIds(ids));
+ }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/domain/DaParamCollectionTemp.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/domain/DaParamCollectionTemp.java
new file mode 100644
index 0000000..f3bcfef
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/domain/DaParamCollectionTemp.java
@@ -0,0 +1,377 @@
+package com.jcdm.main.da.paramCollectionTemp.domain;
+
+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;
+
+import java.util.Date;
+
+/**
+ * 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄥ璞� da_param_collection_temp
+ *
+ * @author Yi
+ * @date 2024-06-13
+ */
+public class DaParamCollectionTemp 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;
+
+ /** 鍙傛暟缂栫爜 */
+ @Excel(name = "鍙傛暟缂栫爜")
+ private String paramCode;
+
+ /** 鍙傛暟鍊� */
+ @Excel(name = "鍙傛暟鍊�")
+ private String paramValue;
+
+ /** 鍙傛暟涓婇檺 */
+ @Excel(name = "鍙傛暟涓婇檺")
+ private String paramUpper;
+
+ /** 鍙傛暟涓嬮檺 */
+ @Excel(name = "鍙傛暟涓嬮檺")
+ private String paramLower;
+
+ /** 鏍囧噯鍊� */
+ @Excel(name = "鏍囧噯鍊�")
+ private String paramStandard;
+
+ /** 閲囬泦鏃堕棿 */
+ @Excel(name = "閲囬泦鏃堕棿")
+ private Date collectionTime;
+
+ /** 棰勭暀瀛楁1 */
+ @Excel(name = "棰勭暀瀛楁1")
+ private String moduleCode;
+
+ /** 棰勭暀瀛楁2 */
+ @Excel(name = "棰勭暀瀛楁2")
+ private String spareField2;
+
+ /** 鍒涘缓鐢ㄦ埛 */
+ @Excel(name = "鍒涘缓鐢ㄦ埛")
+ private String createUser;
+
+ /** 鏇存敼鐢ㄦ埛 */
+ @Excel(name = "鏇存敼鐢ㄦ埛")
+ private String updateUser;
+
+ /** 鐘舵�侊紙1鍚堟牸銆�2涓嶅悎鏍硷級 */
+ @Excel(name = "鐘舵��", readConverterExp = "1=鍚堟牸銆�2涓嶅悎鏍�")
+ private String state;
+
+ /** 鍙傛暟鍚嶇О */
+ @Excel(name = "鍙傛暟鍚嶇О")
+ private String paramName;
+
+ /** 鍗曚綅 */
+ @Excel(name = "鍗曚綅")
+ private String unit;
+
+ /** 绫诲瀷 */
+ @Excel(name = "绫诲瀷")
+ private String type;
+
+ /** 鍙傛暟闆嗙紪鐮� */
+ @Excel(name = "鍙傛暟闆嗙紪鐮�")
+ private String parameterSetCode;
+
+ /** 鍙傛暟闆嗗悕绉� */
+ @Excel(name = "鍙傛暟闆嗗悕绉�")
+ private String parameterSetName;
+
+ /** 宸ュ簭缂栧彿 */
+ @Excel(name = "宸ュ簭缂栧彿")
+ private String processesCode;
+
+ /** 宸ュ簭鍚嶇О */
+ @Excel(name = "宸ュ簭鍚嶇О")
+ private String processesName;
+
+ 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 setParamCode(String paramCode)
+ {
+ this.paramCode = paramCode;
+ }
+
+ public String getParamCode()
+ {
+ return paramCode;
+ }
+ public void setParamValue(String paramValue)
+ {
+ this.paramValue = paramValue;
+ }
+
+ public String getParamValue()
+ {
+ return paramValue;
+ }
+ public void setParamUpper(String paramUpper)
+ {
+ this.paramUpper = paramUpper;
+ }
+
+ public String getParamUpper()
+ {
+ return paramUpper;
+ }
+ public void setParamLower(String paramLower)
+ {
+ this.paramLower = paramLower;
+ }
+
+ public String getParamLower()
+ {
+ return paramLower;
+ }
+ public void setParamStandard(String paramStandard)
+ {
+ this.paramStandard = paramStandard;
+ }
+
+ public String getParamStandard()
+ {
+ return paramStandard;
+ }
+ public void setCollectionTime(Date collectionTime)
+ {
+ this.collectionTime = collectionTime;
+ }
+
+ public Date getCollectionTime()
+ {
+ return collectionTime;
+ }
+ public void setModuleCode(String moduleCode)
+ {
+ this.moduleCode = moduleCode;
+ }
+
+ public String getModuleCode()
+ {
+ return moduleCode;
+ }
+ 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 setState(String state)
+ {
+ this.state = state;
+ }
+
+ public String getState()
+ {
+ return state;
+ }
+ public void setParamName(String paramName)
+ {
+ this.paramName = paramName;
+ }
+
+ public String getParamName()
+ {
+ return paramName;
+ }
+ public void setUnit(String unit)
+ {
+ this.unit = unit;
+ }
+
+ public String getUnit()
+ {
+ return unit;
+ }
+ public void setType(String type)
+ {
+ this.type = type;
+ }
+
+ public String getType()
+ {
+ return type;
+ }
+ public void setParameterSetCode(String parameterSetCode)
+ {
+ this.parameterSetCode = parameterSetCode;
+ }
+
+ public String getParameterSetCode()
+ {
+ return parameterSetCode;
+ }
+ public void setParameterSetName(String parameterSetName)
+ {
+ this.parameterSetName = parameterSetName;
+ }
+
+ public String getParameterSetName()
+ {
+ return parameterSetName;
+ }
+ public void setProcessesCode(String processesCode)
+ {
+ this.processesCode = processesCode;
+ }
+
+ public String getProcessesCode()
+ {
+ return processesCode;
+ }
+ public void setProcessesName(String processesName)
+ {
+ this.processesName = processesName;
+ }
+
+ public String getProcessesName()
+ {
+ return processesName;
+ }
+
+ @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("paramCode", getParamCode())
+ .append("paramValue", getParamValue())
+ .append("paramUpper", getParamUpper())
+ .append("paramLower", getParamLower())
+ .append("paramStandard", getParamStandard())
+ .append("collectionTime", getCollectionTime())
+ .append("moduleCode", getModuleCode())
+ .append("spareField2", getSpareField2())
+ .append("createUser", getCreateUser())
+ .append("createTime", getCreateTime())
+ .append("updateUser", getUpdateUser())
+ .append("updateTime", getUpdateTime())
+ .append("state", getState())
+ .append("paramName", getParamName())
+ .append("unit", getUnit())
+ .append("type", getType())
+ .append("parameterSetCode", getParameterSetCode())
+ .append("parameterSetName", getParameterSetName())
+ .append("processesCode", getProcessesCode())
+ .append("processesName", getProcessesName())
+ .toString();
+ }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/mapper/DaParamCollectionTempMapper.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/mapper/DaParamCollectionTempMapper.java
new file mode 100644
index 0000000..4947b6f
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/mapper/DaParamCollectionTempMapper.java
@@ -0,0 +1,63 @@
+package com.jcdm.main.da.paramCollectionTemp.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jcdm.main.da.paramCollectionTemp.domain.DaParamCollectionTemp;
+
+/**
+ * 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛∕apper鎺ュ彛
+ *
+ * @author Yi
+ * @date 2024-06-13
+ */
+public interface DaParamCollectionTempMapper extends BaseMapper<DaParamCollectionTemp>
+{
+ /**
+ * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param id 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ富閿�
+ * @return 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ */
+ public DaParamCollectionTemp selectDaParamCollectionTempById(Long id);
+
+ /**
+ * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄥ垪琛�
+ *
+ * @param daParamCollectionTemp 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ * @return 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄩ泦鍚�
+ */
+ public List<DaParamCollectionTemp> selectDaParamCollectionTempList(DaParamCollectionTemp daParamCollectionTemp);
+
+ /**
+ * 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param daParamCollectionTemp 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ * @return 缁撴灉
+ */
+ public int insertDaParamCollectionTemp(DaParamCollectionTemp daParamCollectionTemp);
+
+ /**
+ * 淇敼璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param daParamCollectionTemp 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ * @return 缁撴灉
+ */
+ public int updateDaParamCollectionTemp(DaParamCollectionTemp daParamCollectionTemp);
+
+ /**
+ * 鍒犻櫎璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param id 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ富閿�
+ * @return 缁撴灉
+ */
+ public int deleteDaParamCollectionTempById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteDaParamCollectionTempByIds(Long[] ids);
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java
new file mode 100644
index 0000000..293326a
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java
@@ -0,0 +1,63 @@
+package com.jcdm.main.da.paramCollectionTemp.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jcdm.main.da.paramCollectionTemp.domain.DaParamCollectionTemp;
+
+/**
+ * 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛⊿ervice鎺ュ彛
+ *
+ * @author Yi
+ * @date 2024-06-13
+ */
+public interface IDaParamCollectionTempService extends IService<DaParamCollectionTemp>
+{
+ /**
+ * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param id 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ富閿�
+ * @return 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ */
+ public DaParamCollectionTemp selectDaParamCollectionTempById(Long id);
+
+ /**
+ * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄥ垪琛�
+ *
+ * @param daParamCollectionTemp 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ * @return 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄩ泦鍚�
+ */
+ public List<DaParamCollectionTemp> selectDaParamCollectionTempList(DaParamCollectionTemp daParamCollectionTemp);
+
+ /**
+ * 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param daParamCollectionTemp 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ * @return 缁撴灉
+ */
+ public int insertDaParamCollectionTemp(DaParamCollectionTemp daParamCollectionTemp);
+
+ /**
+ * 淇敼璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param daParamCollectionTemp 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ * @return 缁撴灉
+ */
+ public int updateDaParamCollectionTemp(DaParamCollectionTemp daParamCollectionTemp);
+
+ /**
+ * 鎵归噺鍒犻櫎璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deleteDaParamCollectionTempByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ俊鎭�
+ *
+ * @param id 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ富閿�
+ * @return 缁撴灉
+ */
+ public int deleteDaParamCollectionTempById(Long id);
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java
new file mode 100644
index 0000000..e233f0e
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java
@@ -0,0 +1,101 @@
+package com.jcdm.main.da.paramCollectionTemp.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jcdm.common.utils.DateUtils;
+import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
+import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
+import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.jcdm.main.da.paramCollectionTemp.mapper.DaParamCollectionTempMapper;
+import com.jcdm.main.da.paramCollectionTemp.domain.DaParamCollectionTemp;
+import com.jcdm.main.da.paramCollectionTemp.service.IDaParamCollectionTempService;
+
+/**
+ * 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛⊿ervice涓氬姟灞傚鐞�
+ *
+ * @author Yi
+ * @date 2024-06-13
+ */
+@Service
+public class DaParamCollectionTempServiceImpl extends ServiceImpl<DaParamCollectionTempMapper, DaParamCollectionTemp> implements IDaParamCollectionTempService
+{
+ @Autowired
+ private DaParamCollectionTempMapper daParamCollectionTempMapper;
+
+ /**
+ * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param id 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ富閿�
+ * @return 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ */
+ @Override
+ public DaParamCollectionTemp selectDaParamCollectionTempById(Long id)
+ {
+ return daParamCollectionTempMapper.selectDaParamCollectionTempById(id);
+ }
+
+ /**
+ * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄥ垪琛�
+ *
+ * @param daParamCollectionTemp 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ * @return 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ */
+ @Override
+ public List<DaParamCollectionTemp> selectDaParamCollectionTempList(DaParamCollectionTemp daParamCollectionTemp)
+ {
+ return daParamCollectionTempMapper.selectDaParamCollectionTempList(daParamCollectionTemp);
+ }
+
+ /**
+ * 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param daParamCollectionTemp 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertDaParamCollectionTemp(DaParamCollectionTemp daParamCollectionTemp)
+ {
+ daParamCollectionTemp.setCreateTime(DateUtils.getNowDate());
+ return daParamCollectionTempMapper.insertDaParamCollectionTemp(daParamCollectionTemp);
+ }
+
+ /**
+ * 淇敼璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param daParamCollectionTemp 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateDaParamCollectionTemp(DaParamCollectionTemp daParamCollectionTemp)
+ {
+ daParamCollectionTemp.setUpdateTime(DateUtils.getNowDate());
+ return daParamCollectionTempMapper.updateDaParamCollectionTemp(daParamCollectionTemp);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteDaParamCollectionTempByIds(Long[] ids)
+ {
+ return daParamCollectionTempMapper.deleteDaParamCollectionTempByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ俊鎭�
+ *
+ * @param id 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteDaParamCollectionTempById(Long id)
+ {
+ return daParamCollectionTempMapper.deleteDaParamCollectionTempById(id);
+ }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index dca43ce..99ba9d3 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -527,13 +527,22 @@
try {
value = Float.parseFloat(part); // 灏濊瘯灏嗗瓧绗︿覆杞崲涓烘诞鐐规暟
String replacement;
- if (value == 1f) {
+ if(i<2){
+ replacement = part;
+ }else{
+ if (value == 1f) {
+ replacement = "OK";
+ } else{
+ replacement = "NG";
+ }
+ }
+ /* if (value == 1f) {
replacement = "OK";
} else if (value == 2f) {
replacement = "NG";
} else {
replacement = part; // 濡傛灉涓嶆槸1鎴�2锛屽垯淇濇寔涓嶅彉
- }
+ }*/
sb.append(replacement);
if (i < parts.length - 1) {
sb.append(','); // 娣诲姞閫楀彿锛堥櫎浜嗘渶鍚庝竴涓厓绱狅級
@@ -604,6 +613,8 @@
}
daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections);
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
+ logger.info("宸ヤ綅{}鍥炲21",device);
+
return "21";
}else {
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
diff --git a/jcdm-main/src/main/resources/mapper/da/paramCollectionTemp/DaParamCollectionTempMapper.xml b/jcdm-main/src/main/resources/mapper/da/paramCollectionTemp/DaParamCollectionTempMapper.xml
new file mode 100644
index 0000000..3bbb7b4
--- /dev/null
+++ b/jcdm-main/src/main/resources/mapper/da/paramCollectionTemp/DaParamCollectionTempMapper.xml
@@ -0,0 +1,179 @@
+<?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.paramCollectionTemp.mapper.DaParamCollectionTempMapper">
+
+ <resultMap type="DaParamCollectionTemp" id="DaParamCollectionTempResult">
+ <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="paramCode" column="param_code" />
+ <result property="paramValue" column="param_value" />
+ <result property="paramUpper" column="param_upper" />
+ <result property="paramLower" column="param_lower" />
+ <result property="paramStandard" column="param_standard" />
+ <result property="collectionTime" column="collection_time" />
+ <result property="moduleCode" column="module_code" />
+ <result property="spareField2" column="spare_field2" />
+ <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="state" column="state" />
+ <result property="paramName" column="param_name" />
+ <result property="unit" column="unit" />
+ <result property="type" column="type" />
+ <result property="parameterSetCode" column="parameter_set_code" />
+ <result property="parameterSetName" column="parameter_set_name" />
+ <result property="processesCode" column="processes_code" />
+ <result property="processesName" column="processes_name" />
+ </resultMap>
+
+ <sql id="selectDaParamCollectionTempVo">
+ select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, module_code, spare_field2, create_user, create_time, update_user, update_time, state, param_name, unit, type, parameter_set_code, parameter_set_name, processes_code, processes_name from da_param_collection_temp
+ </sql>
+
+ <select id="selectDaParamCollectionTempList" parameterType="DaParamCollectionTemp" resultMap="DaParamCollectionTempResult">
+ <include refid="selectDaParamCollectionTempVo"/>
+ <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="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
+ <if test="paramValue != null and paramValue != ''"> and param_value = #{paramValue}</if>
+ <if test="paramUpper != null and paramUpper != ''"> and param_upper = #{paramUpper}</if>
+ <if test="paramLower != null and paramLower != ''"> and param_lower = #{paramLower}</if>
+ <if test="paramStandard != null and paramStandard != ''"> and param_standard = #{paramStandard}</if>
+ <if test="collectionTime != null and collectionTime != ''"> and collection_time = #{collectionTime}</if>
+ <if test="moduleCode != null and moduleCode != ''"> and module_code = #{moduleCode}</if>
+ <if test="spareField2 != null and spareField2 != ''"> and spare_field2 = #{spareField2}</if>
+ <if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
+ <if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
+ <if test="state != null and state != ''"> and state = #{state}</if>
+ <if test="paramName != null and paramName != ''"> and param_name like concat('%', #{paramName}, '%')</if>
+ <if test="unit != null and unit != ''"> and unit = #{unit}</if>
+ <if test="type != null and type != ''"> and type = #{type}</if>
+ <if test="parameterSetCode != null and parameterSetCode != ''"> and parameter_set_code = #{parameterSetCode}</if>
+ <if test="parameterSetName != null and parameterSetName != ''"> and parameter_set_name like concat('%', #{parameterSetName}, '%')</if>
+ <if test="processesCode != null and processesCode != ''"> and processes_code = #{processesCode}</if>
+ <if test="processesName != null and processesName != ''"> and processes_name like concat('%', #{processesName}, '%')</if>
+ </where>
+ </select>
+
+ <select id="selectDaParamCollectionTempById" parameterType="Long" resultMap="DaParamCollectionTempResult">
+ <include refid="selectDaParamCollectionTempVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertDaParamCollectionTemp" parameterType="DaParamCollectionTemp" useGeneratedKeys="true" keyProperty="id">
+ insert into da_param_collection_temp
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <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="paramCode != null">param_code,</if>
+ <if test="paramValue != null">param_value,</if>
+ <if test="paramUpper != null">param_upper,</if>
+ <if test="paramLower != null">param_lower,</if>
+ <if test="paramStandard != null">param_standard,</if>
+ <if test="collectionTime != null">collection_time,</if>
+ <if test="moduleCode != null">module_code,</if>
+ <if test="spareField2 != null">spare_field2,</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="state != null">state,</if>
+ <if test="paramName != null">param_name,</if>
+ <if test="unit != null">unit,</if>
+ <if test="type != null">type,</if>
+ <if test="parameterSetCode != null">parameter_set_code,</if>
+ <if test="parameterSetName != null">parameter_set_name,</if>
+ <if test="processesCode != null">processes_code,</if>
+ <if test="processesName != null">processes_name,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <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="paramCode != null">#{paramCode},</if>
+ <if test="paramValue != null">#{paramValue},</if>
+ <if test="paramUpper != null">#{paramUpper},</if>
+ <if test="paramLower != null">#{paramLower},</if>
+ <if test="paramStandard != null">#{paramStandard},</if>
+ <if test="collectionTime != null">#{collectionTime},</if>
+ <if test="moduleCode != null">#{moduleCode},</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="state != null">#{state},</if>
+ <if test="paramName != null">#{paramName},</if>
+ <if test="unit != null">#{unit},</if>
+ <if test="type != null">#{type},</if>
+ <if test="parameterSetCode != null">#{parameterSetCode},</if>
+ <if test="parameterSetName != null">#{parameterSetName},</if>
+ <if test="processesCode != null">#{processesCode},</if>
+ <if test="processesName != null">#{processesName},</if>
+ </trim>
+ </insert>
+
+ <update id="updateDaParamCollectionTemp" parameterType="DaParamCollectionTemp">
+ update da_param_collection_temp
+ <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="paramCode != null">param_code = #{paramCode},</if>
+ <if test="paramValue != null">param_value = #{paramValue},</if>
+ <if test="paramUpper != null">param_upper = #{paramUpper},</if>
+ <if test="paramLower != null">param_lower = #{paramLower},</if>
+ <if test="paramStandard != null">param_standard = #{paramStandard},</if>
+ <if test="collectionTime != null">collection_time = #{collectionTime},</if>
+ <if test="moduleCode != null">module_code = #{moduleCode},</if>
+ <if test="spareField2 != null">spare_field2 = #{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="state != null">state = #{state},</if>
+ <if test="paramName != null">param_name = #{paramName},</if>
+ <if test="unit != null">unit = #{unit},</if>
+ <if test="type != null">type = #{type},</if>
+ <if test="parameterSetCode != null">parameter_set_code = #{parameterSetCode},</if>
+ <if test="parameterSetName != null">parameter_set_name = #{parameterSetName},</if>
+ <if test="processesCode != null">processes_code = #{processesCode},</if>
+ <if test="processesName != null">processes_name = #{processesName},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteDaParamCollectionTempById" parameterType="Long">
+ delete from da_param_collection_temp where id = #{id}
+ </delete>
+
+ <delete id="deleteDaParamCollectionTempByIds" parameterType="String">
+ delete from da_param_collection_temp where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/jcdm-ui/src/api/main/da/paramCollectionTemp/paramCollectionTemp.js b/jcdm-ui/src/api/main/da/paramCollectionTemp/paramCollectionTemp.js
new file mode 100644
index 0000000..3130e55
--- /dev/null
+++ b/jcdm-ui/src/api/main/da/paramCollectionTemp/paramCollectionTemp.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄥ垪琛�
+export function listParamCollectionTemp(query) {
+ return request({
+ url: '/da/paramCollectionTemp/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄨ缁�
+export function getParamCollectionTemp(id) {
+ return request({
+ url: '/da/paramCollectionTemp/' + id,
+ method: 'get'
+ })
+}
+
+// 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+export function addParamCollectionTemp(data) {
+ return request({
+ url: '/da/paramCollectionTemp',
+ method: 'post',
+ data: data
+ })
+}
+
+// 淇敼璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+export function updateParamCollectionTemp(data) {
+ return request({
+ url: '/da/paramCollectionTemp',
+ method: 'put',
+ data: data
+ })
+}
+
+// 鍒犻櫎璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�
+export function delParamCollectionTemp(id) {
+ return request({
+ url: '/da/paramCollectionTemp/' + id,
+ method: 'delete'
+ })
+}
diff --git a/jcdm-ui/src/views/main/da/paramCollectionTemp/index.vue b/jcdm-ui/src/views/main/da/paramCollectionTemp/index.vue
new file mode 100644
index 0000000..d4c37eb
--- /dev/null
+++ b/jcdm-ui/src/views/main/da/paramCollectionTemp/index.vue
@@ -0,0 +1,587 @@
+<template>
+ <div class="app-container">
+ <el-card class="box-card">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="宸ュ崟缂栧彿" prop="workOrderNo">
+ <el-input
+ v-model="queryParams.workOrderNo"
+ placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鎬绘垚搴忓垪鍙�" prop="sfcCode">
+ <el-input
+ v-model="queryParams.sfcCode"
+ placeholder="璇疯緭鍏ユ�绘垚搴忓垪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="浜у搧缂栧彿" prop="productCode">
+ <el-input
+ v-model="queryParams.productCode"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="浜х嚎缂栧彿" prop="productionLine">
+ <el-input
+ v-model="queryParams.productionLine"
+ placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="宸ヤ綅缂栧彿" prop="locationCode">
+ <el-input
+ v-model="queryParams.locationCode"
+ placeholder="璇疯緭鍏ュ伐浣嶇紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="璁惧缂栧彿" prop="equipmentNo">
+ <el-input
+ v-model="queryParams.equipmentNo"
+ placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟缂栫爜" prop="paramCode">
+ <el-input
+ v-model="queryParams.paramCode"
+ placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟鍊�" prop="paramValue">
+ <el-input
+ v-model="queryParams.paramValue"
+ placeholder="璇疯緭鍏ュ弬鏁板��"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟涓婇檺" prop="paramUpper">
+ <el-input
+ v-model="queryParams.paramUpper"
+ placeholder="璇疯緭鍏ュ弬鏁颁笂闄�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟涓嬮檺" prop="paramLower">
+ <el-input
+ v-model="queryParams.paramLower"
+ placeholder="璇疯緭鍏ュ弬鏁颁笅闄�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鏍囧噯鍊�" prop="paramStandard">
+ <el-input
+ v-model="queryParams.paramStandard"
+ placeholder="璇疯緭鍏ユ爣鍑嗗��"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁1" prop="moduleCode">
+ <el-input
+ v-model="queryParams.moduleCode"
+ placeholder="璇疯緭鍏ラ鐣欏瓧娈�1"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁2" prop="spareField2">
+ <el-input
+ v-model="queryParams.spareField2"
+ placeholder="璇疯緭鍏ラ鐣欏瓧娈�2"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
+ <el-input
+ v-model="queryParams.createUser"
+ placeholder="璇疯緭鍏ュ垱寤虹敤鎴�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
+ <el-input
+ v-model="queryParams.updateUser"
+ placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="state">
+ <el-input
+ v-model="queryParams.state"
+ placeholder="璇疯緭鍏ョ姸鎬�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟鍚嶇О" prop="paramName">
+ <el-input
+ v-model="queryParams.paramName"
+ placeholder="璇疯緭鍏ュ弬鏁板悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input
+ v-model="queryParams.unit"
+ placeholder="璇疯緭鍏ュ崟浣�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟闆嗙紪鐮�" prop="parameterSetCode">
+ <el-input
+ v-model="queryParams.parameterSetCode"
+ placeholder="璇疯緭鍏ュ弬鏁伴泦缂栫爜"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟闆嗗悕绉�" prop="parameterSetName">
+ <el-input
+ v-model="queryParams.parameterSetName"
+ placeholder="璇疯緭鍏ュ弬鏁伴泦鍚嶇О"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
+ <el-input
+ v-model="queryParams.processesCode"
+ placeholder="璇疯緭鍏ュ伐搴忕紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="宸ュ簭鍚嶇О" prop="processesName">
+ <el-input
+ v-model="queryParams.processesName"
+ placeholder="璇疯緭鍏ュ伐搴忓悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item style="float: right">
+ <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-card>
+
+ <el-card style="margin-top: 10px" class="box-card">
+ <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:paramCollectionTemp: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:paramCollectionTemp: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:paramCollectionTemp: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:paramCollectionTemp:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table border v-loading="loading" :data="paramCollectionTempList" @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">
+ </el-table-column>
+ <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode">
+ </el-table-column>
+ <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
+ </el-table-column>
+ <el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine">
+ </el-table-column>
+ <el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
+ </el-table-column>
+ <el-table-column label="璁惧缂栧彿" align="center" prop="equipmentNo">
+ </el-table-column>
+ <el-table-column label="鍙傛暟缂栫爜" align="center" prop="paramCode">
+ </el-table-column>
+ <el-table-column label="鍙傛暟鍊�" align="center" prop="paramValue">
+ </el-table-column>
+ <el-table-column label="鍙傛暟涓婇檺" align="center" prop="paramUpper">
+ </el-table-column>
+ <el-table-column label="鍙傛暟涓嬮檺" align="center" prop="paramLower">
+ </el-table-column>
+ <el-table-column label="鏍囧噯鍊�" align="center" prop="paramStandard">
+ </el-table-column>
+ <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime">
+ </el-table-column>
+ <el-table-column label="棰勭暀瀛楁1" align="center" prop="moduleCode">
+ </el-table-column>
+ <el-table-column label="棰勭暀瀛楁2" align="center" prop="spareField2">
+ </el-table-column>
+ <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">
+ </el-table-column>
+ <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">
+ </el-table-column>
+ <el-table-column label="鐘舵��" align="center" prop="state">
+ </el-table-column>
+ <el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName">
+ </el-table-column>
+ <el-table-column label="鍗曚綅" align="center" prop="unit">
+ </el-table-column>
+ <el-table-column label="绫诲瀷" align="center" prop="type">
+ </el-table-column>
+ <el-table-column label="鍙傛暟闆嗙紪鐮�" align="center" prop="parameterSetCode">
+ </el-table-column>
+ <el-table-column label="鍙傛暟闆嗗悕绉�" align="center" prop="parameterSetName">
+ </el-table-column>
+ <el-table-column label="宸ュ簭缂栧彿" align="center" prop="processesCode">
+ </el-table-column>
+ <el-table-column label="宸ュ簭鍚嶇О" align="center" prop="processesName">
+ </el-table-column>
+ <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="success"
+ plain
+ style="width: 72px"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['da:paramCollectionTemp:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="danger"
+ plain
+ style="width: 72px"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['da:paramCollectionTemp:remove']"
+ >鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
+
+ <!-- 娣诲姞鎴栦慨鏀硅澶囦骇鍝佽繃绋嬪弬鏁伴噰闆嗕复鏃惰〃瀵硅瘽妗� -->
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+ <span slot="title">
+ <i class="el-icon-s-order"></i>
+ {{titleName}}
+ </span>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="宸ュ崟缂栧彿" prop="workOrderNo">
+ <el-input v-model="form.workOrderNo" placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�" />
+ </el-form-item>
+ <el-form-item label="鎬绘垚搴忓垪鍙�" prop="sfcCode">
+ <el-input v-model="form.sfcCode" placeholder="璇疯緭鍏ユ�绘垚搴忓垪鍙�" />
+ </el-form-item>
+ <el-form-item label="浜у搧缂栧彿" prop="productCode">
+ <el-input v-model="form.productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" />
+ </el-form-item>
+ <el-form-item label="浜х嚎缂栧彿" prop="productionLine">
+ <el-input v-model="form.productionLine" placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�" />
+ </el-form-item>
+ <el-form-item label="宸ヤ綅缂栧彿" prop="locationCode">
+ <el-input v-model="form.locationCode" placeholder="璇疯緭鍏ュ伐浣嶇紪鍙�" />
+ </el-form-item>
+ <el-form-item label="璁惧缂栧彿" prop="equipmentNo">
+ <el-input v-model="form.equipmentNo" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟缂栫爜" prop="paramCode">
+ <el-input v-model="form.paramCode" placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟鍊�" prop="paramValue">
+ <el-input v-model="form.paramValue" placeholder="璇疯緭鍏ュ弬鏁板��" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟涓婇檺" prop="paramUpper">
+ <el-input v-model="form.paramUpper" placeholder="璇疯緭鍏ュ弬鏁颁笂闄�" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟涓嬮檺" prop="paramLower">
+ <el-input v-model="form.paramLower" placeholder="璇疯緭鍏ュ弬鏁颁笅闄�" />
+ </el-form-item>
+ <el-form-item label="鏍囧噯鍊�" prop="paramStandard">
+ <el-input v-model="form.paramStandard" placeholder="璇疯緭鍏ユ爣鍑嗗��" />
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁1" prop="moduleCode">
+ <el-input v-model="form.moduleCode" placeholder="璇疯緭鍏ラ鐣欏瓧娈�1" />
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁2" prop="spareField2">
+ <el-input v-model="form.spareField2" placeholder="璇疯緭鍏ラ鐣欏瓧娈�2" />
+ </el-form-item>
+ <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
+ <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />
+ </el-form-item>
+ <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
+ <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="state">
+ <el-input v-model="form.state" placeholder="璇疯緭鍏ョ姸鎬�" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟鍚嶇О" prop="paramName">
+ <el-input v-model="form.paramName" placeholder="璇疯緭鍏ュ弬鏁板悕绉�" />
+ </el-form-item>
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟闆嗙紪鐮�" prop="parameterSetCode">
+ <el-input v-model="form.parameterSetCode" placeholder="璇疯緭鍏ュ弬鏁伴泦缂栫爜" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟闆嗗悕绉�" prop="parameterSetName">
+ <el-input v-model="form.parameterSetName" placeholder="璇疯緭鍏ュ弬鏁伴泦鍚嶇О" />
+ </el-form-item>
+ <el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
+ <el-input v-model="form.processesCode" placeholder="璇疯緭鍏ュ伐搴忕紪鍙�" />
+ </el-form-item>
+ <el-form-item label="宸ュ簭鍚嶇О" prop="processesName">
+ <el-input v-model="form.processesName" 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 { listParamCollectionTemp, getParamCollectionTemp, delParamCollectionTemp, addParamCollectionTemp, updateParamCollectionTemp } from "@/api/main/da/paramCollectionTemp/paramCollectionTemp";
+
+export default {
+ name: "ParamCollectionTemp",
+ data() {
+ return {
+ // 閬僵灞�
+ loading: true,
+ titleName: "",
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄨ〃鏍兼暟鎹�
+ paramCollectionTempList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ workOrderNo: null,
+ sfcCode: null,
+ productCode: null,
+ productionLine: null,
+ locationCode: null,
+ equipmentNo: null,
+ paramCode: null,
+ paramValue: null,
+ paramUpper: null,
+ paramLower: null,
+ paramStandard: null,
+ collectionTime: null,
+ moduleCode: null,
+ spareField2: null,
+ createUser: null,
+ updateUser: null,
+ state: null,
+ paramName: null,
+ unit: null,
+ type: null,
+ parameterSetCode: null,
+ parameterSetName: null,
+ processesCode: null,
+ processesName: null
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ id: [
+ { required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ }
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ /** 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄥ垪琛� */
+ getList() {
+ this.loading = true;
+ listParamCollectionTemp(this.queryParams).then(response => {
+ this.paramCollectionTempList = 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,
+ paramCode: null,
+ paramValue: null,
+ paramUpper: null,
+ paramLower: null,
+ paramStandard: null,
+ collectionTime: null,
+ moduleCode: null,
+ spareField2: null,
+ createUser: null,
+ createTime: null,
+ updateUser: null,
+ updateTime: null,
+ state: null,
+ paramName: null,
+ unit: null,
+ type: null,
+ parameterSetCode: null,
+ parameterSetName: null,
+ processesCode: null,
+ processesName: 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.titleName = "娣诲姞璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�";
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getParamCollectionTemp(id).then(response => {
+ this.form = response.data;
+ this.open = true;
+ this.titleName = "淇敼璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛�";
+ });
+ },
+ /** 鎻愪氦鎸夐挳 */
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ if (this.form.id != null) {
+ updateParamCollectionTemp(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addParamCollectionTemp(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 delParamCollectionTemp(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('da/paramCollectionTemp/export', {
+ ...this.queryParams
+ }, `paramCollectionTemp_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
--
Gitblit v1.9.3