2026-06-29

增加加工中心校验

src/views/modules/warehouse/labelTransactionLog.vue

@@ -107,9 +107,21 @@
                 <el-input v-model="searchData.batchNo" clearable placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="3">
+              <el-form-item label="批次号">
+                <el-input v-model="searchData.wdrBarchNo" clearable placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
               <el-form-item label="仓库">
-                <el-select v-model="searchData.warehouseIdList" multiple collapse-tags clearable placeholder="请选择" style="width: 120%">
+                <el-select
+                  v-model="searchData.warehouseIdList"
+                  class="warehouse-multi-select"
+                  multiple
+                  collapse-tags
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100%">
                   <el-option
                     v-for="item in warehouseList"
                     :key="item.warehouseId"
@@ -119,7 +131,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="变动日期">
                 <el-date-picker
                   v-model="searchData.startDate"
@@ -308,6 +320,7 @@ export default {
         orderNo: '',
         orderLineNo: '',
         batchNo: '',
+        wdrBarchNo: '',
         syncedFlag: '',
         warehouseIdList: [] // 仓库筛选条件，支持多选
       },
@@ -477,6 +490,7 @@ export default {
         orderNo: '',
         orderLineNo: '',
         batchNo: '',
+        wdrBarchNo: '',
         syncedFlag: '',
         warehouseIdList: [] // 重置仓库筛选
       }
