From affcc6dbc16046ae14e73be5e440c4e2f8dadd68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= Date: Wed, 24 Apr 2024 17:24:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=95=86=E8=B4=A2=E5=8A=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/scm/WarehousingStorageMapper.xml | 36 ++++++++++--------- .../jnpf/mapper/WarehousingStorageMapper.java | 5 ++- .../impl/WarehousingStorageServiceImpl.java | 8 ++++- .../WarehousingStoragePagination.java | 3 ++ .../cwaccount/Warehousingstorageoutbound.vue | 17 ++++++++- .../src/views/extend/cwaccount/form.vue | 22 +++++++++--- .../views/extend/cwpaymentreceipt/form.vue | 5 +-- .../views/extend/cwpaymentreceipt/index.vue | 4 +-- .../src/views/extend/cwsettlement/form.vue | 5 +-- .../cwsettlement/settlementaccountList.vue | 7 +++- 10 files changed, 77 insertions(+), 35 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml index deb7cc25..a5b47788 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml @@ -16,25 +16,26 @@ WHERE t1.f_delete_mark IS NULL AND t1.id = #{id} - SELECT a.id storageId, a.document_no documentNo, a.warehousing_id warehousingId, a.warehouse_id warehouseId, a.warehousing_time warehousingTime, d.code orderCode, - (SELECT COUNT(1) from jg_warehousing_outbound_product WHERE warehousing_outbound_id = a.id) skuNum, - (SELECT COUNT(1) from jg_warehousing_outbound_poundlist WHERE warehousing_outbound_id = a.id) voucherNum, + (SELECT COUNT(1) from jg_warehousing_storage_product WHERE warehousing_storage_id = a.id) skuNum, + (SELECT COUNT(1) from jg_warehousing_storage_poundlist WHERE warehousing_storage_id = a.id) voucherNum, a.f_creator_time storageTime, - case a.warehousing_outbound_type WHEN 1 THEN '销售出库' WHEN 3 THEN '退供出库' WHEN 12 THEN '销售发货单出库' WHEN 9 THEN '库存初始化' END warehousingStorageType, + case a.warehousing_storage_type WHEN 1 THEN '采购入库' WHEN 3 THEN '退货入库' WHEN 11 THEN '库存初始化' WHEN 15 THEN '采购收货单入库' END warehousingStorageType, e.name warehouseName - from jg_warehousing_outbound a + from jg_warehousing_storage a LEFT JOIN flow_task b on a.id = b.f_process_id LEFT JOIN jg_warehousing_notification c ON a.warehousing_id = c.id LEFT JOIN jg_business_order d ON c.business_id = d.id - LEFT JOIN jg_business_line e ON a.warehouse_id = e.id ${ew.customSqlSegment} - and a.f_delete_mark is null and a.document_no not in (SELECT document_no from jg_cw_account_storage where f_delete_mark is null) - and (b.f_status = '2' OR b.f_status is null) and a.warehousing_outbound_type in (1,3,12,9) + LEFT JOIN jg_business_line e ON a.warehouse_id = e.id + ${ew.customSqlSegment} and a.f_delete_mark is null and a.document_no not in (SELECT document_no from jg_cw_account_storage where f_delete_mark is null) + and (b.f_status = '2' OR b.f_status is null) and a.warehousing_storage_type in (1,3,11,15) + and d.first_subject_basic_id = #{warehousingStoragePagination.subjectId} and d.contract_id = #{warehousingStoragePagination.contractId} and a.id not in - UNION ALL + + +