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

klp-ui/src/views/wms/report/zha/day.vue

@@ -63,9 +63,10 @@
       <el-descriptions-item label="异常率">{{ summary.abRate }}</el-descriptions-item>
     </el-descriptions>
 
-     <!-- 异常统计 -->
+    <!-- 异常统计 -->
     <el-descriptions title="异常统计" :column="4" border>
-      <el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value }}</el-descriptions-item>
+      <el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value
+        }}</el-descriptions-item>
     </el-descriptions>
 
     <el-descriptions title="明细信息" :column="3" border>
@@ -268,7 +269,7 @@ export default {
     summary() {
       return calcSummary(this.list, this.lossList)
     },
-     abSummary() {
+    abSummary() {
       return calcAbSummary(this.list)
     }
   },
@@ -312,36 +313,46 @@ export default {
         this.loading = false
       })
     },
-    getLossList() {
+    async getLossList() {
       this.loading = true
-      listPendingAction({
+      const res1 = await listPendingAction({
         actionType: 11, // 酸轧工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.lossList = []
-          this.loading = false
-          return
-        }
-        listCoilWithIds({
-          ...this.queryParams,
-          byCreateTimeStart: undefined,
-          byCreateTimeEnd: undefined,
-          coilIds: coilIds,
-        }).then(res => {
-          this.lossList = res.rows
-          this.loading = false
+      })
+      const res2 = await listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 200, // 分条工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+        updateBy: 'suanzhakuguan',
+      })
+      const actions = res1.rows.concat(res2.rows)
+      const coilIds = actions.map(item => item.coilId).join(',')
+      console.log(coilIds)
+      if (!coilIds) {
+        this.$message({
+          message: '暂无数据',
+          type: 'warning',
         })
+        this.lossList = []
+        this.loading = false
+        return
+      }
+      listCoilWithIds({
+        ...this.queryParams,
+        byCreateTimeStart: undefined,
+        byCreateTimeEnd: undefined,
+        coilIds: coilIds,
+      }).then(res => {
+        this.lossList = res.rows
+        this.loading = false
       })
     },
     // 导出

klp-ui/src/views/wms/report/zha/month.vue

@@ -334,36 +334,46 @@ export default {
         this.loading = false
       })
     },
-    getLossList() {
+    async getLossList() {
       this.loading = true
-      listPendingAction({
+      const res1 = await listPendingAction({
         actionType: 11, // 酸轧工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.lossList = []
-          this.loading = false
-          return
-        }
-        listCoilWithIds({
-          ...this.queryParams,
-          byCreateTimeStart: undefined,
-          byCreateTimeEnd: undefined,
-          coilIds: coilIds,
-        }).then(res => {
-          this.lossList = res.rows
-          this.loading = false
+      })
+      const res2 = await listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 200, // 分条工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+        updateBy: 'suanzhakuguan',
+      })
+      const actions = res1.rows.concat(res2.rows)
+      const coilIds = actions.map(item => item.coilId).join(',')
+      console.log(coilIds)
+      if (!coilIds) {
+        this.$message({
+          message: '暂无数据',
+          type: 'warning',
         })
+        this.lossList = []
+        this.loading = false
+        return
+      }
+      listCoilWithIds({
+        ...this.queryParams,
+        byCreateTimeStart: undefined,
+        byCreateTimeEnd: undefined,
+        coilIds: coilIds,
+      }).then(res => {
+        this.lossList = res.rows
+        this.loading = false
       })
     },
     // 导出

klp-ui/src/views/wms/report/zha/team.vue

@@ -389,36 +389,46 @@ export default {
         this.loading = false
       })
     },
-    getLossList() {
+    async getLossList() {
       this.loading = true
-      listPendingAction({
+      const res1 = await listPendingAction({
         actionType: 11, // 酸轧工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.list = []
-          this.loading = false
-          return
-        }
-        listCoilWithIds({
-          ...this.queryParams,
-          byCreateTimeStart: undefined,
-          byCreateTimeEnd: undefined,
-          coilIds: coilIds,
-        }).then(res => {
-          this.lossList = res.rows
-          this.loading = false
+      })
+      const res2 = await listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 200, // 分条工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+        updateBy: 'suanzhakuguan',
+      })
+      const actions = res1.rows.concat(res2.rows)
+      const coilIds = actions.map(item => item.coilId).join(',')
+      console.log(coilIds)
+      if (!coilIds) {
+        this.$message({
+          message: '暂无数据',
+          type: 'warning',
         })
+        this.lossList = []
+        this.loading = false
+        return
+      }
+      listCoilWithIds({
+        ...this.queryParams,
+        byCreateTimeStart: undefined,
+        byCreateTimeEnd: undefined,
+        coilIds: coilIds,
+      }).then(res => {
+        this.lossList = res.rows
+        this.loading = false
       })
     },
     // 导出

klp-ui/src/views/wms/report/zha/year.vue

@@ -318,36 +318,46 @@ export default {
         this.loading = false
       })
     },
