From 9ae0056994d2e1a9c86a5d22718c094b5d89a759 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 30 Oct 2025 11:33:15 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-30=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/boxManage/saleBoxManage.vue | 18 ++++++++++
 .../searchProductionDispatchList.vue          | 36 +++++++++++++++++++
 .../shopOrder/shopOrder/shopOrderList.vue     | 15 ++++++--
 .../modules/yieldReport/produce_order.vue     |  6 ++--
 4 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/boxManage/saleBoxManage.vue b/src/views/modules/boxManage/saleBoxManage.vue
index 3365cd9..1a1aa4d 100644
--- a/src/views/modules/boxManage/saleBoxManage.vue
+++ b/src/views/modules/boxManage/saleBoxManage.vue
@@ -625,6 +625,24 @@ export default {
           status: true,
           fixed: false
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: '750001Table1AvailableStock',
+          tableId: "750001Table1",
+          tableName: "销售发货清单",
+          columnProp: "availableStock",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "可用库存",
+          columnWidth: '100',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
diff --git a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
index 222ec41..3c2495a 100644
--- a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
+++ b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
@@ -499,6 +499,24 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableTotalRoll',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "totalRoll",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "订单总卷数",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 6023,
@@ -517,6 +535,24 @@ export default {
           fixed: '',
           columnWidth: 80
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableRollCount',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "rollCount",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "订单产出卷数",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 90
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 6023,
diff --git a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue
index 73cc319..6ff50fd 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue
@@ -216,6 +216,11 @@
                 <el-input v-model="modelData.finishedQty" readonly style="  ;text-align: right"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="总卷数：">
+                <el-input v-model="modelData.totalRoll" readonly style="  ;text-align: right"></el-input>
+              </el-form-item>
+            </el-col>
 
           </el-row>
           </div>
@@ -520,6 +525,9 @@
         <el-form-item label="制造提前期：">
           <el-input v-model="updateData.leadtime" type="number" style="width: 160px"></el-input>
         </el-form-item>
+        <el-form-item label="总卷数：">
+          <el-input v-model="updateData.totalRoll" type="number" style="width: 160px"></el-input>
+        </el-form-item>
 <!--        <el-form-item label="印版已发：">-->
 <!--          <el-select filterable v-model="updateData.repairSOFlag" style="width: 160px">-->
 <!--            <el-option label="Y" value="Y"></el-option>-->
@@ -878,6 +886,7 @@ export default {
         repairSOFlag: '',
         checkFlag: '',/*关单是否校验数量*/
         batchNo: '',
+        totalRoll: '', // 总卷数
       },
       updateData: {
         needDate: '',
@@ -893,7 +902,8 @@ export default {
         remark: '',
         site: '',
         orderNo: '',
-        batchNo: ''
+        batchNo: '',
+        totalRoll: '' // 总卷数
       },
       dataList: [],
       dataList2: [],
@@ -3005,7 +3015,8 @@ export default {
         remark: this.modelData.remark,
         site: this.modelData.site,
         orderNo: this.modelData.orderNo,
-        batchNo: this.modelData.batchNo
+        batchNo: this.modelData.batchNo,
+        totalRoll: this.modelData.totalRoll
       },
         this.modelFlag3 = true;
     },
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index f2ab1e5..f29f0bf 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -325,13 +325,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5302,
-          serialNumber: '5302ProduceScheduledSeqNo',
+          serialNumber: '5302ProduceSerialNumber',
           tableId: '5302Produce',
           tableName: '待生产工单',
-          columnProp: 'scheduledSeqNo',
+          columnProp: 'serialNumber',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '订单优先级',
+          columnLabel: '序号',
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,