695593266@qq.com 1 miesiąc temu
rodzic
commit
22e7d9583e

+ 10 - 0
src/api/productionPlan/index.js

@@ -300,6 +300,16 @@ export async function findMaterialInfoByPlanId(params) {
   return Promise.reject(new Error(res.data.message));
 }
 
+export async function workOrderFindMaterialInfoByPlanId(params) {
+  const res = await request.get('/aps/workorder/findMaterialInfoByPlanId', {
+    params
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 // 根据产品查询BOM分类
 export async function findBomSalesorderCategoryIdV2(bomId, produceType) {
   const res = await request.get(

+ 52 - 53
src/views/productionPlan/components/kittingComplete.vue

@@ -422,7 +422,8 @@
     findBomCategoryByCategoryIdV2,
     bomVersionList,
     listBomType,
-    getProductKitting
+    getProductKitting,
+    workOrderFindMaterialInfoByPlanId
   } from '@/api/productionPlan/index.js';
   import factoryAdd from './factoryAdd';
   import stockDetailDialog from './stockDetailDialog.vue';
@@ -548,43 +549,41 @@
             align: 'center',
             minWidth: 80
           },
-          {
-            slot: 'inTransitNum',
-            prop: 'inTransitNum',
-            label: '在途数量',
-            align: 'center',
-            minWidth: 80
-          },
-          {
-            prop: 'inTransitOrdersNum',
-            label: '在途已关联数量	',
-            align: 'center',
-            minWidth: 120
-          },
-          {
-            slot: 'inTransitStatusText',
-            prop: 'inTransitStatusText',
-            label: '在途状态',
-            align: 'center',
-            minWidth: 80
-          },
-          {
-            prop: 'totalNumberProduction',
-            label: '在制总数',
-            showOverflowTooltip: true,
-            align: 'center',
-            // show: this.produceType == 1
-            show: this.fieldShow
-          },
-          {
-            prop: 'numberProductionStateText',
-            slot: 'numberProductionStateText',
-            label: '在制齐套',
-            showOverflowTooltip: true,
-            align: 'center',
-            // show: this.produceType == 1
-            show: this.fieldShow
-          },
+          // {
+          //   slot: 'inTransitNum',
+          //   prop: 'inTransitNum',
+          //   label: '在途数量',
+          //   align: 'center',
+          //   minWidth: 80
+          // },
+          // {
+          //   prop: 'inTransitOrdersNum',
+          //   label: '在途已关联数量	',
+          //   align: 'center',
+          //   minWidth: 120
+          // },
+          // {
+          //   slot: 'inTransitStatusText',
+          //   prop: 'inTransitStatusText',
+          //   label: '在途状态',
+          //   align: 'center',
+          //   minWidth: 80
+          // },
+          // {
+          //   prop: 'totalNumberProduction',
+          //   label: '在制总数',
+          //   showOverflowTooltip: true,
+          //   align: 'center',
+          //   show: this.fieldShow
+          // },
+          // {
+          //   prop: 'numberProductionStateText',
+          //   slot: 'numberProductionStateText',
+          //   label: '在制齐套',
+          //   showOverflowTooltip: true,
+          //   align: 'center',
+          //   show: this.fieldShow
+          // },
           // {
           //   prop: 'productFinalStateText',
           //   slot: 'productFinalStateText',
@@ -594,18 +593,18 @@
           //   minWidth: 160,
           //   show: this.produceType == 1
           // },
-          {
-            label: '最终可用数量',
-            prop: 'finalAvailableQuantity',
-            align: 'center',
-            minWidth: 110
-          },
-          {
-            label: '最终缺料数量',
-            prop: 'finalShortageQuantity',
-            align: 'center',
-            minWidth: 120
-          },
+          // {
+          //   label: '最终可用数量',
+          //   prop: 'finalAvailableQuantity',
+          //   align: 'center',
+          //   minWidth: 110
+          // },
+          // {
+          //   label: '最终缺料数量',
+          //   prop: 'finalShortageQuantity',
+          //   align: 'center',
+          //   minWidth: 120
+          // },
 
           // {
           //   label: '下发状态',
@@ -868,8 +867,8 @@
         this.loading = true;
         try {
           // 直接调用接口函数,因为其返回Promise,无需额外包装
-          let p1 = findMaterialInfoByPlanId(params1);
-          let p2 = findMaterialInfoByPlanId(params2);
+          let p1 = workOrderFindMaterialInfoByPlanId(params1);
+          let p2 = workOrderFindMaterialInfoByPlanId(params2);
           // 使用Promise.all并行执行多个Promise
           let results = await Promise.all([p1, p2]);
           this.loading = false;
@@ -927,7 +926,7 @@
         };
         this.loading = true;
         try {
-          const result = await findMaterialInfoByPlanId(params);
+          const result = await workOrderFindMaterialInfoByPlanId(params);
           this.resultProcess(result);
           this.loading = false;
         } catch (err) {

+ 1 - 0
src/views/productionPlan/components/stockDetailDialog.vue

@@ -7,6 +7,7 @@
     custom-class="ele-dialog-form"
     :title="'库存详情'"
     :maxable="true"
+    append-to-body
   >
     <div class="form-wrapper">
       <!--      <el-form :model="requestData" label-width="0" :show-message="false">-->