-    getLossList() {
+    async getLossList() {
       this.loading = true
-      listPendingAction({
+      const res1 = await listPendingAction({
         actionType: 11, // 酸轧工序
-        pageSize: 9999,
+        pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.lossList = []
-          this.loading = false
-          return
-        }
-        listCoilWithIds({
-          ...this.queryParams,
-          byCreateTimeStart: undefined,
-          byCreateTimeEnd: undefined,
-          coilIds: coilIds,
-        }).then(res => {
-          this.lossList = res.rows
-          this.loading = false
+      })
+      const res2 = await listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 200, // 分条工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+        updateBy: 'suanzhakuguan',
+      })
+      const actions = res1.rows.concat(res2.rows)
+      const coilIds = actions.map(item => item.coilId).join(',')
+      console.log(coilIds)
+      if (!coilIds) {
+        this.$message({
+          message: '暂无数据',
+          type: 'warning',
         })
+        this.lossList = []
+        this.loading = false
+        return
+      }
+      listCoilWithIds({
+        ...this.queryParams,
+        byCreateTimeStart: undefined,
+        byCreateTimeEnd: undefined,
+        coilIds: coilIds,
+      }).then(res => {
+        this.lossList = res.rows
+        this.loading = false
       })
     },
     // 导出

klp-ui/src/views/wms/report/zha_.vue

@@ -179,9 +179,9 @@ export default {
         this.planList = res.rows
       })
     },
-    getList() {
+    async getList() {
       this.loading = true
-      listPendingAction({
+      const res1 = await listPendingAction({
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
@@ -190,28 +190,38 @@ export default {
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.list = []
-          this.loading = false
-          return
-        }
-        listCoilWithIds({
-          ...this.queryParams,
-          byCreateTimeStart: undefined,
-          byCreateTimeEnd: undefined,
-          coilIds: coilIds,
-        }).then(res => {
-          this.list = res.rows
-          this.loading = false
+      })
+      const res2 = await listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 200, // 分条工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+        updateBy: 'suanzhakuguan',
+      })
+      const actions = res1.rows.concat(res2.rows)
+      const coilIds = actions.map(item => item.coilId).join(',')
+      console.log(coilIds)
+      if (!coilIds) {
+        this.$message({
+          message: '暂无数据',
+          type: 'warning',
         })
+        this.list = []
+        this.loading = false
+        return
+      }
+      listCoilWithIds({
+        ...this.queryParams,
+        byCreateTimeStart: undefined,
+        byCreateTimeEnd: undefined,
+        coilIds: coilIds,
+      }).then(res => {
+        this.list = res.rows
+        this.loading = false
       })
     },
     // 导出

klp-ui/src/views/wms/report/zinc/day.vue

@@ -65,7 +65,8 @@
 
     <!-- 异常统计 -->
     <el-descriptions title="异常统计" :column="4" border>
-      <el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value }}</el-descriptions-item>
+      <el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value
+        }}</el-descriptions-item>
     </el-descriptions>
 
     <el-descriptions title="明细信息" :column="3" border>
@@ -298,36 +299,46 @@ export default {
         this.loading = false
       })
     },
-    getLossList() {
+    async getLossList() {
       this.loading = true
-      listPendingAction({
+      const res1 = await listPendingAction({
         actionType: 501, // 镀锌工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.list = []
-          this.loading = false
-          return
-        }
-        listCoilWithIds({
-          ...this.queryParams,
-          byCreateTimeStart: undefined,
-          byCreateTimeEnd: undefined,
-          coilIds: coilIds,
-        }).then(res => {
-          this.lossList = res.rows
-          this.loading = false
+      })
+      const res2 = await listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 200, // 分条工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+        updateBy: 'duxinkuguan',
+      })
+      const actions = res1.rows.concat(res2.rows)
+      const coilIds = actions.map(item => item.coilId).join(',')
+      console.log(coilIds)
+      if (!coilIds) {
+        this.$message({
+          message: '暂无数据',
+          type: 'warning',
         })
+        this.list = []
+        this.loading = false
+        return
+      }
+      listCoilWithIds({
+        ...this.queryParams,
+        byCreateTimeStart: undefined,
+        byCreateTimeEnd: undefined,
+        coilIds: coilIds,
+      }).then(res => {
+        this.lossList = res.rows
+        this.loading = false
       })
     },
     // 导出

klp-ui/src/views/wms/report/zinc/month.vue

@@ -320,36 +320,46 @@ export default {
         this.loading = false
       })
     },
