From 5cf076aa09c7bede206251c9adf6f7345a7ce810 Mon Sep 17 00:00:00 2001 From: ludj Date: Tue, 7 Mar 2023 13:21:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/basedata/service/dto/MaterialbaseDto.java | 1 - .../main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql | 6 +----- .../main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql | 7 +------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java index 4e2cd84..379afec 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java @@ -104,7 +104,6 @@ public class MaterialbaseDto implements Serializable { private Long ass_unit_id; - private Long product_series; private Integer standing_time; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql index fb52826..abae5b6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql @@ -49,15 +49,11 @@ class.class_name, unit_name, '50' as standard_weight, - unit_name as base_unit_id_name, - class2.class_code as product_series_code, - class2.class_name as product_series_name - + unit_name as base_unit_id_name FROM md_me_materialbase mb LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mb.base_unit_id - left join MD_PB_ClassStandard class2 on class2.class_id =mb.product_series WHERE mb.is_delete = '0' and 输入.idssql diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql index ba8370e..cea81bf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql @@ -24,7 +24,6 @@ 输入.end_time TYPEAS s_string 输入.produceorder_code TYPEAS s_string 输入.material TYPEAS s_string - 输入.product_series TYPEAS f_string 输入.workprocedure_ids TYPEAS f_string 输入.unFinish TYPEAS s_string @@ -57,14 +56,10 @@ ShiftOrder.*, material.material_code, material.material_name, - material.material_spec, - material.product_series, - classstandard.class_id, - classstandard.class_name + material.material_spec FROM PDM_BD_WORKORDER ShiftOrder LEFT JOIN md_me_materialbase material ON material.material_id = ShiftOrder.material_id - LEFT JOIN md_pb_classstandard classstandard ON classstandard.class_id = material.product_series WHERE ShiftOrder.is_delete = '0' OPTION 输入.unFinish <> ""