From bdbb9aaeaec6db6519f16b01d30506aee6ac7ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 11 Jul 2024 17:22:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=8F=8Abug=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/api/wms-api.js | 13 ++++ fe/PC/src/filters/status.js | 8 +++ fe/PC/src/utils/index.js | 4 +- fe/PC/src/utils/tableColumns/index.js | 8 ++- fe/PC/src/utils/tabsDesTions/index.js | 4 ++ .../basicData/SupplierManage/Supplier.vue | 28 ++++---- .../itemGuideBookManage/itemGuideBook.vue | 2 +- fe/PC/src/views/kittingManage/Kitting.vue | 68 ++++++++++++++++++- .../quality/InspectRequest.vue | 4 +- .../quality/InspectRequest_new.vue | 4 +- .../quality/InspectRequest_old.vue | 4 +- 11 files changed, 121 insertions(+), 26 deletions(-) diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js index bf1391ead..554c7df50 100644 --- a/fe/PC/src/api/wms-api.js +++ b/fe/PC/src/api/wms-api.js @@ -787,6 +787,19 @@ export function getDepartByUserId(id) { }) } +// kitting箱打包规则特殊导入，不使用blob类型 +export function postImportNoteBlob(data, url,isSpecial) { + let _url = isSpecial ? url : url + '/import' + return request({ + url: baseURL + _url, + method: 'post', + headers: { + 'Content-Type': 'multipart/form-data;' + }, + data + }) +} + // 客户退拆任务-完成 todo // export async function productionRecycleJobComplete(id) { // return request({ diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js index 4e4152488..16195f590 100644 --- a/fe/PC/src/filters/status.js +++ b/fe/PC/src/filters/status.js @@ -2139,6 +2139,10 @@ export function SupplierAsnCtypeStaBack(name){ value: 3604, label: '完工报废' }, + 3605:{ + value: 3605, + label: '报废转移' + }, 3701: { value: 3701, label: '线边盘点调整' @@ -2546,6 +2550,10 @@ export function issueRequestType(index, prop) { value: 5, label: "Excel导入" }, + 6: { + value: 6, + label: "涂装上线计划" + }, } return Enum(type, index, prop) } diff --git a/fe/PC/src/utils/index.js b/fe/PC/src/utils/index.js index 41e1ce524..a89afada9 100644 --- a/fe/PC/src/utils/index.js +++ b/fe/PC/src/utils/index.js @@ -616,7 +616,9 @@ export function initInterfaceType(res){ } else if (item.transType == 38 && (item.transSubType == 3301 || item.transSubType == 3302)) { _item.interfaceType = '【TYRP】-【回收料调整单】' } else if (item.transType == 36) { - _item.interfaceType = '【TYRP】-【报废单、线边仓报废单】' + if(item.transSubType != "3605"){ + _item.interfaceType = '【TYRP】-【报废单、线边仓报废单】' + } } else { _item.interfaceType = '' } diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index cf0683701..053ff545c 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -704,7 +704,7 @@ export const Shift = [ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] -// 供应商自检报告 +// 作业指导书 export const ItemGuideBook = [ { label: _Names.itemCode, @@ -2318,7 +2318,7 @@ export const InventoryTransferLog = [ { label: "从库位代码", prop: "fromLocationCode" }, { label: "到库位代码", prop: "toLocationCode" }, { label: "到箱码", prop: "toPackingCode" }, - { label: "事务类型", prop: "transType", type: "filter", filters: "TransType" }, + { label: "事务类型", prop: "transType", type: "filter", filters: "TransTypeBase" }, { label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" }, { label: "接口对应类型", prop: "interfaceType", width: '360px', showProp: true }, { label: "从事务编号", prop: "fromTransNumber", width: orderWidth }, @@ -3710,6 +3710,10 @@ export const chassisList = [ fixed: "left", type: "name" }, + { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, { label: "Wms编号", prop: 'number' }, { label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" }, { label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index e7e0d0a84..6080d7e54 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2523,6 +2523,10 @@ export const chassisList = [ fixed: "left", type: "name" }, + { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, { label: "Wms编号", prop: 'number' }, { label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" }, { label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" }, diff --git a/fe/PC/src/views/basicData/SupplierManage/Supplier.vue b/fe/PC/src/views/basicData/SupplierManage/Supplier.vue index 782906e95..7c3d51e75 100644 --- a/fe/PC/src/views/basicData/SupplierManage/Supplier.vue +++ b/fe/PC/src/views/basicData/SupplierManage/Supplier.vue @@ -217,20 +217,20 @@ export default { tableColumns: 'SupplierTimeWindow', functionName: 'bySupplierCode' }, - { - label: "发货单列表", - name: 'fhdlb', - url: 'wms/store/arrive-notice', - tableColumns: 'PurchaseReceiptRequest', - functionName: 'bySupplierCode' - }, - { - label: "到货单列表", - name: 'dhdlb', - url: 'wms/store/supplier-asn', - tableColumns: 'SupplierAsn', - functionName: 'bySupplierCode' - } + // { + // label: "发货单列表", + // name: 'fhdlb', + // url: 'wms/store/arrive-notice', + // tableColumns: 'PurchaseReceiptRequest', + // functionName: 'bySupplierCode' + // }, + // { + // label: "到货单列表", + // name: 'dhdlb', + // url: 'wms/store/supplier-asn', + // tableColumns: 'SupplierAsn', + // functionName: 'bySupplierCode' + // } ] }; }, diff --git a/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue b/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue index 4cf9b0e6d..c448719ea 100644 --- a/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue +++ b/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue @@ -256,7 +256,7 @@ export default { } fileStorageCreate(params).then( createRes => { that.CreateFormData.pictureBlobName = createRes - // 创建供应商自检报告接口 + // 创建作业指导书接口 postCreate(that.CreateFormData, that.URL).then(res => { that.Loading.newAndEdiLoading = false that.FormResult("success") diff --git a/fe/PC/src/views/kittingManage/Kitting.vue b/fe/PC/src/views/kittingManage/Kitting.vue index 03a9b1b8d..cbd71d032 100644 --- a/fe/PC/src/views/kittingManage/Kitting.vue +++ b/fe/PC/src/views/kittingManage/Kitting.vue @@ -52,7 +52,7 @@ :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} isAllowPartImportValue="1" - @importClick="postImportMergeClick(arguments)" + @importClick="postImportAloneClick(arguments)" @postImportDown="importDown" > @@ -94,7 +94,7 @@