From 4474978d6cfd6b6b675e47338596a9c44931fd5e Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Sun, 16 Feb 2025 18:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E6=8B=A3=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/app.js                                |  10 +-
 src/views/business-data/pick/index.vue        |   2 +-
 .../business-data/pickDetail/pickTask.vue     | 116 +++++++++++++++++-
 3 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/src/api/app.js b/src/api/app.js
index a6ab541..67673a3 100644
--- a/src/api/app.js
+++ b/src/api/app.js
@@ -8,4 +8,12 @@ export function materialIn(data) {
   })
 }
 
-export default { materialIn }
+export function fbPicking(data) {
+  return request({
+    url: 'api/app/fbPicking',
+    method: 'post',
+    data
+  })
+}
+
+export default {materialIn, fbPicking}
diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index a92b9f7..e0dc941 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -191,7 +191,7 @@
         <el-table-column prop="station" label="需求工位"/>
         <el-table-column prop="point.code" label="翻包点位"/>
         <el-table-column prop="stock.code" label="翻包容器"/>
-        <el-table-column prop="callPoint.code" label="叫料点位"/>
+        <el-table-column prop="callPoint" label="叫料点位"/>
         <el-table-column prop="orderType" label="单据类型"/>
         <el-table-column prop="sourceId" label="回传状态">
           <template slot-scope="scope">
diff --git a/src/views/business-data/pickDetail/pickTask.vue b/src/views/business-data/pickDetail/pickTask.vue
index ebb7859..7dddef2 100644
--- a/src/views/business-data/pickDetail/pickTask.vue
+++ b/src/views/business-data/pickDetail/pickTask.vue
@@ -65,6 +65,46 @@
 
       </crudOperation>
       <!--表单组件-->
+      <!--   翻包拣货  -->
+      <el-dialog title="翻包拣货" :visible.sync="fbPickingDialog" width="450px">
+        <el-form ref="fbPickingForm" :model="fbPickingForm" :rules="rules" size="small" label-width="100px">
+          <el-form-item label="原托盘" prop="srcStockCode">
+            <el-input v-model="fbPickingForm.srcStockCode" readonly style="width: 300px;"/>
+          </el-form-item>
+          <el-form-item label="物料编码" prop="itemCode">
+            <el-input v-model="fbPickingForm.itemCode" readonly style="width: 300px;"/>
+          </el-form-item>
+          <el-form-item label="物料名称" prop="itemName">
+            <el-input v-model="fbPickingForm.itemName" readonly style="width: 300px;"/>
+          </el-form-item>
+          <el-form-item label="起始点" prop="srcPointCode">
+            <el-input v-model="fbPickingForm.srcPointCode" readonly style="width: 300px;"/>
+          </el-form-item>
+          <el-form-item label="目标点" prop="dstPointCode">
+            <el-input v-model="fbPickingForm.dstPointCode" readonly style="width: 300px;"/>
+          </el-form-item>
+          <el-form-item label="待拣货数量" prop="planQty">
+            <el-input v-model="fbPickingForm.planQty" readonly style="width: 300px;"/>
+          </el-form-item>
+          <el-form-item label="预拣箱号" prop="srcOrderNumber">
+            <el-input v-model="fbPickingForm.srcOrderNumber" readonly style="width: 300px;"/>
+          </el-form-item>
+          <el-form-item label="实拣箱号" prop="dstOrderNumber">
+            <el-input v-model="fbPickingForm.dstOrderNumber" style="width: 300px;"/>
+          </el-form-item>
+          <el-form-item label="拣货数量" prop="moveQty">
+            <el-input v-model="fbPickingForm.moveQty" style="width: 300px;"/>
+          </el-form-item>
+          <el-form-item label="目标货架" prop="dstStockCode">
+            <el-input v-model="fbPickingForm.dstStockCode" style="width: 300px;"/>
+          </el-form-item>
+
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="fbPickingDialog = false">取 消</el-button>
+          <el-button type="primary" @click="toFbPicking()">确 定</el-button>
+        </span>
+      </el-dialog>
 
       <!--表格渲染-->
       <el-table ref="table" height="58vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
@@ -114,6 +154,13 @@
         <el-table-column prop="planQty" label="计划数量"/>
         <el-table-column prop="moveQty" label="移位数量"/>
         <el-table-column prop="createTime" label="创建时间"/>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="primary" align="center" size="mini" :disabled="scope.row.taskStatus!='ARRIVED'  "
+                       @click="fbPicking(scope.row)">翻包拣货
+            </el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <!--分页组件-->
       <div style="float: right;">
@@ -132,6 +179,8 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index.vue'
+import crudKmres from "@/api/kmres";
+import curdApp, {fbPicking} from "@/api/app"
 
 const defaultForm = {
   id: null,
@@ -196,8 +245,32 @@ export default {
         edit: ['admin', 'task:edit'],
         del: ['admin', 'task:del']
       },
-      rules: {},
-      items: []
+      rules: {
+        moveQty: [
+          {required: true, message: '拣货数量不能为空', trigger: 'blur'}
+        ],
+        dstOrderNumber: [
+          {required: true, message: '实拣箱号不能为空', trigger: 'blur'}
+        ],
+        dstStockCode: [
+          {required: true, message: '目标货架不能为空', trigger: 'blur'}
+        ],
+      },
+      items: [],
+      fbPickingForm: {
+        taskId: null,
+        srcStockCode: null,
+        itemCode: null,
+        itemName: null,
+        srcPointCode: null,
+        dstPointCode: null,
+        planQty: null,
+        srcOrderNumber: null,
+        dstOrderNumber: null,
+        moveQty: null,
+        dstStockCode: null
+      },
+      fbPickingDialog: false
     }
   },
   mounted() {
@@ -239,7 +312,44 @@ export default {
     },
     filterTag(value, row) {
       return row.taskStatus === value
-    }
+    },
+    fbPicking(data) {
+      this.fbPickingForm.taskId = data.id
+      this.fbPickingForm.srcStockCode = data.srcStockCode
+      this.fbPickingForm.itemCode = data.itemKey.item.code
+      this.fbPickingForm.itemName = data.itemKey.item.name
+      this.fbPickingForm.srcPointCode = data.srcPointCode
+      this.fbPickingForm.dstPointCode = data.dstPointCode
+      this.fbPickingForm.planQty = data.planQty-data.moveQty
+      this.fbPickingForm.moveQty = data.planQty //默认拣货数量为计划数量
+      this.fbPickingForm.srcOrderNumber = data.itemKey.orderNumber
+      this.fbPickingDialog = true
+    },
+    //翻包拣货
+    toFbPicking() {
+      this.$refs['fbPickingForm'].validate((valid) => {
+        if (valid) {
+          curdApp.fbPicking({
+            taskId: this.fbPickingForm.taskId,
+            srcStockCode: this.fbPickingForm.srcStockCode,
+            dstOrderNumber: this.fbPickingForm.dstOrderNumber,
+            moveQty: this.fbPickingForm.moveQty,
+            dstStockCode: this.fbPickingForm.dstStockCode
+          }).then(res => {
+            if (res.status == 200) {
+              this.fbPickingDialog = false
+              this.crud.notify('拣货成功!', CRUD.NOTIFICATION_TYPE.SUCCESS)
+              this.crud.toQuery()
+              this.fbPickingForm = {}
+            } else {
+              this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR)
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
   }
 }
 </script>