Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/api/wms/coilAbnormal.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询钢卷异常信息列表
+export function listCoilAbnormal(query) {
+  return request({
+    url: '/wms/coilAbnormal/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询钢卷异常信息详细
+export function getCoilAbnormal(abnormalId) {
+  return request({
+    url: '/wms/coilAbnormal/' + abnormalId,
+    method: 'get'
+  })
+}
+
+// 新增钢卷异常信息
+export function addCoilAbnormal(data) {
+  return request({
+    url: '/wms/coilAbnormal',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改钢卷异常信息
+export function updateCoilAbnormal(data) {
+  return request({
+    url: '/wms/coilAbnormal',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除钢卷异常信息
+export function delCoilAbnormal(abnormalId) {
+  return request({
+    url: '/wms/coilAbnormal/' + abnormalId,
+    method: 'delete'
+  })
+}

klp-ui/src/views/lines/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
     <el-tabs v-model="activeName" type="card">
-      <el-tab-pane label="计划执行" name="Plan"></el-tab-pane>
-      <el-tab-pane label="过程跟踪" name="Track"></el-tab-pane>
-      <el-tab-pane label="产出实绩" name="Quality"></el-tab-pane>
-      <el-tab-pane label="停机明细" name="Stop"></el-tab-pane>
-      <el-tab-pane label="实绩报表" name="PdoAnalysis"></el-tab-pane>
-      <el-tab-pane label="停机报表" name="StopAnalysis"></el-tab-pane>
+      <el-tab-pane label="计划执行" name="Plan" v-if="tabs.includes('Plan')"></el-tab-pane>
+      <el-tab-pane label="过程跟踪" name="Track" v-if="tabs.includes('Track')"></el-tab-pane>
+      <el-tab-pane label="产出实绩" name="Quality" v-if="tabs.includes('Quality')"></el-tab-pane>
+      <el-tab-pane label="停机明细" name="Stop" v-if="tabs.includes('Stop')"></el-tab-pane>
+      <el-tab-pane label="实绩报表" name="PdoAnalysis" v-if="tabs.includes('PdoAnalysis')"></el-tab-pane>
+      <el-tab-pane label="停机报表" name="StopAnalysis" v-if="tabs.includes('StopAnalysis')"></el-tab-pane>
       <!-- <el-tab-pane label="换辊报表" name="RollerAnalysis"></el-tab-pane> -->
     </el-tabs> 
 
@@ -41,9 +41,10 @@ import RollerAnalysis from './panels/analysis/roller.vue'
     },
     data() {
       return {
-        activeName: 'Plan',
+        activeName: 'Track',
         baseURL: '',
-        ready: false
+        ready: false,
+        tabs: []
       }
     },
     created() {
@@ -53,6 +54,14 @@ import RollerAnalysis from './panels/analysis/roller.vue'
         this.baseURL = res.msg
         this.ready = true
       }) 
+      getConfigKey(`line.${route}.config`).then(res => {
+        const tabs = res.msg.split(',')
+        // 是否包含Track, 如果不包含则添加
+        if (!tabs.includes('Track')) {
+          tabs.push('Track')
+        }
+        this.tabs = tabs
+      })
     }
   }
 </script>

klp-ui/src/views/wms/coil/abnormal.vue

@@ -0,0 +1,27 @@
+<template>
+  <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideType="hideType" :showAbnormal="showAbnormal" :showControl="showControl" />
+</template>
+
+<script>
+import BasePage from './panels/base.vue';
+
+export default {
+  components: {
+    BasePage
+  },
+  data() {
+    return {
+      querys: {
+        dataType: 1,
+        // 筛选异常数量大于等于1的
+        minAbnormalCount: 1
+      },
+      labelType: '2',
+      qrcode: false,
+      hideType: false,
+      showAbnormal: true,
+      showControl: false,
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/coil/abnormalDetail.vue

@@ -0,0 +1,366 @@
+<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="position">
+        <el-select v-model="queryParams.position" placeholder="请选择位置" clearable>
+          <el-option
+            v-for="dict in dict.type.coil_abnormal_position"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="缺陷代码" prop="defectCode">
+        <el-select v-model="queryParams.defectCode" placeholder="请选择缺陷代码" clearable>
+          <el-option
+            v-for="dict in dict.type.coil_abnormal_code"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="程度" prop="degree">
+        <el-select v-model="queryParams.degree" placeholder="请选择程度" clearable>
+          <el-option
+            v-for="dict in dict.type.coil_abnormal_degree"
+            :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"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="coilAbnormalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="abnormalId" v-if="false"/>
+      <el-table-column label="钢卷ID" align="center" prop="coilId" />
+      <el-table-column label="位置" align="center" prop="position">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.coil_abnormal_position" :value="scope.row.position"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="长度坐标" align="center" prop="lengthCoord" />
+      <el-table-column label="缺陷代码" align="center" prop="defectCode">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.coil_abnormal_code" :value="scope.row.defectCode"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="程度" align="center" prop="degree">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.coil_abnormal_degree" :value="scope.row.degree"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="判级" align="center" prop="judgeLevel" />
+      <el-table-column label="判级人" align="center" prop="judgeBy" />
+      <el-table-column label="判级时间" align="center" prop="judgeTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.judgeTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</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="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="钢卷ID" prop="coilId">
+          <coil-selector v-model="form.coilId"></coil-selector>
+        </el-form-item>
+        <el-form-item label="位置" prop="position">
+          <el-radio-group v-model="form.position">
+            <el-radio-button
+              v-for="dict in dict.type.coil_abnormal_position"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="长度坐标" prop="lengthCoord">
+          <el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" />
+        </el-form-item>
+        <el-form-item label="缺陷代码" prop="defectCode">
+          <el-radio-group v-model="form.defectCode">
+            <el-radio-button
+              v-for="dict in dict.type.coil_abnormal_code"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="程度" prop="degree">
+          <el-radio-group v-model="form.degree">
+            <el-radio-button
+              v-for="dict in dict.type.coil_abnormal_degree"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCoilAbnormal, getCoilAbnormal, delCoilAbnormal, addCoilAbnormal, updateCoilAbnormal } from "@/api/wms/coilAbnormal";
+import CoilSelector from '@/components/CoilSelector'
+
+export default {
+  name: "CoilAbnormal",
+  dicts: ['coil_abnormal_code', 'coil_abnormal_position', 'coil_abnormal_degree'],
+  components: {
+    CoilSelector
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 钢卷异常信息表格数据
+      coilAbnormalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        coilId: undefined,
+        position: undefined,
+        lengthCoord: undefined,
+        defectCode: undefined,
+        degree: undefined,
+        judgeLevel: undefined,
+        judgeBy: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  // created() {
+  //   this.getList();
+  // },
+  watch: {
+    '$route.query.coilId': {
+      handler(newVal, oldVal) {
+        if (newVal !== oldVal) {
+          this.queryParams.coilId = newVal
+          this.handleQuery()
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    /** 查询钢卷异常信息列表 */
+    getList() {
+      this.loading = true;
+      listCoilAbnormal(this.queryParams).then(response => {
+        this.coilAbnormalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormalId: undefined,
+        coilId: undefined,
+        position: undefined,
+        lengthCoord: undefined,
+        defectCode: undefined,
+        degree: undefined,
+        judgeLevel: undefined,
+        judgeBy: undefined,
+        judgeTime: undefined,
+        remark: undefined,
+        delFlag: undefined,
+        createTime: undefined,
+        createBy: undefined,
+        updateTime: undefined,
+        updateBy: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.abnormalId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加钢卷异常信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const abnormalId = row.abnormalId || this.ids
+      getCoilAbnormal(abnormalId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改钢卷异常信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.abnormalId != null) {
+            updateCoilAbnormal(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addCoilAbnormal(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const abnormalIds = row.abnormalId || this.ids;
+      this.$modal.confirm('是否确认删除钢卷异常信息编号为"' + abnormalIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delCoilAbnormal(abnormalIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/coilAbnormal/export', {
+        ...this.queryParams
+      }, `coilAbnormal_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

klp-ui/src/views/wms/coil/do/search.vue

@@ -115,7 +115,6 @@
             </el-form-item>
           </el-form>
         </div>
-
       </el-col>
 
       <!-- 右侧：物料列表 -->

klp-ui/src/views/wms/coil/panels/base.vue

@@ -99,6 +99,7 @@
           </RawMaterialInfo>
         </template>
       </el-table-column>
+      <el-table-column v-if="showAbnormal" label="异常数量" align="center" prop="abnormalCount"></el-table-column>
       <el-table-column label="更新时间" align="center" prop="updateTime" />
       <el-table-column label="发货时间" align="center" v-if="showExportTime" prop="exportTime" />
       <el-table-column label="更新人" align="center" prop="updateBy" />
@@ -147,6 +148,7 @@
           <el-button size="mini" v-if="showStatus" type="text" icon="el-icon-upload" @click="handleExportCoil(scope.row)">
             发货
           </el-button>
+          <el-button size="mini" v-if="showAbnormal" type="text" icon="el-icon-upload" @click="handleAbnormal(scope.row)">查看异常</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)" v-if="showControl">修正</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-if="showControl">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-search" @click="handleTrace(scope.row)">追溯</el-button>
@@ -311,6 +313,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showAbnormal: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -509,6 +515,14 @@ export default {
         this.$message.error('保存图片失败，请稍后重试');
       }
     },
+    handleAbnormal (row) {
+      this.$router.push({
+        path: '/quality/detail',
+        query: {
+          coilId: row.coilId,
+        }
+      })
+    }, 
     // 取消按钮
     cancel() {
       this.open = false;

klp-ui/src/views/wms/coil/panels/do.vue

@@ -37,7 +37,8 @@
               <p>暂无待领物料</p>
             </div>
 
-            <div v-for="(item, index) in materialCoilList" :key="item.coilId || index" class="material-card">
+            <div v-for="(item, index) in materialCoilList" :key="item.coilId || index" class="material-card"
+              :style="{ border: item.abnormalCount > 0 ? '1px solid red' : ' 1px solid #e4e7ed' }">
               <div class="card-header">
                 <div class="header-left">
                   <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
@@ -59,7 +60,7 @@
                             <span class="param-label">规格：</span>
                             <span class="param-value">{{ item.rawMaterial.specification }}</span>
                           </div>
-                           <div class="param-row" v-if="item.rawMaterial.material">
+                          <div class="param-row" v-if="item.rawMaterial.material">
                             <span class="param-label">材质：</span>
                             <span class="param-value">{{ item.rawMaterial.material }}</span>
                           </div>
@@ -167,6 +168,11 @@
               <div class="card-footer">
                 <el-button type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
                   :loading="item.picking" class="action-btn">领料</el-button>
+                <el-button type="danger" icon="el-icon-alarm-clock" :plain="item.abnormalCount == 0" size="mini"
+                  @click="handleAddAbnormal(item)" :loading="item.cancelling" class="action-btn">
+                  异常
+                  <span v-if="item.abnormalCount > 0">({{ item.abnormalCount }})</span>
+                </el-button>
               </div>
             </div>
           </div>
@@ -290,6 +296,40 @@
         </div>
       </el-col>
     </el-row>
+
+    <el-dialog title="新增异常" :visible.sync="exceptionDialogVisible" width="400px">
+      <el-form ref="exceptionForm" :model="exceptionForm" label-width="80px">
+        <el-form-item label="位置" prop="position">
+          <el-radio-group v-model="exceptionForm.position">
+            <el-radio-button v-for="dict in dict.type.coil_abnormal_position" :key="dict.value" :label="dict.value">{{
+              dict.label }}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="长度坐标" prop="lengthCoord">
+          <el-input v-model="exceptionForm.lengthCoord" placeholder="请输入长度坐标" />
+        </el-form-item>
+        <el-form-item label="缺陷代码" prop="defectCode">
+          <el-radio-group v-model="exceptionForm.defectCode">
+            <el-radio-button v-for="dict in dict.type.coil_abnormal_code" :key="dict.value" :label="dict.value">{{
+              dict.label }}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="程度" prop="degree">
+          <el-radio-group v-model="exceptionForm.degree">
+            <el-radio-button v-for="dict in dict.type.coil_abnormal_degree" :key="dict.value" :label="dict.value">{{
+              dict.label }}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" v-model="exceptionForm.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="info" @click="handleAbnormal">查看异常</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="confirmException">确 定</el-button>
+        <el-button @click="cancelException">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -299,10 +339,11 @@ import { listPendingAction, startProcess, cancelAction, delPendingAction, addPen
 import { parseTime } from '@/utils/klp'
 import ProductInfo from '@/components/KLPService/Renderer/ProductInfo'
 import RawMaterialInfo from '@/components/KLPService/Renderer/RawMaterialInfo'
+import { addCoilAbnormal } from '@/api/wms/coilAbnormal'
 
 export default {
   name: 'DoPage',
-  dicts: ['action_type'],
+  dicts: ['action_type', 'coil_abnormal_code', 'coil_abnormal_position', 'coil_abnormal_degree'],
   props: {
     label: {
       type: String,
@@ -342,6 +383,16 @@ export default {
         currentCoilNo: null,
         actionType: null, // 将在created中设置为酸连轧工序的actionType
         actionStatus: null
+      },
+
+      exceptionDialogVisible: false,
+      exceptionForm: {
+        coilId: null,
+        position: null,
+        lengthCoord: null,
+        defectCode: null,
+        degree: null,
+        remark: null
       }
     }
   },
@@ -603,6 +654,42 @@ export default {
       }
       return '—'
     },
+    handleAddAbnormal(row) {
+      this.exceptionForm.coilId = row.coilId
+      this.exceptionDialogVisible = true
+    },
+    confirmException() {
+      addCoilAbnormal(this.exceptionForm).then(response => {
+        this.$message.success('异常记录添加成功')
+        this.cancelException();
+        // 重置表单
+        this.getMaterialCoil()
+      }).catch(error => {
+        console.error('异常记录添加失败:', error)
+        this.$message.error('异常记录添加失败: ' + (error.message || error))
+      })
+
+    },
+    handleAbnormal() {
+      this.$router.push({
+        path: '/quality/detail',
+        query: {
+          coilId: this.exceptionForm.coilId,
+        }
+      })
+    },
+    cancelException() {
+      // 重置表单
+      this.exceptionForm = {
+        coilId: null,
+        position: null,
+        lengthCoord: null,
+        defectCode: null,
+        degree: null,
+        remark: null
+      }
+      this.exceptionDialogVisible = false
+    },
   }
 }
 </script>