@@ -551,6 +565,7 @@ export default {
         orderNo: this.searchData.orderNo,
         orderLineNo: this.searchData.orderLineNo,
         batchNo: this.searchData.batchNo,
+        wdrBarchNo: this.searchData.wdrBarchNo,
         syncedFlag: this.searchData.syncedFlag,
         warehouseIdList: this.searchData.warehouseIdList, // 仓库筛选条件
         ...extraParams
@@ -995,6 +1010,33 @@ export default {
   width: 100%;
 }
 
+/* 仓库多选固定单行显示，避免选中多个后撑高输入框 */
+.search-form /deep/ .warehouse-multi-select .el-select__tags {
+  flex-wrap: nowrap;
+  overflow: hidden;
+}
+
+.search-form /deep/ .warehouse-multi-select .el-select__tags > span {
+  display: flex;
+  align-items: center;
+  flex-wrap: nowrap;
+  max-width: 100%;
+  overflow: hidden;
+}
+
+.search-form /deep/ .warehouse-multi-select .el-tag:first-child {
+  max-width: calc(100% - 42px);
+}
+
+.search-form /deep/ .warehouse-multi-select .el-tag__content,
+.search-form /deep/ .warehouse-multi-select .el-select__tags-text {
+  display: inline-block;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .search-form /deep/ .el-date-editor.el-input,
 .search-form /deep/ .el-date-editor--daterange.el-input__inner {
   width: 100%;

src/views/modules/yieldReport/com_defect_roll.vue

@@ -166,6 +166,7 @@ export default {
         itemNo: '',
         seqNo: '',
         rollNo: '',
+        workCenterNo: '',
         operatorId: '',
         operatorName: '',
         reportDate: '',
@@ -423,6 +424,7 @@ export default {
       this.pageData.itemNo = scheduleData.itemNo;
       this.pageData.seqNo = scheduleData.seqNo;
       this.pageData.rollNo = scheduleData.rollNo;
+      this.pageData.workCenterNo = (scheduleData.workCenterNo || '').trim();
       this.pageData.operatorId = operatorData.operatorId;
       this.pageData.operatorName = operatorData.operatorName;
       //清空数据
@@ -458,8 +460,17 @@ export default {
       });
     },
 
+    getCurrentWorkCenterNo() {
+      return (this.scheduleData.workCenterNo || '').trim();
+    },
+
     /*检查不良代码*/
     getDefectDesc(){
+      if (!this.pageData.defectCode) {
+        this.pageData.defectDesc = '';
+        return;
+      }
+      this.pageData.workCenterNo = this.getCurrentWorkCenterNo();
       checkDefectCode(this.pageData).then(({data}) => {
         //判断是否存在异常
         if(data.code == 500){
@@ -474,6 +485,11 @@ export default {
 
     /*不提示错误信息的*/
     checkDefectDesc(){
+      if (!this.pageData.defectCode) {
+        this.pageData.defectDesc = '';
+        return;
+      }
+      this.pageData.workCenterNo = this.getCurrentWorkCenterNo();
       checkDefectCode(this.pageData).then(({data}) => {
         //判断是否存在异常
         if(data.code == 500){
@@ -496,6 +512,12 @@ export default {
         this.$message.error('请扫描不良代码!');
         return false;
       }
+      const workCenterNo = this.getCurrentWorkCenterNo();
+      if (!workCenterNo) {
+        this.$message.error('当前派工单未维护加工中心，不能报告不良');
+        return false;
+      }
+      this.pageData.workCenterNo = workCenterNo;
       reportDefectCode(this.pageData).then(({data}) => {
         if(data.code == 500){
           this.$message.error(data.msg);
@@ -530,8 +552,13 @@ export default {
         let strVal = "";
         let conSql = "";
         if (val === 89){
+          const workCenterNo = this.getCurrentWorkCenterNo();
+          if (!workCenterNo) {
+            this.$message.error('当前派工单未维护加工中心，无法选择不良代码');
+            return;
+          }
           strVal =  this.pageData.defectCode;
-          conSql = " and A.workCenter_no = '" + this.scheduleData.workCenterNo + "'"
+          conSql = " and isnull(A.workCenter_no,'') = '" + workCenterNo + "'"
         }
         this.$refs.baseList.init(val, strVal, conSql)
       })

src/views/modules/yieldReport/com_produce_down.vue

@@ -149,6 +149,7 @@ export default {
         itemNo: '',
         seqNo: '',
         rollNo: '',
+        workCenterNo: '',
         operatorId: '',
         reportDate: '',
         reportTime: '',
@@ -260,6 +261,7 @@ export default {
       this.pageData.itemNo = scheduleData.itemNo;
       this.pageData.seqNo = scheduleData.seqNo;
       this.pageData.rollNo = scheduleData.rollNo;
+      this.pageData.workCenterNo = (scheduleData.workCenterNo || '').trim();
       this.pageData.operatorId = operatorData.operatorId;
       //重置时间
       this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD');
@@ -288,8 +290,17 @@ export default {
       this.$emit('update:visible', false);
     },
 
+    getCurrentWorkCenterNo() {
+      return (this.scheduleData.workCenterNo || '').trim();
+    },
+
     /*检查停机代码*/
     getDownTimeDesc(){
+      if (!this.pageData.downTimeCode) {
+        this.pageData.downTimeDesc = '';
+        return;
+      }
+      this.pageData.workCenterNo = this.getCurrentWorkCenterNo();
       checkDownTimeCode(this.pageData).then(({data}) => {
         //判断是否存在异常
         if(data.code == 500){
@@ -304,6 +315,12 @@ export default {
 
     /*报告停机代码*/
     reportDownTimeFun(){
+      const workCenterNo = this.getCurrentWorkCenterNo();
+      if (!workCenterNo) {
+        this.$message.error('当前派工单未维护加工中心，不能报告停机');
+        return;
+      }
+      this.pageData.workCenterNo = workCenterNo;
       reportDownTime(this.pageData).then(({data}) => {
         if(data.code == 500){
           this.$message.error(data.msg);
@@ -330,8 +347,13 @@ export default {
         let strVal = "";
         let conSql = ''
         if (val === 90){
+          const workCenterNo = this.getCurrentWorkCenterNo();
+          if (!workCenterNo) {
+            this.$message.error('当前派工单未维护加工中心，无法选择停机代码');
+            return;
+          }
           strVal = this.pageData.downTimeCode;
-          conSql = " and A.workCenter_no = '" + this.scheduleData.workCenterNo + "'"
+          conSql = " and isnull(A.workCenter_no,'') = '" + workCenterNo + "'"
         }
         this.$refs.baseList.init(val, strVal, conSql)
       })

src/views/modules/yieldReport/com_separate_roll.vue

@@ -393,6 +393,7 @@
     validateShiftChangeDataCount,/*校验数据条数*/
     saveAbnormalRollData,/*保存异常截卷数据*/
   } from '@/api/yieldReport/com_separate_roll.js';
+  import { checkDefectCode } from '@/api/yieldReport/com_defect_roll.js';
   import { fixedCarrierSave } from '@/api/fixedCarrier/fixedCarrier.js';
   import Chooselist from '@/views/modules/common/Chooselist';
 
@@ -956,15 +957,51 @@ export default {
       return Number(num.toFixed(6)).toString()
     },
 
+    getCurrentWorkCenterNo() {
+      return (this.scheduleData.workCenterNo || '').trim()
+    },
+
+    buildDefectCheckParams(defectCode, workCenterNo) {
+      return {
+        site: this.pageData.site,
+        orderNo: this.pageData.orderNo,
+        itemNo: this.pageData.itemNo,
+        seqNo: this.pageData.seqNo,
+        rollNo: this.pageData.rollNo,
+        defectCode: defectCode,
+        workCenterNo: workCenterNo
+      }
+    },
+
     async addRollDefectItem() {
       if (!this.currentRollDefectList) {
         return
       }
+      const workCenterNo = this.getCurrentWorkCenterNo()
+      if (!workCenterNo) {
+        this.$message.error('当前派工单未维护加工中心，不能选择不良原因')
+        return
+      }
       this.rollDefectForm.defectCode = (this.rollDefectForm.defectCode || '').trim().toUpperCase()
       if (!this.rollDefectForm.defectCode) {
         this.$message.error('请先选择不良代码')
         return
       }
+      let checkResultMap = {}
+      try {
+        const { data } = await checkDefectCode(this.buildDefectCheckParams(this.rollDefectForm.defectCode, workCenterNo))
+        if (data.code == 500) {
+          this.$message.error(data.msg || '不良代码不属于当前加工中心')
+          return
+        }
+        checkResultMap = data.resultMap || {}
+      } catch (e) {
+        this.$message.error('不良代码校验失败，请稍后重试')
+        return
+      }
+      if (checkResultMap.defectDesc) {
+        this.rollDefectForm.defectDesc = checkResultMap.defectDesc
+      }
       if (!this.rollDefectForm.defectDesc) {
         this.$message.error('请选择有效的不良代码')
         return
@@ -1009,8 +1046,13 @@ export default {
         let strVal = ''
         let conSql = ''
         if (val === 89) {
+          const workCenterNo = this.getCurrentWorkCenterNo()
+          if (!workCenterNo) {
+            this.$message.error('当前派工单未维护加工中心，无法选择不良代码')
+            return
+          }
           strVal = this.rollDefectForm.defectCode || ''
-          conSql = " and A.workCenter_no = '" + this.scheduleData.workCenterNo + "'"
+          conSql = " and isnull(A.workCenter_no,'') = '" + workCenterNo + "'"
         }
         this.$refs.baseList.init(val, strVal, conSql)
       })