-    getLossList() {
+    async getLossList() {
       this.loading = true
-      listPendingAction({
+      const res1 = await listPendingAction({
         actionType: 501, // 镀锌工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.lossList = []
-          this.loading = false
-          return
-        }
-        listCoilWithIds({
-          ...this.queryParams,
-          byCreateTimeStart: undefined,
-          byCreateTimeEnd: undefined,
-          coilIds: coilIds,
-        }).then(res => {
-          this.lossList = res.rows
-          this.loading = false
+      })
+      const res2 = await listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 200, // 分条工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+        updateBy: 'duxinkuguan',
+      })
+      const actions = res1.rows.concat(res2.rows)
+      const coilIds = actions.map(item => item.coilId).join(',')
+      console.log(coilIds)
+      if (!coilIds) {
+        this.$message({
+          message: '暂无数据',
+          type: 'warning',
         })
+        this.list = []
+        this.loading = false
+        return
+      }
+      listCoilWithIds({
+        ...this.queryParams,
+        byCreateTimeStart: undefined,
+        byCreateTimeEnd: undefined,
+        coilIds: coilIds,
+      }).then(res => {
+        this.lossList = res.rows
+        this.loading = false
       })
     },
     // 导出

klp-ui/src/views/wms/report/zinc/team.vue

@@ -94,62 +94,62 @@
             <template slot-scope="scope">
               <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
             </template>
-          </el-table-column>
-          <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
-            <template slot-scope="scope">
+</el-table-column>
+<el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+  <template slot-scope="scope">
               <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
             </template>
-          </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" />
-          <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
-          <el-table-column label="产品类型" align="center" width="250">
-            <template slot-scope="scope">
+</el-table-column>
+<el-table-column label="创建时间" align="center" prop="createTime" />
+<el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+<el-table-column label="产品类型" align="center" width="250">
+  <template slot-scope="scope">
               <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
               <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
             </template>
-          </el-table-column>
-          <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
-          <el-table-column label="长度 (米)" align="center" prop="length" />
-          <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
-          <el-table-column label="更新人" align="center" prop="updateByName" />
-          <el-table-column label="更新时间" align="center" prop="updateTime" />
-        </el-table>
-      </el-tab-pane> -->
-      <!-- <el-tab-pane label="产出钢卷" name="output"> -->
-        <el-table :data="list" border height="calc(100vh - 320px)">
-          <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
-            <template slot-scope="scope">
-              <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
-            </template>
-          </el-table-column>
-          <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
-            <template slot-scope="scope">
-              <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
-            </template>
-          </el-table-column>
-          <el-table-column label="班组" align="center" prop="team" />
-          <el-table-column label="创建时间" align="center" prop="createTime" />
-          <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
-          <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
-          <el-table-column label="产品类型" align="center" width="250">
-            <template slot-scope="scope">
-              <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
-              <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
-            </template>
-          </el-table-column>
-          <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
-          <el-table-column label="长度 (米)" align="center" prop="length" />
-          <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
-          <el-table-column label="出库状态" align="center" prop="status">
-            <!-- 0在库，1已出库 -->
-            <template slot-scope="scope">
-              {{ scope.row.status === 0 ? '在库' : '已出库' }}
-            </template>
-          </el-table-column>
-          <el-table-column label="更新人" align="center" prop="updateByName" />
-          <el-table-column label="更新时间" align="center" prop="updateTime" />
-        </el-table>
-      <!-- </el-tab-pane> -->
+</el-table-column>
+<el-table-column label="重量 (吨)" align="center" prop="netWeight" />
+<el-table-column label="长度 (米)" align="center" prop="length" />
+<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+<el-table-column label="更新人" align="center" prop="updateByName" />
+<el-table-column label="更新时间" align="center" prop="updateTime" />
+</el-table>
+</el-tab-pane> -->
+    <!-- <el-tab-pane label="产出钢卷" name="output"> -->
+    <el-table :data="list" border height="calc(100vh - 320px)">
+      <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="班组" align="center" prop="team" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+      <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
+      <el-table-column label="产品类型" align="center" width="250">
+        <template slot-scope="scope">
+          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
+          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
+        </template>
+      </el-table-column>
+      <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
+      <el-table-column label="长度 (米)" align="center" prop="length" />
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+      <el-table-column label="出库状态" align="center" prop="status">
+        <!-- 0在库，1已出库 -->
+        <template slot-scope="scope">
+          {{ scope.row.status === 0 ? '在库' : '已出库' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateByName" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
+    </el-table>
+    <!-- </el-tab-pane> -->
     <!-- </el-tabs> -->
 
   </div>
@@ -376,36 +376,46 @@ export default {
         this.loading = false
       })
     },
-    getLossList() {
+    async getLossList() {
       this.loading = true
-      listPendingAction({
+      const res1 = await listPendingAction({
         actionType: 501, // 镀锌工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.list = []
-          this.loading = false
-          return
-        }
-        listCoilWithIds({
-          ...this.queryParams,
-          byCreateTimeStart: undefined,
-          byCreateTimeEnd: undefined,
-          coilIds: coilIds,
-        }).then(res => {
-          this.lossList = res.rows
-          this.loading = false
+      })
+      const res2 = await listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 200, // 分条工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+        updateBy: 'duxinkuguan',
+      })
+      const actions = res1.rows.concat(res2.rows)
+      const coilIds = actions.map(item => item.coilId).join(',')
+      console.log(coilIds)
+      if (!coilIds) {
+        this.$message({
+          message: '暂无数据',
+          type: 'warning',
         })
+        this.list = []
+        this.loading = false
+        return
+      }
+      listCoilWithIds({
+        ...this.queryParams,
+        byCreateTimeStart: undefined,
+        byCreateTimeEnd: undefined,
+        coilIds: coilIds,
+      }).then(res => {
+        this.lossList = res.rows
+        this.loading = false
       })
     },
     // 导出

klp-ui/src/views/wms/report/zinc/year.vue

@@ -302,36 +302,46 @@ export default {
         this.loading = false
       })
     },
-    getLossList() {
+    async getLossList() {
       this.loading = true
-      listPendingAction({
+      const res1 = await listPendingAction({
         actionType: 501, // 镀锌工序
-        pageSize: 9999,
+        pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.lossList = []
-          this.loading = false
-          return
-        }
-        listCoilWithIds({
-          ...this.queryParams,
-          byCreateTimeStart: undefined,
-          byCreateTimeEnd: undefined,
-          coilIds: coilIds,
-        }).then(res => {
-          this.lossList = res.rows
-          this.loading = false
+      })
+      const res2 = await listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 200, // 分条工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+        updateBy: 'duxinkuguan',
+      })
+      const actions = res1.rows.concat(res2.rows)
+      const coilIds = actions.map(item => item.coilId).join(',')
+      console.log(coilIds)
+      if (!coilIds) {
+        this.$message({
+          message: '暂无数据',
+          type: 'warning',
         })
+        this.list = []
+        this.loading = false
+        return
+      }
+      listCoilWithIds({
+        ...this.queryParams,
+        byCreateTimeStart: undefined,
+        byCreateTimeEnd: undefined,
+        coilIds: coilIds,
+      }).then(res => {
+        this.lossList = res.rows
+        this.loading = false
       })
     },
     // 导出

klp-ui/src/views/wms/report/zinc_.vue

@@ -179,9 +179,9 @@ export default {
         this.planList = res.rows
       })
     },
-    getList() {
+    async getList() {
       this.loading = true
-      listPendingAction({
+      const res1 = await listPendingAction({
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
@@ -190,28 +190,38 @@ export default {
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.list = []
-          this.loading = false
-          return
-        }
-        listCoilWithIds({
-          ...this.queryParams,
-          byCreateTimeStart: undefined,
-          byCreateTimeEnd: undefined,
-          coilIds: coilIds,
-        }).then(res => {
-          this.list = res.rows
-          this.loading = false
+      })
+       const res2 = await listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 200, // 分条工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+        updateBy: 'duxinkuguan',
+      })
+      const actions = res1.rows.concat(res2.rows)
+      const coilIds = actions.map(item => item.coilId).join(',')
+      console.log(coilIds)
+      if (!coilIds) {
+        this.$message({
+          message: '暂无数据',
+          type: 'warning',
         })
+        this.list = []
+        this.loading = false
+        return
+      }
+      listCoilWithIds({
+        ...this.queryParams,
+        byCreateTimeStart: undefined,
+        byCreateTimeEnd: undefined,
+        coilIds: coilIds,
+      }).then(res => {
+        this.list = res.rows
+        this.loading = false
       })
     },
     // 导出