root/liaoNingShengHua2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
ludj
2023-03-07 13:21:52 +08:00
parent ca3784eb76
commit 5cf076aa09
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java
View File

@@ -104,7 +104,6 @@ public class MaterialbaseDto implements Serializable {
private Long ass_unit_id; private Long ass_unit_id;
private Long product_series;
private Integer standing_time; private Integer standing_time;
} }

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql
View File

@@ -49,15 +49,11 @@
class.class_name, class.class_name,
unit_name, unit_name,
'50' as standard_weight, '50' as standard_weight,
unit_name as base_unit_id_name, unit_name as base_unit_id_name
class2.class_code as product_series_code,
class2.class_name as product_series_name
FROM FROM
md_me_materialbase mb md_me_materialbase mb
LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id 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_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 WHERE
mb.is_delete = '0' mb.is_delete = '0'
and 输入.idssql and 输入.idssql

7
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
View File

@@ -24,7 +24,6 @@
输入.end_time TYPEAS s_string 输入.end_time TYPEAS s_string
输入.produceorder_code TYPEAS s_string 输入.produceorder_code TYPEAS s_string
输入.material TYPEAS s_string 输入.material TYPEAS s_string
输入.product_series TYPEAS f_string
输入.workprocedure_ids TYPEAS f_string 输入.workprocedure_ids TYPEAS f_string
输入.unFinish TYPEAS s_string 输入.unFinish TYPEAS s_string
@@ -57,14 +56,10 @@
ShiftOrder.*, ShiftOrder.*,
material.material_code, material.material_code,
material.material_name, material.material_name,
material.material_spec, material.material_spec
material.product_series,
classstandard.class_id,
classstandard.class_name
FROM FROM
PDM_BD_WORKORDER ShiftOrder PDM_BD_WORKORDER ShiftOrder
LEFT JOIN md_me_materialbase material ON material.material_id = ShiftOrder.material_id 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 WHERE
ShiftOrder.is_delete = '0' ShiftOrder.is_delete = '0'
OPTION 输入.unFinish <> "" OPTION 输入.unFinish <> ""