2025-10-20

订单排产（无限产能）-》排产明细增加固定载具

src/api/yieldReport/com_separate_roll.js

@@ -17,3 +17,6 @@ export const otherCreateSplitSfdcRoll = data => createAPI('schedule/otherCreateS
 // 换包装分卷
 export const workbenchCreateslittingrollRepackAction = data => createAPI('schedule/workbench_createslittingroll_Repack_action', 'POST', data)
 
+// 获取固定载具列表
+export const getFixedCarrierList = data => createAPI('schedule/getFixedCarrierList', 'POST', data)
+

src/views/modules/schedule/com_schedule_order_expand.vue

@@ -142,6 +142,21 @@
                 <el-input-number :controls="false" :step="0" v-model="scope.row.qtyRequired"></el-input-number>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="carrierNo"
+              label="固定载具"
+              min-width="120"
+              align="center">
+              <template slot-scope="scope">
+                <el-input 
+                  v-model="scope.row.carrierNo" 
+                  readonly 
+                  placeholder="双击选择"
+                  @dblclick.native="openCarrierDialog(scope.$index)"
+                  style="cursor: pointer;">
+                </el-input>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="rowCount"
               label="排数"
@@ -230,6 +245,64 @@
         <el-button @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
+
+    <!-- 固定载具选择对话框 -->
+    <el-dialog title="固定载具清单" :close-on-click-modal="false" v-drag :visible.sync="carrierDialogVisible" width="720px">
+      <div class="rq">
+        <el-form :inline="true" label-position="top" :model="carrierSearchData">
+          <el-form-item label="标签条码">
+            <el-input v-model="carrierSearchData.carrierNo" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label="载具类型名称">
+            <el-input v-model="carrierSearchData.carrierTypeName" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label="规格描述">
+            <el-input v-model="carrierSearchData.specification" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label=" ">
+            <el-button type="primary" @click="queryCarrierList">查询</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table
+          :height="300"
+          :data="carrierList"
+          @row-dblclick="selectCarrier"
+          border
+          style="width: 100%;">
+          <el-table-column
+            prop="carrierNo"
+            label="标签条码"
+            header-align="center"
+            align="left"
+            min-width="100">
+          </el-table-column>
+          <el-table-column
+            prop="carrierTypeName"
+            label="载具类型名称"
+            header-align="center"
+            align="left"
+            min-width="150">
+          </el-table-column>
+          <el-table-column
+            prop="specification"
+            label="规格描述"
+            header-align="center"
+            align="left"
+            min-width="150">
+          </el-table-column>
+          <el-table-column
+            prop="dimensions"
+            label="尺寸"
+            header-align="center"
+            align="left"
+            min-width="100">
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="carrierDialogVisible=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
   </div>
 </template>
 
@@ -243,6 +316,8 @@ import {
   cancelSoSchedule,/*取消排产*/
 } from '@/api/schedule/com_schedule_order_expand.js'
 
+import { getFixedCarrierList } from '@/api/yieldReport/com_separate_roll.js'
+
 import {
   searchSysLanguagePackList,
   searchSysLanguageParam,
@@ -462,6 +537,15 @@ export default {
       orderScheduleList: [],
       scheduleDetailList: [],
       dataListLoading: false,
+      // 固定载具相关
+      carrierDialogVisible: false,  // 固定载具对话框
+      carrierList: [],  // 固定载具列表
+      carrierSearchData: {  // 固定载具查询条件
+        carrierNo: '',
+        carrierTypeName: '',
+        specification: ''
+      },
+      currentEditIndex: -1,  // 当前编辑的行索引
       columnTimeArray: [
         {
           userId: this.$store.state.user.name,
@@ -1362,11 +1446,46 @@ export default {
         itemNo: this.pageData.itemNo,
         resourceId: defaultResourceId,
         qtyRequired: 0,
+        carrierNo: '',  // 固定载具
         rowCount: 0,
         rollCount: 0
       });
     },
 
+    /*打开固定载具选择对话框*/
+    openCarrierDialog(index) {
+      this.currentEditIndex = index;
+      this.queryCarrierList();
+    },
+
+    /*查询固定载具列表*/
+    queryCarrierList() {
+      const params = {
+        site: this.$store.state.user.site,
+        carrierNo: this.carrierSearchData.carrierNo,
+        carrierTypeName: this.carrierSearchData.carrierTypeName,
+        specification: this.carrierSearchData.specification
+      }
+      getFixedCarrierList(params).then(({data}) => {
+        if (data && data.code === 0) {
+          this.carrierList = data.data
+          this.carrierDialogVisible = true
+        } else {
+          this.$message.error(data.msg || '获取固定载具列表失败')
+        }
+      }).catch(error => {
+        this.$message.error('获取固定载具列表失败: ' + error.message)
+      })
+    },
+
+    /*选中固定载具*/
+    selectCarrier(row) {
+      if (this.currentEditIndex >= 0 && this.currentEditIndex < this.scheduleDetailList.length) {
+        this.scheduleDetailList[this.currentEditIndex].carrierNo = row.carrierNo
+        this.carrierDialogVisible = false
+      }
+    },
+
     /*删除排产明细行*/
     deleteScheduleDetail(index){
       this.scheduleDetailList.splice(index, 1);
@@ -1463,7 +1582,8 @@ export default {
         calendarId: this.pageData.calendarId,
         checkFlag: true,
         rowCount: item.rowCount,
-        rollCount: item.rollCount
+        rollCount: item.rollCount,
+        carrierNo: item.carrierNo  // 固定载具
       };
 
       // 调用排产接口

src/views/modules/yieldReport/com_separate_roll.vue

@@ -23,8 +23,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="固定载具">
-              <el-input v-model="pageData.fixture" style="width: 120px;" placeholder="固定载具"></el-input>
+            <el-form-item>
+              <span style="cursor: pointer" slot="label" @click="queryFixedCarrierList"><a>固定载具</a></span>
+              <el-input v-model="pageData.fixture" readonly style="width: 120px;" placeholder="固定载具"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -87,6 +88,64 @@
         <el-button @click="closeDialog">{{ buttons.closeButton }}</el-button>
       </span>
     </el-dialog>
+
+    <!-- 固定载具选择对话框 -->
+    <el-dialog title="固定载具清单" :close-on-click-modal="false" v-drag :visible.sync="carrierModelFlag" width="720px">
+      <div class="rq">
+        <el-form :inline="true" label-position="top" :model="carrierSearchData">
+          <el-form-item label="标签条码">
+            <el-input v-model="carrierSearchData.carrierNo" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label="载具类型名称">
+            <el-input v-model="carrierSearchData.carrierTypeName" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label="规格描述">
+            <el-input v-model="carrierSearchData.specification" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label=" ">
+            <el-button type="primary" @click="queryFixedCarrierList">查询</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table
+          :height="300"
+          :data="carrierList"
+          @row-dblclick="selectCarrier"
+          border
+          style="width: 100%;">
+          <el-table-column
+            prop="carrierNo"
+            label="标签条码"
+            header-align="center"
+            align="left"
+            min-width="100">
+          </el-table-column>
+          <el-table-column
+            prop="carrierTypeName"
+            label="载具类型名称"
+            header-align="center"
+            align="left"
+            min-width="150">
+          </el-table-column>
+          <el-table-column
+            prop="specification"
+            label="规格描述"
+            header-align="center"
+            align="left"
+            min-width="150">
+          </el-table-column>
+          <el-table-column
+            prop="dimensions"
+            label="尺寸"
+            header-align="center"
+            align="left"
+            min-width="100">
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="carrierModelFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
   </div>
 </template>
 
@@ -94,6 +153,7 @@
   import {
     checkCreateSplitSfdcRoll,/*校验是否可以创建分卷*/
     createSplitSfdcRoll,/*执行创建分卷的操作*/
+    getFixedCarrierList,/*获取固定载具列表*/
   } from '@/api/yieldReport/com_separate_roll.js';
 
   /*打印标签专用的js*/
@@ -175,6 +235,13 @@ export default {
         seqNo: '',
         showFlag: false
       },
+      carrierModelFlag: false,  // 固定载具对话框标记
+      carrierList: [],  // 固定载具列表
+      carrierSearchData: {  // 固定载具查询条件
+        carrierNo: '',
+        carrierTypeName: '',
+        specification: ''
+      },
       buttons: {
         confirmButton: '确定',
         closeButton: '关闭',
@@ -388,6 +455,32 @@ export default {
 
     // ===================== 分卷优化方法结束 =====================
 
+    // 查询固定载具列表
+    queryFixedCarrierList() {
+      const params = {
+        site: this.scheduleData.site,
+        carrierNo: this.carrierSearchData.carrierNo,
+        carrierTypeName: this.carrierSearchData.carrierTypeName,
+        specification: this.carrierSearchData.specification
+      }
+      getFixedCarrierList(params).then(({data}) => {
+        if (data && data.code === 0) {
+          this.carrierList = data.data
+          this.carrierModelFlag = true
+        } else {
+          this.$message.error(data.msg || '获取固定载具列表失败')
+        }
+      }).catch(error => {
+        this.$message.error('获取固定载具列表失败: ' + error.message)
+      })
+    },
+
+    // 选中固定载具
+    selectCarrier(row) {
+      this.pageData.fixture = row.carrierNo
+      this.carrierModelFlag = false
+    },
+
     /*关闭modal*/
     closeDialog(){
       //刷新报工的页面