From 99583332ca53110da8f6e8312595ee31ea8311ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 10 May 2024 13:21:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E5=B9=B3=E6=9D=BF=E3=80=91?=
=?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=BA=93=E7=A7=BB=E9=A1=B5=E9=9D=A2=E5=BC=80?=
=?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fe/PC/src/api/wms-api.js | 17 +
fe/PC/src/api/wms-job.js | 11 +-
.../commonTabel-drawer/style/index.scss | 2 +-
.../src/components/newAndEdiDialog/index.vue | 5 +-
fe/PC/src/components/umyTable/index.vue | 10 +-
fe/PC/src/utils/tableColumns/index.js | 22 +-
fe/PC/src/utils/tabsDesTions/index.js | 24 ++
.../src/views/padManage/padTransferLibJob.vue | 323 +++++++++++++-----
8 files changed, 314 insertions(+), 100 deletions(-)
diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index 99190485e..9076e5a2c 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -700,6 +700,23 @@ export function getInjectioModelPlanBom(data) {
})
}
+// 通过packingCode获取库存余额表
+export function getInventoryByPackingCode(packingCode){
+ return request({
+ url: baseURL + 'wms/inventory/inventory-balance/by-packing-code/' + packingCode,
+ method: 'get',
+ })
+}
+
+// 成品发运申请-批量生成发货单
+export function deliverRequestHandleList(ids) {
+ return request({
+ url: baseURL + 'wms/store/deliver-request/handle-list',
+ method: 'post',
+ data:ids
+ })
+}
+
// 客户退拆任务-完成 todo
// export async function productionRecycleJobComplete(id) {
// return request({
diff --git a/fe/PC/src/api/wms-job.js b/fe/PC/src/api/wms-job.js
index fa78312ab..401c663c0 100644
--- a/fe/PC/src/api/wms-job.js
+++ b/fe/PC/src/api/wms-job.js
@@ -244,4 +244,13 @@ export function countJobResetByNumber(data) {
method: 'post',
data:data
})
-}
\ No newline at end of file
+}
+
+// 【pad】业务库移-生成库移
+export function transferLibJobHandel(id, data) {
+ return request({
+ url: baseURL + 'wms/store/transfer-lib-job/handle/' + id,
+ method: 'post',
+ data:data
+ })
+}
diff --git a/fe/PC/src/components/commonTabel-drawer/style/index.scss b/fe/PC/src/components/commonTabel-drawer/style/index.scss
index c859157ea..70b8e3c99 100644
--- a/fe/PC/src/components/commonTabel-drawer/style/index.scss
+++ b/fe/PC/src/components/commonTabel-drawer/style/index.scss
@@ -121,5 +121,5 @@
content: unset !important;
}
::v-deep .el-descriptions--medium.is-bordered .el-descriptions-item__cell{
- min-width: 200px !important;
+ min-width: 180px !important;
}
\ No newline at end of file
diff --git a/fe/PC/src/components/newAndEdiDialog/index.vue b/fe/PC/src/components/newAndEdiDialog/index.vue
index 863d4a60b..9102e8c3c 100644
--- a/fe/PC/src/components/newAndEdiDialog/index.vue
+++ b/fe/PC/src/components/newAndEdiDialog/index.vue
@@ -10,7 +10,7 @@
:show-close="false"
style="width:calc(100% - 28px);left:14px;top:14px;height:calc(100% - 28px)"
>
- {{formTitle}}
+ {{formTitle}}
+
+
+
-
+
-
-
-
-
\ No newline at end of file
+ FormSubmitHandle(val){
+ this.Loading.newAndEdiLoading = true
+ // 先获取库存余额进行部分项赋值
+ getInventoryByPackingCode(this.CreateFormData.packingCode).then(inventory => {
+ // 目前定的需求为：details中只有一条明细，所以按钮写在最外层，默认赋值第一位
+ let _data = this.propsData
+ _data.details[0].handledFromPackingCode = this.CreateFormData.packingCode
+ _data.details[0].handledToPackingCode = this.CreateFormData.packingCode
+ _data.details[0].handledFromLocationCode = this.CreateFormData.fromLocationCode
+ _data.details[0].handledToLocationCode = this.CreateFormData.toLocationCode
+ _data.details[0].handledToLot = inventory.lot
+ _data.details[0].handledFromLot = inventory.lot
+ _data.details[0].handledFromSupplierBatch = inventory.supplierBatch
+ _data.details[0].handledToSupplierBatch = inventory.supplierBatch
+ _data.details[0].handledFromQty = inventory.qty
+ _data.details[0].handledToQty = inventory.qty
+ transferLibJobHandel(this.propsData.id, _data).then(res => {
+ this.Loading.newAndEdiLoading = false
+ this.FormResult("success")
+ }).catch(err => {
+ this.Loading.newAndEdiLoading = false
+ this.FormResult("error")
+ })
+ }).catch(err => {
+ this.Loading.newAndEdiLoading = false
+ })
+ }
+ }
+};
+
+
\ No newline at end of file