From 0994009a6d6184839359505d99fdf7be68ee1b19 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期五, 14 三月 2025 12:51:12 +0800
Subject: [PATCH] 工单界面新增按钮
---
billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java | 25 +--
billion-ui/src/views/main/da/stationCollection/index.vue | 3
billion-ui/src/views/main/da/materialCollection/index.vue | 57 --------
billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml | 9 +
billion-ui/src/views/main/da/paramCollection/index.vue | 38 -----
billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java | 12 +
billion-ui/src/views/main/om/info/index.vue | 153 +++++++++++++++++----
billion-main/src/main/java/com/billion/main/constant/Constants.java | 1
billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java | 40 ++--
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 56 ++++---
10 files changed, 208 insertions(+), 186 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/constant/Constants.java b/billion-main/src/main/java/com/billion/main/constant/Constants.java
index 7edc002..e139a37 100644
--- a/billion-main/src/main/java/com/billion/main/constant/Constants.java
+++ b/billion-main/src/main/java/com/billion/main/constant/Constants.java
@@ -10,6 +10,7 @@
public static final String TWO= "2";
public static final String RecordData= "RecordData";
public static final String WorkOrderRequest= "WorkOrderRequest";
+// public static final String TEST= "TEST";//缂哥洊涓婄嚎宸ヤ綅
public static final List<String> PLC1 = new ArrayList<>();
public static final List<String> PLC2 = new ArrayList<>();
diff --git a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
index 97396e8..3a331cf 100644
--- a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
+++ b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
@@ -38,11 +38,21 @@
private String paramValue;
- /** 閲囬泦鏃堕棿 */
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date collectTime;
+ /** 閲囬泦鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date stopTime;
+
/** 鍙傛暟鍚嶇О */
@Excel(name = "鍙傛暟鍚嶇О")
diff --git a/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java b/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java
index d009222..3f2beea 100644
--- a/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java
@@ -1,17 +1,13 @@
package com.billion.main.om.service.impl;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.billion.common.exception.ServiceException;
+import com.billion.common.utils.DateUtils;
import com.billion.main.om.domain.OmOrderScheduling;
import com.billion.main.om.mapper.OmOrderSchedulingMapper;
import com.billion.main.om.service.IOmOrderSchedulingService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.text.MessageFormat;
-import java.util.Date;
import java.util.List;
/**
@@ -59,17 +55,19 @@
@Override
public int insertOmOrderScheduling(OmOrderScheduling omOrderScheduling)
{
- List<OmOrderScheduling> list = this.list(new LambdaQueryWrapper<OmOrderScheduling>().eq(OmOrderScheduling::getSfcCode, omOrderScheduling.getSfcCode()));
- if (CollUtil.isNotEmpty(list)){
- throw new ServiceException(MessageFormat.format("宸插瓨鍦ㄦ�绘垚搴忓垪鍙蜂负{0}鐨勬暟鎹�",omOrderScheduling.getSfcCode()));
- }
+ omOrderScheduling.setUpdateTime(DateUtils.getNowDate());
+ return omOrderSchedulingMapper.updateOmOrderScheduling(omOrderScheduling);
+// List<OmOrderScheduling> list = this.list(new LambdaQueryWrapper<OmOrderScheduling>().eq(OmOrderScheduling::getSfcCode, omOrderScheduling.getSfcCode()));
+// if (CollUtil.isNotEmpty(list)){
+// throw new ServiceException(MessageFormat.format("宸插瓨鍦ㄦ�绘垚搴忓垪鍙蜂负{0}鐨勬暟鎹�",omOrderScheduling.getSfcCode()));
+// }
// LoginUser loginUser = SecurityUtils.getLoginUser();
// SysUser user = loginUser.getUser();
- omOrderScheduling.setCreateTime(new Date());
- omOrderScheduling.setUpdateTime(new Date());
+// omOrderScheduling.setCreateTime(new Date());
+// omOrderScheduling.setUpdateTime(new Date());
// omOrderScheduling.setCreateBy(user.getUserName());
// omOrderScheduling.setUpdateBy(user.getUserName());
- return omOrderSchedulingMapper.insertOmOrderScheduling(omOrderScheduling);
+// return omOrderSchedulingMapper.insertOmOrderScheduling(omOrderScheduling);
}
/**
@@ -81,17 +79,19 @@
@Override
public int updateOmOrderScheduling(OmOrderScheduling omOrderScheduling)
{
- List<OmOrderScheduling> list = this.list(new LambdaQueryWrapper<OmOrderScheduling>()
- .eq(OmOrderScheduling::getSfcCode, omOrderScheduling.getSfcCode())
- .notIn(OmOrderScheduling::getId,omOrderScheduling.getId()));
- if (CollUtil.isNotEmpty(list)){
- throw new ServiceException(MessageFormat.format("宸插瓨鍦ㄦ�绘垚搴忓垪鍙蜂负{0}鐨勬暟鎹�",omOrderScheduling.getSfcCode()));
- }
+ omOrderScheduling.setUpdateTime(DateUtils.getNowDate());
+ return omOrderSchedulingMapper.updateOmOrderScheduling(omOrderScheduling);
+// List<OmOrderScheduling> list = this.list(new LambdaQueryWrapper<OmOrderScheduling>()
+// .eq(OmOrderScheduling::getSfcCode, omOrderScheduling.getSfcCode())
+// .notIn(OmOrderScheduling::getId,omOrderScheduling.getId()));
+// if (CollUtil.isNotEmpty(list)){
+// throw new ServiceException(MessageFormat.format("宸插瓨鍦ㄦ�绘垚搴忓垪鍙蜂负{0}鐨勬暟鎹�",omOrderScheduling.getSfcCode()));
+// }
// LoginUser loginUser = SecurityUtils.getLoginUser();
// SysUser user = loginUser.getUser();
- omOrderScheduling.setUpdateTime(new Date());
+// omOrderScheduling.setUpdateTime(new Date());
// omOrderScheduling.setUpdateBy(user.getUserName());
- return omOrderSchedulingMapper.updateOmOrderScheduling(omOrderScheduling);
+// return omOrderSchedulingMapper.updateOmOrderScheduling(omOrderScheduling);
}
/**
diff --git a/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java b/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
index cd00526..42a8e86 100644
--- a/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
+++ b/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
@@ -55,7 +55,6 @@
Constants.PLC2.add(Constants.OP045);
Constants.PLC2.add(Constants.OP060);
Constants.PLC2.add(Constants.OP070);
- Constants.PLC2.add(Constants.OP070_1);
Constants.PLC2.add(Constants.OP075);
Constants.PLC2.add(Constants.OP080);
Constants.PLC2.add(Constants.OP090);
@@ -106,6 +105,7 @@
Constants.PLC4.add(Constants.OP030);
Constants.PLC4.add(Constants.OP050);
Constants.PLC4.add(Constants.OP110);
+ Constants.PLC4.add(Constants.OP070_1);
Constants.PLC4.add(Constants.OP140);
//涓婄嚎宸ヤ綅
Constants.ONLINE.add(Constants.C005);
@@ -208,19 +208,16 @@
lists.add("PLC3.OP110.RecordData");
lists.add("PLC3.OP140.RecordData");
- //TEST
- lists.add("TEST.C005.RecordData");
- lists.add("TEST.C005.WorkOrderRequest");
- lists.add("TEST.C060.RecordData");
- lists.add("TEST.OP005.RecordData");
- lists.add("TEST.OP005.WorkOrderRequest");
- lists.add("TEST.OP010.RecordData");
- lists.add("TEST.OP310.RecordData");
- lists.add("TEST.P010.RecordData");
- lists.add("TEST.P010.WorkOrderRequest");
-
-
-
+// //TEST
+// lists.add("TEST.C005.RecordData");
+// lists.add("TEST.C005.WorkOrderRequest");
+// lists.add("TEST.C060.RecordData");
+// lists.add("TEST.OP005.RecordData");
+// lists.add("TEST.OP005.WorkOrderRequest");
+// lists.add("TEST.OP010.RecordData");
+// lists.add("TEST.OP310.RecordData");
+// lists.add("TEST.P010.RecordData");
+// lists.add("TEST.P010.WorkOrderRequest");
return lists;
}
diff --git a/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java b/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
index da49e78..15e7766 100644
--- a/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
+++ b/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
@@ -134,6 +134,7 @@
OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
//涓婄嚎宸ヤ綅
+// if(Constants.ONLINE.contains(device) || Constants.TEST.equals(device) ){
if(Constants.ONLINE.contains(device)){
Object workOrderNumber = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
Object nowQty = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
@@ -158,7 +159,6 @@
ReadWriteEntity TimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");
Time = format.parse(TimeUtil.test(TimeUtil.stringProcessing(TimeRead.getValue().toString())));
omOrderScheduling.setOfflineTime(Time);
- omOrderScheduling.setStatus("2");
if(Constants.C060.equals(device)){
omOrderScheduling.setRemarks("Head");
omOrderScheduling.setSfcCode(SFCCode.toString());
@@ -171,7 +171,7 @@
if (nowQty == headQty){
UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
- updateWrapper.set("head_status", "3");
+ updateWrapper.set("head_status", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
} else if (Constants.OP310.equals(device)) {
@@ -186,7 +186,7 @@
if (nowQty == bodyQty){
UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
- updateWrapper.set("body_status", "3");
+ updateWrapper.set("body_status", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
}
@@ -206,7 +206,7 @@
if (nowQty == preQty){
UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
- updateWrapper.set("pre_status", "3");
+ updateWrapper.set("pre_status", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
}
@@ -217,21 +217,29 @@
List<DaCollectionParamConf> daCollectionParamConfList1 = daCollectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf1);
for (DaCollectionParamConf conf : daCollectionParamConfList1) {
String gatherAddress = conf.getGatherAddress();
- String valueObj = miloService.readFromOpcUa(gatherAddress).getValue().toString(); // 鑾峰彇鍘熷鍊煎璞♀��:ml-citation{ref="4" data="citationList"}
- if (!Objects.equals(valueObj, " ")) {
- DaMaterialCollection materialCollection = new DaMaterialCollection();
- materialCollection.setSfcCode(SFCCode.toString());
- materialCollection.setLocationCode(device);
- materialCollection.setParamName(conf.getParameterSetName());
- materialCollection.setParamValue(miloService.readFromOpcUa(gatherAddress).getValue().toString());
- Date Time = new Date();
- ReadWriteEntity TimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");
- Time = format.parse(TimeUtil.test(TimeUtil.stringProcessing(TimeRead.getValue().toString())));
- materialCollection.setCollectTime(Time);
- daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
- }
- else {
- log.debug("閲囬泦椤逛负绌�: {}", gatherAddress);
+
+ String valueObj = null;
+ ReadWriteEntity entity = miloService.readFromOpcUa(gatherAddress);
+ if (entity != null) {
+ Object value = entity.getValue();
+ if (value != null) {
+ valueObj = value.toString(); // 鏈�缁堣祴鍊�
+ if (!Objects.equals(valueObj, " ")) {
+ DaMaterialCollection materialCollection = new DaMaterialCollection();
+ materialCollection.setSfcCode(SFCCode.toString());
+ materialCollection.setLocationCode(device);
+ materialCollection.setParamName(conf.getParameterSetName());
+ materialCollection.setParamValue(miloService.readFromOpcUa(gatherAddress).getValue().toString());
+ Date Time = new Date();
+ ReadWriteEntity TimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");
+ Time = format.parse(TimeUtil.test(TimeUtil.stringProcessing(TimeRead.getValue().toString())));
+ materialCollection.setCollectTime(Time);
+ daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
+ }
+ else {
+ log.debug("閲囬泦椤逛负绌�: {}", gatherAddress);
+ }
+ }
}
}
// 鏌ヨdescriptive瀛楁绛変簬2鐨勯噰闆嗛」淇濆瓨鍒版壂鐮佷繚瀛樺埌da_param_collection琛ㄩ噷
@@ -280,6 +288,7 @@
log.error(e.getMessage());
}
}
+
//棣栧伐绔欎笅鍙戝伐鍗�,骞剁敓鎴怱N鐮�
private static final String[] MONTH = {"A","B","C","D","E","F","G","H","I","J","K","L"};
public void plackWorkOrder(String thoroughfare, String device, String tab, String valueString) {
@@ -334,7 +343,8 @@
if (Objects.equals(getBodyOrder2.getBodyQty(), getBodyOrder2.getPlanQty())){
omProductionOrderInfoService.updateBodyStatus2();
}
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getBodyOrder2.getBodyQty()).build());
+ String PalletID = getBodyOrder2.getBodyQty().toString();
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(PalletID).build());
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(11).build());
}
else{
@@ -386,7 +396,8 @@
if (Objects.equals(getHeadOrder2.getHeadQty(), getHeadOrder2.getPlanQty())){
omProductionOrderInfoService.updateHeadStatus2();
}
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getHeadOrder2.getHeadQty()).build());
+ String PalletID = getHeadOrder2.getHeadQty().toString();
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(PalletID).build());
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(11).build());
}
else{
@@ -437,7 +448,8 @@
if (Objects.equals(getPreOrder2.getPreQty(), getPreOrder2.getPlanQty())){
omProductionOrderInfoService.updatePreStatus2();
}
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getPreOrder2.getPreQty()).build());
+ String PalletID = getPreOrder2.getPreQty().toString();
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(PalletID).build());
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(11).build());
}
else{
diff --git a/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml b/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
index b529c21..f0705b9 100644
--- a/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
+++ b/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
@@ -41,6 +41,7 @@
SELECT TOP 1 *
FROM om_production_order_info
WHERE body_status IN (0,1)
+ AND body_qty != plan_qty
ORDER BY plan_start_time ASC
</select>
<select id="updateBodyStatus1" resultType="OmProductionOrderInfo">
@@ -68,6 +69,7 @@
SELECT TOP 1 *
FROM om_production_order_info
WHERE head_status IN (0,1)
+ AND head_qty != plan_qty
ORDER BY plan_start_time ASC
</select>
<select id="updateHeadStatus1" resultType="OmProductionOrderInfo">
@@ -95,6 +97,7 @@
SELECT TOP 1 *
FROM om_production_order_info
WHERE pre_status IN (0,1)
+ AND pre_qty != plan_qty
ORDER BY plan_start_time ASC
</select>
<select id="updatePreStatus1" resultType="OmProductionOrderInfo">
@@ -188,6 +191,12 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
+ <if test="bodyQty != null">body_qty = #{bodyQty},</if>
+ <if test="headQty != null">head_qty = #{headQty},</if>
+ <if test="preQty != null">pre_qty = #{preQty},</if>
+ <if test="bodyStatus != null">body_status = #{bodyStatus},</if>
+ <if test="headStatus != null">head_status = #{headStatus},</if>
+ <if test="preStatus != null">pre_status = #{preStatus},</if>
</trim>
where id = #{id}
</update>
diff --git a/billion-ui/src/views/main/da/materialCollection/index.vue b/billion-ui/src/views/main/da/materialCollection/index.vue
index fb4891a..bea8161 100644
--- a/billion-ui/src/views/main/da/materialCollection/index.vue
+++ b/billion-ui/src/views/main/da/materialCollection/index.vue
@@ -19,30 +19,6 @@
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</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="paramCode">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.paramCode"-->
-<!-- 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 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>
@@ -50,38 +26,6 @@
</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:materialCollection: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:materialCollection: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:materialCollection:remove']"-->
-<!-- >鍒犻櫎</el-button>-->
-<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -99,7 +43,6 @@
<!-- <el-table-column label="涓婚敭id" align="center" prop="id" />-->
<el-table-column label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode" />
<el-table-column label="宸ヤ綅缂栫爜" align="center" prop="locationCode" />
- <el-table-column label="鍙傛暟缂栫爜" align="center" prop="paramCode" />
<el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName" />
<el-table-column label="鍙傛暟鍊�" align="center" prop="paramValue" />
<el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectTime" width="180">
diff --git a/billion-ui/src/views/main/da/paramCollection/index.vue b/billion-ui/src/views/main/da/paramCollection/index.vue
index f42a756..2b2ca21 100644
--- a/billion-ui/src/views/main/da/paramCollection/index.vue
+++ b/billion-ui/src/views/main/da/paramCollection/index.vue
@@ -9,9 +9,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label-width="120" label="閲囬泦鏃堕棿" prop="timeQuery">
+ <el-form-item label-width="120" label="閲囬泦鏃堕棿" prop="collectTime">
<el-date-picker
- v-model="queryParams.timeQuery"
+ v-model="queryParams.collectTime"
type="datetimerange"
range-separator="鑷�"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -61,38 +61,6 @@
</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:paramCollection: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:paramCollection: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:paramCollection:remove']"-->
-<!-- >鍒犻櫎</el-button>-->
-<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -108,10 +76,8 @@
<el-table v-loading="loading" border :data="paramCollectionList" @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="sfcCode" />
<el-table-column label="宸ヤ綅缂栫爜" align="center" prop="locationCode" />
- <el-table-column label="鍙傛暟缂栫爜" align="center" prop="paramCode" />
<el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName" />
<el-table-column label="鍙傛暟鍊�" align="center" prop="paramValue" />
<el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectTime" width="180">
diff --git a/billion-ui/src/views/main/da/stationCollection/index.vue b/billion-ui/src/views/main/da/stationCollection/index.vue
index a6a07b2..f73aa20 100644
--- a/billion-ui/src/views/main/da/stationCollection/index.vue
+++ b/billion-ui/src/views/main/da/stationCollection/index.vue
@@ -94,14 +94,13 @@
<el-table border v-loading="loading" :data="daStationCollectionList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭id" align="center" prop="id" />
<el-table-column :show-overflow-tooltip="true" label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode" />
<el-table-column :show-overflow-tooltip="true" label="宸ヤ綅缂栫爜" align="center" prop="locationCode" />
<el-table-column label="杩涚珯鏃堕棿" align="center" prop="inboundTime" width="180">
</el-table-column>
<el-table-column label="鍑虹珯鏃堕棿" align="center" prop="outboundTime" width="180">
</el-table-column>
- <el-table-column :show-overflow-tooltip="true" label="鐘舵��" align="center" prop="status" />
+ <el-table-column :show-overflow-tooltip="true" label="绔欑姸鎬�" align="center" prop="status" />
<el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectTime" width="180">
</el-table-column>
</el-table>
diff --git a/billion-ui/src/views/main/om/info/index.vue b/billion-ui/src/views/main/om/info/index.vue
index 3012182..d4b3e36 100644
--- a/billion-ui/src/views/main/om/info/index.vue
+++ b/billion-ui/src/views/main/om/info/index.vue
@@ -26,16 +26,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="宸ュ崟鐘舵��" prop="orderStatus">
- <el-select v-model="queryParams.orderStatus" placeholder="璇烽�夋嫨宸ュ崟鐘舵��" clearable>
- <el-option
- v-for="dict in dict.type.order_status"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
<el-form-item style="float: right; margin-right: 90px">
<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>
@@ -74,9 +64,31 @@
icon="el-icon-edit"
size="mini"
:disabled="single"
- @click=""
+ @click="bodyStatus"
v-hasPermi="['main:info:edit']"
>缂镐綋鏆傚仠\鍚姩</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="headStatus"
+ v-hasPermi="['main:info:edit']"
+ >缂哥洊鏆傚仠\鍚姩</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="info"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="preStatus"
+ v-hasPermi="['main:info:edit']"
+ >棰勮鏆傚仠\鍚姩</el-button>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
@@ -103,14 +115,14 @@
<span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" >
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}') }}</span>
- </template>
- </el-table-column>
+<!-- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" >-->
+<!-- <template slot-scope="scope">-->
+<!-- <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}') }}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column label="缂镐綋涓婄嚎鏁伴噺" align="center" prop="bodyQty" />
- <el-table-column label="缂哥洊涓婄嚎鏁伴噺" align="center" prop="head_qty" />
- <el-table-column label="棰勮涓婄嚎鏁伴噺" align="center" prop="pre_qty" />
+ <el-table-column label="缂哥洊涓婄嚎鏁伴噺" align="center" prop="headQty" />
+ <el-table-column label="棰勮涓婄嚎鏁伴噺" align="center" prop="preQty" />
<el-table-column label="缂镐綋宸ュ崟鐘舵��" align="center" prop="bodyStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.status" :value="scope.row.bodyStatus"/>
@@ -150,7 +162,7 @@
<el-input disabled v-model="form.productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" />
</el-form-item>
<el-form-item label="璁″垝鏁伴噺" prop="planQty">
- <el-input disabled v-model="form.planQty" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
+ <el-input v-model="form.planQty" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
</el-form-item>
<el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planStartTime">
<el-date-picker clearable
@@ -169,25 +181,22 @@
</el-date-picker>
</el-form-item>
<el-form-item label="缂镐綋鏁伴噺" prop="bodyQty">
- <el-input disabled v-model="form.bodyQty" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
+ <el-input v-model="form.bodyQty" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
</el-form-item>
- <el-form-item label="缂镐綋宸ュ崟鐘舵��" prop="bodyStatus" v-if = updateFlag>
- <el-radio-group v-model="form.bodyStatus">
- <el-radio
- v-for="dict in dict.type.status"
- :key="dict.value"
- :label="dict.value"
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
-
-
-
+<!-- <el-form-item label="缂镐綋宸ュ崟鐘舵��" prop="bodyStatus" v-if = updateFlag>-->
+<!-- <el-radio-group v-model="form.bodyStatus">-->
+<!-- <el-radio-->
+<!-- v-for="dict in dict.type.status"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.value"-->
+<!-- >{{dict.label}}</el-radio>-->
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
<el-form-item label="缂稿鏁伴噺" prop="headStatus">
- <el-input disabled v-model="form.headStatus" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
+ <el-input v-model="form.headStatus" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
</el-form-item>
<el-form-item label="棰勮鏁伴噺" prop="preStatus">
- <el-input disabled v-model="form.preStatus" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
+ <el-input v-model="form.preStatus" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
<el-input
@@ -393,6 +402,12 @@
updateBy: null,
remarks: null,
delFlag: null,
+ bodyQty: null,
+ headQty: null,
+ preQty: null,
+ bodyStatus :null,
+ headStatus :null,
+ preStatus :null,
};
this.resetForm("form");
this.addFlag = false
@@ -433,6 +448,76 @@
this.title = "淇敼鐢熶骇宸ュ崟";
});
},
+
+ /** 淇敼缂镐綋鐘舵�佹寜閽搷浣� */
+ bodyStatus(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getInfo(id).then(response => {
+ this.form = response.data;
+ if(this.form.bodyStatus === "1"){
+ this.form.bodyStatus = "3";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("鏆傚仠鎴愬姛");
+ this.getList();});
+ }else if(this.form.bodyStatus === "2"){
+ this.$message('璁㈠崟宸插畬鎴愮姝慨鏀�');
+ }else if(this.form.bodyStatus === "3"){
+ this.form.bodyStatus = "1";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("閲嶅惎鎴愬姛");
+ this.getList();});
+ }else if(this.form.bodyStatus === "0"){
+ this.$message('璁㈠崟鏈紑濮�');
+ }
+ });
+ },
+ /** 淇敼缂哥洊鐘舵�佹寜閽搷浣� */
+ headStatus(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getInfo(id).then(response => {
+ this.form = response.data;
+ if(this.form.headStatus === "1"){
+ this.form.headStatus = "3";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("鏆傚仠鎴愬姛");
+ this.getList();});
+ }else if(this.form.headStatus === "2"){
+ this.$message('璁㈠崟宸插畬鎴愮姝慨鏀�');
+ }else if(this.form.headStatus === "3"){
+ this.form.headStatus = "1";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("閲嶅惎鎴愬姛");
+ this.getList();});
+ }else if(this.form.headStatus === "0"){
+ this.$message('璁㈠崟鏈紑濮�');
+ }
+ });
+ },
+ /** 淇敼棰勮鐘舵�佹寜閽搷浣� */
+ preStatus(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getInfo(id).then(response => {
+ this.form = response.data;
+ if(this.form.preStatus === "1"){
+ this.form.preStatus = "3";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("鏆傚仠鎴愬姛");
+ this.getList();});
+ }else if(this.form.preStatus === "2"){
+ this.$message('璁㈠崟宸插畬鎴愮姝慨鏀�');
+ }else if(this.form.preStatus === "3"){
+ this.form.preStatus = "1";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("閲嶅惎鎴愬姛");
+ this.getList();});
+ }else if(this.form.preStatus === "0"){
+ this.$message('璁㈠崟鏈紑濮�');
+ }
+ });
+ },
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate(valid => {
--
Gitblit v1.9.3