Merge remote-tracking branch 'origin/master'

2022-07-07 18:20:39 +08:00
parent fa17793d69 283f9c207d
commit f1b8c67e99
3 changed files with 31 additions and 22 deletions
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql
@@ -204,6 +204,8 @@
                (case when dis.work_status = '01' then '生成' when dis.work_status = '99' then '完成' end) AS status_name,
                dis.sparepart_only_id,
                mb.material_name,
+                mb.material_spec,
+                mb.material_model,
                dis.pcsn,
                dis.real_qty,
                dis.qty_unit_name,