From 2272511278a12a79bf8a15d2a5240f82d12a01d1 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 11 Dec 2024 23:15:16 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E4=B8=BB=E8=A1=A8=E6=BA=90=E5=8D=95=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/domain/entity/BaseQuery.java | 4 ++-- .../pda_manage/iostorage/sevice/PdaIOService.java | 1 + .../service/dao/mapper/xml/PmFormDataMapper.xml | 3 +++ .../form_data/service/dto/FormDataQuery.java | 8 ++++++++ .../stor_manage/io/service/dto/StorInvQuery.java | 1 + .../io/service/iostor/dao/StIvtIostorinv.java | 5 +++++ .../qd/src/views/wms/stor_manage/in/AddDialog.vue | 12 ++++++++++++ wms_pro/qd/src/views/wms/stor_manage/in/index.vue | 12 +++++++++++- .../src/views/wms/stor_manage/out/AddDialog.vue | 15 +++++++++++---- .../qd/src/views/wms/stor_manage/out/index.vue | 11 ++++++++++- 10 files changed, 64 insertions(+), 8 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java index 71373a94..490cd094 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java @@ -58,9 +58,9 @@ public class BaseQuery { * 通过buid构建 */ public Map doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build() - ,"start_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LT).build() + ,"start_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.GE).build() ,"end_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LE).build() - ,"plan_start_time", QParam.builder().k(new String[]{"plandeliver_date"}).type(QueryTEnum.LE).build() + ,"plan_start_time", QParam.builder().k(new String[]{"plandeliver_date"}).type(QueryTEnum.GE).build() ,"plan_end_time", QParam.builder().k(new String[]{"plandeliver_date"}).type(QueryTEnum.LE).build() ,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build() ); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java index ed85185e..89deadd8 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java @@ -110,6 +110,7 @@ public class PdaIOService { mst.setCode(CodeUtil.getNewCode("IO_CODE")); mst.setStatus(StatusEnum.FORM_STATUS.code("已分配")); mst.setSource_form_id(pdaFormOutMst.getId()); + mst.setSource_form_code(pdaFormOutMst.getCode()); mst.setSource_form_type(pdaFormOutMst.getForm_type()); mst.setProduct_area(mst.getForm_data().getString("product_area")); mst.setBill_type(billType); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml index bd6718b4..3e536ea9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml @@ -120,6 +120,9 @@ and code = #{query.code} + + and code = #{query.search} + and pm_form_data.status IN diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java index f41195cb..736730ad 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java @@ -2,6 +2,8 @@ package org.nl.wms.pm_manage.form_data.service.dto; import lombok.Data; import org.nl.common.domain.entity.BaseQuery; +import org.nl.common.domain.entity.QParam; +import org.nl.common.enums.QueryTEnum; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import java.util.Map; @@ -15,7 +17,13 @@ public class FormDataQuery extends BaseQuery { private String form_type; private String code; + private String search; private String parent_id; private String[] status; private Map form_query; + + @Override + public void paramMapping() { + super.doP.put("search", QParam.builder().k(new String[]{"code"}).type(QueryTEnum.EQ).build()); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java index 95c6f328..359383b1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java @@ -16,5 +16,6 @@ public class StorInvQuery extends BaseQuery{ private String bill_type; private Boolean in_storage; private String product_code; + private String source_form_code; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java index 2365ff5d..5fc07d67 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java @@ -61,6 +61,11 @@ public class StIvtIostorinv implements Serializable { */ private String source_form_id; + /** + * 源单编码 + */ + private String source_form_code; + /** * 源单类型 */ diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue index a26e8bea..87366407 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue @@ -48,6 +48,9 @@ + + + @@ -152,6 +155,11 @@ + + + + + +