From 62781c8025112c5b0d2d1edce51ca50e9b1b4930 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 6 Jan 2025 08:28:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=BC=BA=E9=99=B7:FWHL-146?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/countManage/count/countPlanMain/countPlanMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 06e5da55d..29b55c41a 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -257,7 +257,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false + isTable: true }, { label: '创建者', From 60ec5745773a90363784a7fb261016de45699674 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 6 Jan 2025 13:08:57 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=BC=BA=E9=99=B7:FWHL-171?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrapRecordMain.data.ts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index 486bafab0..81a21929f 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -601,6 +601,30 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '制品单价', + field: 'singlePrice', + sort: 'custom', + isTable: true, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '制品金额', + field: 'amount', + sort: 'custom', + isTable: true, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, { label: '原料物料代码', field: 'itemCodeThird', From 1879c88a43e45f4eb705e87e2d05812e40cd9551 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 6 Jan 2025 14:07:57 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/modules/remaining.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 93b4a8b26..b2d91cfc1 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -36,7 +36,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: '/redirect', component: Layout, - name: 'Redirect', + name: 'redirectNew', children: [ { path: '/redirect/:path(.*)', From 0cd43e5fa864b645373b7610bf1725fa49683857 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 6 Jan 2025 19:17:28 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=BC=BA=E9=99=B7:FWHL-121?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierApbalance/supplierApbalanceMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue index 867c96cfa..e8a148244 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue @@ -290,7 +290,7 @@ const handleExport = async () => { // 发起导出 loadStart() const data = await SupplierApbalanceMainApi.exportSupplierApbalanceMain(tableObject.params) - download.excel(data, '供应商余额明细主.xlsx') + download.excel(data, '供应商对账管理.xlsx') } catch { } finally { loadDone() From 3979e477a737c495951c317de8bc386a8ce47d55 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 7 Jan 2025 09:48:46 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=BC=BA=E9=99=B7:FWHL-67?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demandforecastingMain.data.ts | 18 +++++++++++++++++- .../demandforecastingMain.data.ts | 16 ++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index 45de11ae8..add355672 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -211,7 +211,7 @@ export const Version = useCrudSchemas(reactive([ label: '子表版本', field: 'detailVersion', sort: 'custom', - } + }, ])) export const DemandforecastingMain = useCrudSchemas(reactive([ { @@ -362,6 +362,22 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ } } }, + { + label: '先前累计需求', + field: 'schdPcrQty', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '累计收货量', + field: 'schdCumrcQty', + sort: 'custom', + table: { + width: 150 + } + }, { label: '到货日期', field: 'dueDate', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts index 2ffc91738..93893d78c 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts @@ -148,6 +148,22 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ } } }, + { + label: '先前累计需求', + field: 'schdPcrQty', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '累计收货量', + field: 'schdCumrcQty', + sort: 'custom', + table: { + width: 150 + } + }, { label: '到货日期', field: 'dueDate', From 5ef8a86178589eff021513873200429cfc33f6e7 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 7 Jan 2025 10:59:07 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BC=BA=E9=99=B7:FWHL-140?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/balance/index.ts | 12 ++++++++++++ .../productredressRequestMain.data.ts | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 2a2445c38..a3b9fff17 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -120,6 +120,18 @@ export const getBalancePageByBusinessTypeByItemType = async (params) => { } } + +// 查询库存余额列表根据业务类型的物料类型--制品回收 +export const getBalancePageByBusinessTypeByItemTypeProductredress = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance/seniorBusinessTypeByItemTypeProductredress', data }) + } else { + return await request.get({ url: `/wms/balance/pageBusinessTypeByItemTypeProductredress`, params }) + } +} + // 备件出库查询库存余额列表 export const getBalancePageSpare = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index 87b4036e2..ce4293041 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -557,7 +557,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessTypeByItemTypeProductredress, // 查询弹窗所需分页方法 searchCondition: [{ key: 'businessType', value: businessTypeData.code, From 381da72dfcf2f3a3bed35d8ffeec42cfb8632add Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 7 Jan 2025 11:13:03 +0800 Subject: [PATCH 7/7] =?UTF-8?q?FWHL-140@=E7=8E=8B=E5=AE=87=E9=A3=9E=20?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E9=80=89=E5=AE=8C=E5=B7=A5=E4=BD=8D=E4=B9=9F=E7=BB=99?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=88=E8=B5=8B=E5=80=BC=EF=BC=8C=E7=84=B6?= =?UTF-8?q?=E5=90=8E=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BC=A0=E7=94=9F=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredress/productredressRequestMain/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index 4f3fd7fcd..0153c8c7b 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -173,12 +173,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => //车间代码 setV['productionLineCode'] = '' setV['workStationCode'] = '' + tableData.value = [] }else if('productionLineCode'==formField){ //生产线 setV['workStationCode'] = '' + tableData.value = [] }else if('workStationCode'==formField){ //工位代码 - setV['productionLineCode1'] = val[0]['productionLineCode']//用于没选生产线代码，给后端用 + setV['productionLineCode'] = val[0]['productionLineCode']//用于没选生产线代码，给后端用 + tableData.value = [] } formRef.setValues(setV) }