From 5adbe7cf5f58d940accfd5bcb0603bb524724968 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Mon, 6 Jan 2025 15:32:54 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BF=AE=E5=A4=8D=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E9=97=AE=E9=A2=98=EF=BC=9B=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=EF=BC=9B=E4=BF=AE=E5=A4=8DERP?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=97=B6=E9=97=B4=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/StIvtIostorinvOutMapper.xml | 5 +- .../task/SyncErpBillsScheduleService.java | 8 +- .../views/wms/stor_manage/record/index.vue | 81 +++++++++++++------ 3 files changed, 65 insertions(+), 29 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml index 1da3e86a..ed9c5aa4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml @@ -32,7 +32,7 @@ and st_ivt_iostorinvdtl.vehicle_code = #{query.vehicles} - and (md_me_materialbase.material_spec LIKE '%${query.material}%' + and (md_me_materialbase.material_code LIKE '%${query.material}%' or md_me_materialbase.material_name LIKE '%${query.material}%') @@ -41,6 +41,9 @@ and st_ivt_iostorinv.source_form_code = #{query.source_form_code} + + and st_ivt_iostorinv.create_time >= #{query.start_time} and st_ivt_iostorinv.update_time <= #{query.end_time} + GROUP BY st_ivt_iostorinv.id order by st_ivt_iostorinv.id desc diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java index 4336626c..6cdc4496 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java @@ -106,7 +106,7 @@ public class SyncErpBillsScheduleService { MDC.put("requestIp", "127.0.0.1"); MDC.put("requestTime", DateUtil.now()); LuceneAppender.traceIdTL.set(BaseCode.intToChars(IdUtil.getLongId())); - //List list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper().in(SyncFormMapping::getForm_type, "BD_MATERIAL")); + // List list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper().in(SyncFormMapping::getForm_type, "ka7c19edf9d4b4b39b8cc4a06802163b0")); List strucList = bmFormStrucServiceImpl.list(new LambdaQueryWrapper().eq(BmFormStruc::getIs_sync, "1")); Set structSet = strucList.stream().map(BmFormStruc::getForm_type).collect(Collectors.toSet()); List list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper().in(SyncFormMapping::getForm_type, structSet)); @@ -194,7 +194,7 @@ public class SyncErpBillsScheduleService { timeStart = start; timeEnd = end; } - String filterString = getFilterString(formType, code, timeEnd, timeStart); + String filterString = getFilterString(formType, code, timeStart, timeEnd); ErpQuery query = new ErpQuery(); query.setFilterString(filterString); query.setFormId(formType); @@ -222,7 +222,7 @@ public class SyncErpBillsScheduleService { } } - private static String getFilterString(String formType, String code, String timeEnd, String timeStart) { + private static String getFilterString(String formType, String code, String timeStart, String timeEnd) { String filterString; if (StringUtils.isNotBlank(code)) { filterString = "FBillNo = '" + code + "'"; @@ -232,7 +232,7 @@ public class SyncErpBillsScheduleService { filterString += "AND FDocumentStatus = 'C' AND F_PMSY_BillStatus = 'A' AND F_PMSY_CreateDate >= '" + timeStart + " 00:00:00' AND F_PMSY_CreateDate <= '" + timeEnd + " 23:59:59' "; } else if ("SAL_SaleOrder".equals(formType)) { filterString += " AND FDocumentStatus = 'C' AND FCloseStatus ='A' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' "; - } else if ("STK_TransferDirect".equals(formType)||"STK_MisDelivery".equals(formType)||"PUR_MRB".equals(formType)||"SAL_RETURNSTOCK".equals(formType)) { + } else if ("STK_TransferDirect".equals(formType) || "STK_MisDelivery".equals(formType) || "PUR_MRB".equals(formType) || "SAL_RETURNSTOCK".equals(formType)) { filterString += " AND FDocumentStatus ='B' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' "; } else { filterString += " AND FDocumentStatus = 'C' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' "; diff --git a/wms_pro/qd/src/views/wms/stor_manage/record/index.vue b/wms_pro/qd/src/views/wms/stor_manage/record/index.vue index 2d8b541a..a00e004d 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/record/index.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/record/index.vue @@ -20,6 +20,39 @@ class="filter-item" /> + + + + + + + + + - + - + - - - - - + + + + + - - - - - - - - + + + + + + + + - + @@ -80,14 +113,14 @@ - +