回传信息

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/monit/MonitoringThread.java

@@ -58,6 +58,7 @@ public class MonitoringThread implements Runnable {
                     param.setTaskNo(msgDdj.getRwh() + "");
                     param.setDeviceId(String.valueOf(msgDdj.getId()));
                     param.setDeviceType("DDJ");
+                    param.setFault(msgDdj.getSbzt() + "");
                     param.setJobId("0");
                     List<BasFaultRecord> basFaultRecords = basFaultRecordService.selectBasFaultRecordList(param);
                     if (CollUtil.isEmpty(basFaultRecords)) {
@@ -76,9 +77,9 @@ public class MonitoringThread implements Runnable {
                 }
                 if (msgDdj.getSbzt() < 1000 && msgDdj.getCzfs() == 5){
                     BasFaultRecord param = new BasFaultRecord();
-                    param.setTaskNo(msgDdj.getRwh() + "");
                     param.setDeviceId(String.valueOf(msgDdj.getId()));
                     param.setDeviceType("DDJ");
+                    param.setJobId("0");
                     List<BasFaultRecord> basFaultRecords = basFaultRecordService.selectBasFaultRecordList(param);
                     if (CollUtil.isNotEmpty(basFaultRecords)) {
                         BasFaultRecord faultRecord = basFaultRecords.get(0);

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2RoadWaySsjThread.java

@@ -125,14 +125,8 @@ public class Floor2RoadWaySsjThread implements Runnable {
 
                     mydoJob.setExecutionPhase(TASK_EP_DDJ);
                     mydoJobService.updateMydoJob(mydoJob);
-
-
                 }
-
             }
-
-
-
         }
     }
 

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java

@@ -109,15 +109,12 @@ public class LineSsjThread implements Runnable {
             if (!mydoJobs.isEmpty()) {
                //永远有且只有一条
                 mydoJob = mydoJobs.get(0);
-
                     int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), mydoJob.getTaskNo(), 1, 1);
                     if (i == 1) {
                         mydoJob.setExecutionPhase(TASK_EP_LINE_SSJ);
                         mydoJobService.updateMydoJob(mydoJob);
                         log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo());
                     }
-
-
             } else {
 
                 //请求wms生成入库作业
@@ -152,13 +149,8 @@ public class LineSsjThread implements Runnable {
                     //7是报工单失败，不处理
                     if(!"7".equals(Integer.parseInt(ajaxResult.get("code").toString()))){
                              createMoveToPort(SsjDevice);
-
                     }
-
-
                 }
-
-
             }
         }
 

ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml

@@ -27,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDeviceSsjVo">
-        select id, device_code , name , type, plc_db_read_address, is_active, create_time, plc_db_write_address, rkqq, kx, dw, tray_code, task_no,exception,tray_size,allow_put,ip_address , port  from device_ssj
+        select id, device_code , name , type, plc_db_read_address, is_active, create_time, plc_db_write_address,
+               rkqq, kx, dw, tray_code, task_no,exception,tray_size,allow_put,ip_address , port  from device_ssj
     </sql>
 
     <select id="selectDeviceSsjList" parameterType="DeviceSsj" resultMap="DeviceSsjResult">

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and entrance_id in
                 <foreach item="item" index="index" collection="epList" separator="," open="(" close=")">
                 #{item}
+                </foreach>
             </if>
         </where>
     </select>

ruoyi-ui/src/api/job/jobCallBack.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 查询作业信息列表
+export function listJobCallBack(query) {
+  return request({
+    url: '/job/callBack/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询作业信息详细
+export function getJobCallBack(id) {
+  return request({
+    url: '/job/callBack/' + id,
+    method: 'get'
+  })
+}
+
+// 新增作业信息
+export function addJobCallBack(data) {
+  return request({
+    url: '/job/callBack',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改作业信息
+export function updateJobCallBack(data) {
+  return request({
+    url: '/job/callBack',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除作业信息
+export function delJobCallBack(id) {
+  return request({
+    url: '/job/callBack/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/job/jobCallBack/index.vue

@@ -0,0 +1,322 @@
+<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="taskNo">
+        <el-input
+          v-model="queryParams.taskNo"
+          placeholder="请输入任务号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="任务类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择任务类型" clearable>
+          <el-option
+            v-for="dict in dict.type.job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="回传状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择回传状态" clearable>
+          <el-option
+            v-for="dict in dict.type.call_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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="['job:mydoJob: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="['job:mydoJob: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="['job:mydoJob: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="['job:mydoJob:export']"-->
+    <!--        >导出</el-button>-->
+    <!--      </el-col>-->
+    <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+    <!--    </el-row>-->
+
+    <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键" align="center" prop="id"/>
+      <el-table-column label="作业ID" align="center" prop="jobId"/>
+      <el-table-column label="任务号" align="center" prop="taskNo"/>
+      <el-table-column label="任务类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.job_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="回传状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.call_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="startTime"/>
+      <el-table-column label="失败次数" align="center" prop="spare1"/>
+      <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="['job:callBack:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['job:callBack: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="80px">
+        <el-form-item label="主键" prop="id">
+          <el-input v-model="form.id" placeholder="请输入主键" disabled/>
+        </el-form-item>
+        <el-form-item label="作业ID" prop="jobId">
+          <el-input v-model="form.jobId" placeholder="请输入作业ID"/>
+        </el-form-item>
+        <el-form-item label="任务号" prop="taskNo">
+          <el-input v-model="form.taskNo" placeholder="请输入任务号"/>
+        </el-form-item>
+        <el-form-item label="任务类型" prop="type">
+          <el-input v-model="form.type" placeholder="请输入任务类型"/>
+        </el-form-item>
+        <el-form-item label="回传状态" prop="status">
+          <el-input v-model="form.status" placeholder="请输入回传状态"/>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-input v-model="form.createTime" placeholder="请输入创建时间"/>
+        </el-form-item>
+        <el-form-item label="失败次数" prop="spare1">
+          <el-input v-model="form.spare1" 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 {listJobCallBack, getJobCallBack, delJobCallBack, addJobCallBack, updateJobCallBack} from "@/api/job/jobCallBack"
+
+export default {
+  name: "JobCallBack",
+  dicts: ['call_status', 'job_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 作业信息表格数据
+      jobCallBackList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        jobId: null,
+        taskNo: null,
+        type: null,
+        status: null,
+        createTime: null,
+        spare1: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        status: [
+          {required: true, message: "任务状态不能为空", trigger: "change"}
+        ],
+        type: [
+          {required: true, message: "任务类型不能为空", trigger: "change"}
+        ],
+        taskNo: [
+          {required: true, message: "任务号不能为空", trigger: "blur"}
+        ],
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询作业信息列表 */
+    getList() {
+      this.loading = true
+      listJobCallBack(this.queryParams).then(response => {
+        this.jobCallBackList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        jobId: null,
+        taskNo: null,
+        status: null,
+        type: null,
+        createTime: null,
+        spare1: 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
+      getJobCallBack(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) {
+            updateJobCallBack(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addJobCallBack(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 delJobCallBack(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('job/callBack/export', {
+        ...this.queryParams
+      }, `job_call_back_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>