From 07d443c97621fb09bfdd6e05f86178263fb0f795 Mon Sep 17 00:00:00 2001
From: "bbl\\baobl" <bbl17156787365@163.com>
Date: Mon, 25 Mar 2024 18:25:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=87=BA=E5=BA=93-=E6=88=90?=
 =?UTF-8?q?=E5=93=81-=E5=87=BA=E5=BA=93=E6=8E=A8=E8=8D=90=EF=BC=88?=
 =?UTF-8?q?=E5=B7=B2=E5=88=86=E9=85=8D=EF=BC=89=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/task.js                               | 13 +--
 .../business-data/businessTask/asnTask.vue    |  2 +-
 .../business-data/pickDetail/pickTask.vue     | 85 ++++++++++++++++++-
 3 files changed, 91 insertions(+), 9 deletions(-)

diff --git a/src/api/task.js b/src/api/task.js
index 66c941b..4f07624 100644
--- a/src/api/task.js
+++ b/src/api/task.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 export function getTaskInfo(id) {
   return request({
-    url: 'api/task/queryAsnTask?asnDetailId='+id ,
+    url: 'api/task/queryAsnTask?asnDetailId=' + id,
     method: 'get'
   })
 }
@@ -28,11 +28,14 @@ export function edit(data) {
     data
   })
 }
