123

src/api/wmsManagement/wmOneTimeInventory.js

@@ -125,7 +125,7 @@ export function getPartNumber() {
  */
 export function generateWmOneTimeRecord(data) {
   return request({
-    url: '/mes/wm/WmPolishRecord/GetWmOneTimeRecordByDate',
+    url: '/mes/wm/WmOneTimeRecord/GenerateWmOneTimeRecord',
     method: 'post',
     data: data,
   })

src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue

@@ -51,8 +51,10 @@
     </el-row>
     <!-- 仓库零件数 -->
     <div class="table-data-collect">
-      <span>当前抛光品总数:{{ RealQuantitySum }}</span>
+      <span>当前一次合格品总数:{{ RealQuantitySum }}</span>
       <span>上次导入盘点总数:{{ StocktakingTotal }}</span>
+      <span>上次导入盘点日期:{{ MinStocktakingTime }}</span>
+      <span>当前查询盘点零件数:{{ QuantitySum }}</span>
     </div>
     <!-- <div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
       <span style="font-size: 18px; font-weight: 600">导入盘点总数:{{ StocktakingTotal }}</span>
@@ -180,7 +182,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="resetRecordQuery">搜索</el-button>
-		  <el-button type="primary" icon="el-icon-refresh" size="mini" @click="handleRecordSync(2)">自动记录同步</el-button>
+          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="handleRecordSync(2)">自动记录同步</el-button>
         </el-form-item>
       </el-form>
       <!-- 数据区域 -->
@@ -346,6 +348,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         fkInventoryId: '',
+        partnumber: '',
         status: 1,
         changeType: -1,
         sort: 'updatedTime',
@@ -375,6 +378,7 @@ export default {
       StocktakingTotal: 0,
       QuantitySum: 0,
       RealQuantitySum: 0,
+      MinStocktakingTime: '',
     }
   },
   computed: {
@@ -404,6 +408,7 @@ export default {
           this.StocktakingTotal = res.data.stocktakingTotal
           this.QuantitySum = res.data.quantitySum
           this.RealQuantitySum = res.data.realQuantitySum
+          this.MinStocktakingTime = res.data.minStocktakingTime
           this.loading = false
         }
       })
@@ -538,6 +543,7 @@ export default {
       this.RecordTitle = `零件号：${row.partnumber} 仓库操作记录`
       this.RecordOpen = true
       this.RecordQueryParams.fkInventoryId = row.id
+      this.RecordQueryParams.partnumber = row.partnumber
     },
     // 详情
     RecordOpened() {
@@ -664,10 +670,11 @@ export default {
     },
     handleRecordSync(actionType = 1) {
       let partnumber = ''
+      let startTime = this.$dayjs(this.MinStocktakingTime)
       // 1-全部 2-指定零件同步
       let params = {
         actionType,
-        startTime: this.$dayjs().startOf('month').format('YYYY-MM-DD HH:mm:ss'),
+        startTime,
         endTime: this.$dayjs().endOf('month').format('YYYY-MM-DD HH:mm:ss'),
       }
       if (actionType === 2) {
@@ -675,11 +682,12 @@ export default {
       }
       // 执行同步操作
       generateWmOneTimeRecord(params).then((res) => {
-        if (res.code === 200) {
+        if (res.code === 200 && res.data > 0) {
           this.msgSuccess('同步成功')
           this.getRecordList()
+          this.getList()
         } else {
-          this.msgError(res.msg)
+          this.msgError('同步异常')
         }
       })
     },

src/views/wmsManagement/WmPolishInventory/index.vue

@@ -53,6 +53,7 @@
       <span>当前抛光品总数:{{ RealQuantitySum }}</span>
       <span>上次导入盘点总数:{{ StocktakingTotal }}</span>
       <span>上次导入盘点日期:{{ MinStocktakingTime }}</span>
+      <span>当前查询盘点零件数:{{ QuantitySum }}</span>
       <!-- <span>异常零件号:{{ '5615102DSV0100B22' }}</span> -->
       <!-- <span style="font-size: 18px; font-weight: 600; margin-left: 20px">当前查询盘点零件数:{{ QuantitySum }}</span> -->
     </div>
@@ -672,10 +673,11 @@ export default {
     },
     handleRecordSync(actionType = 1) {
       let partnumber = ''
+      let startTime = this.$dayjs(this.MinStocktakingTime)
       // 1-全部 2-指定零件同步
       let params = {
         actionType,
-        startTime: this.$dayjs().startOf('month').format('YYYY-MM-DD HH:mm:ss'),
+        startTime,
         endTime: this.$dayjs().endOf('month').format('YYYY-MM-DD HH:mm:ss'),
       }
       if (actionType === 2) {
@@ -683,11 +685,12 @@ export default {
       }
       // 执行同步操作
       generateWmPolishRecord(params).then((res) => {
-        if (res.code === 200) {
+        if (res.code === 200 && res.data > 0) {
           this.msgSuccess('同步成功')
           this.getRecordList()
+          this.getList()
         } else {
-          this.msgError(res.msg)
+          this.msgError('同步异常')
         }
       })
     },