-export function devanRfid(data) {
+export function devanRfid(rfid, type) {
   return request({
     url: 'api/task/devanRfid',
     method: 'post',
-    data
+    data: {
+      'rfid': rfid,
+      'type': type
+    }
   })
 }
 export function manualReceiving(data) {
@@ -45,9 +48,9 @@ export function manualReceiving(data) {
 
 export function queryPickTask(id) {
   return request({
-    url: 'api/task/queryPickTask?pickDetailId='+id ,
+    url: 'api/task/queryPickTask?pickDetailId=' + id,
     method: 'get'
   })
 }
 
-export default { add, edit, del ,getTaskInfo,queryPickTask,manualReceiving,devanRfid}
+export default { add, edit, del, getTaskInfo, queryPickTask, manualReceiving, devanRfid }
diff --git a/src/views/business-data/businessTask/asnTask.vue b/src/views/business-data/businessTask/asnTask.vue
index fd03dfe..ef355c6 100644
--- a/src/views/business-data/businessTask/asnTask.vue
+++ b/src/views/business-data/businessTask/asnTask.vue
@@ -250,7 +250,7 @@ export default {
     // 解析RFID码
     devan_rfid() {
       console.log("解析RFID码")
-      devanRfid(this.fromManualReceiving.RFID).then(res => {
+      devanRfid(this.fromManualReceiving.RFID,'ASN').then(res => {
         if (res.status === 200) {
           this.fromManualReceiving = res.data
           this.getPoints(res.data.billCode);
diff --git a/src/views/business-data/pickDetail/pickTask.vue b/src/views/business-data/pickDetail/pickTask.vue
index 8817877..b9eedc7 100644
--- a/src/views/business-data/pickDetail/pickTask.vue
+++ b/src/views/business-data/pickDetail/pickTask.vue
@@ -39,9 +39,49 @@
       <el-input v-model="query.dstPointCode" clearable placeholder="目标点位" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
       <rrOperation :crud="crud" />
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :table-key="tableKey" />
+      <crudOperation :permission="permission" :table-key="tableKey">
+        <el-button
+            slot="right"
+            class="filter-item"
+            type="primary"
+            size="mini"
+            icon="el-icon-document-add"
+            v-show="true"
+            @click="ManualPTFlag=true"
+        >
+          人工出库
+        </el-button>
+      </crudOperation>
       <!--表单组件-->
-
+      <el-dialog title="人工出库" :visible.sync="ManualPTFlag" width="600px">
+        <el-form ref="fromBack" :inline="true" :model="fromManualPT" :rules="rules" size="mini" label-width="120px">
+          <el-form-item label="RFID" prop="RFID">
+            <el-input v-model="fromManualPT.RFID" :rows="3" type="textarea" style="width: 350px;" @change="devan_rfid()"/>
+          </el-form-item>
+          <el-form-item label="登记单号" prop="relatedBill2">
+            <el-input v-model="fromManualPT.relatedBill2"  :disabled="true" style="width: 100px;"/>
+          </el-form-item>
+          <el-form-item label="系统单号" prop="relatedBill1">
+            <el-input v-model="fromManualPT.relatedBill1"  :disabled="true" style="width: 100px;"/>
+          </el-form-item>
+          <el-form-item label="sku" prop="sku">
+            <el-input v-model="fromManualPT.sku"  :disabled="true" style="width: 330px;"/>
+          </el-form-item>
+          <el-form-item label="行号" prop="lineNo">
+            <el-input v-model="fromManualPT.lineNo"  :disabled="true" style="width: 100px;"/>
+          </el-form-item>
+          <el-form-item label="订单数量" prop="orderQty">
+            <el-input v-model="fromManualPT.orderQty"  :disabled="true" style="width: 100px;"/>
+          </el-form-item>
+          <el-form-item label="出库数量" prop="receivedQty">
+            <el-input v-model="fromManualPT.receivedQty"  :disabled="true" style="width: 330px;"/>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="ManualPTFlag = false">取 消</el-button>
+          <el-button type="primary" @click="picking()">确 定</el-button>
+        </div>
+      </el-dialog>
       <!--表格渲染-->
       <el-table border ref="table"  height="66vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
@@ -84,7 +124,7 @@
 </template>
 
 <script>
-import crudTask from '@/api/task'
+import crudTask, {devanRfid} from '@/api/task'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -92,6 +132,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from "@/components/DateRangePicker/index.vue";
 import {getItemsList} from "@/api/item";
+import crudPickDetail, { picking } from "@/api/pickDetail";
 
 const defaultForm = { id: null, itemId: null, itemKeyId: null, billCode: null, taskType: null, asnDetailId: null, moveDetailId: null, waveDetailId: null, pickDetailId: null, srcStockId: null, dstStockId: null, srcPointId: null, dstPointId: null, srcStockCode: null, dstStockCode: null, srcPointCode: null, dstPointCode: null, invStatus: null, taskStatus: null, beSkip: null, beBack: null, planQty: null, moveQty: null, putCode: null, invId: null, deptId: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
 export default {
@@ -114,6 +155,7 @@ export default {
   },
   data() {
     return {
+      ManualPTFlag: false,
       permission: {
         add: ['admin', 'task:add'],
         edit: ['admin', 'task:edit'],
@@ -121,6 +163,9 @@ export default {
       },
       tableKey: 'api/task',
       rules: {
+      },
+      fromManualPT: {
+
       },
       queryTypeOptions: [
         { key: 'itemCode', display_name: '物料代码' },
@@ -144,6 +189,40 @@ export default {
     indexMethod(index) {
       return index * 1+1;
     },
+    manualPT(){
+      /*crudTask.manualReceiving(this.fromManualPT).then(res => {
+        this.crud.notify(res.message, res.status)
+        this.crud.toQuery()
+      })*/
+    },
+    devan_rfid() {
+      console.log("解析RFID码")
+      devanRfid(this.fromManualPT.RFID,'PICK').then(res => {
+        if (res.status === 200) {
+          this.fromManualPT = res.data
+        }
+      })
+    },
+    //出库-人工拣货-确认
+    picking() {
+      this.$confirm(`确认拣货?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const ids = []
+        ids.push(this.fromManualPT.taskId)
+        crudPickDetail.picking(ids).then(res => {
+          this.$parent.crud.notify(res.message, res.status)
+          this.crud.toQuery()
+        }).catch(() => {
+
+        })
+
+      }).catch(() => {
+        this.$parent.notify('取消成功!', CRUD.NOTIFICATION_TYPE.SUCCESS);
+      });
+    },
     //物料数据
     itemDataGet() {
       getItemsList().then(res => {