From 2c1fd10c6fbabb8e9f0e9f07fe66fb36c008e883 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期二, 10 三月 2026 14:13:54 +0800
Subject: [PATCH] feat: 辅料消耗细化-列表和新增界面添加<物料代码>
---
src/main/java/com/shlanbao/tzsc/pms/sch/stat/service/impl/StatServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/shlanbao/tzsc/pms/sch/stat/service/impl/StatServiceImpl.java b/src/main/java/com/shlanbao/tzsc/pms/sch/stat/service/impl/StatServiceImpl.java
index 636f29a..1f75556 100644
--- a/src/main/java/com/shlanbao/tzsc/pms/sch/stat/service/impl/StatServiceImpl.java
+++ b/src/main/java/com/shlanbao/tzsc/pms/sch/stat/service/impl/StatServiceImpl.java
@@ -248,6 +248,7 @@
String order = schStatInput.getSchStatOutput().getSchWorkorder().getCode();
order = order.substring(0,order.indexOf('#'));
String matCode = schStatInput.getMdMat().getCode();
+ bean.setMatCode(matCode);
List<?> inputs = schStatInputDao.queryBySql("select t1.num-t2.num num, t1.uom from (select nvl(sum(quantity),0) num,uom from SCH_WORKORDER_IO a " +
" where a.replace_material like ? and a.MATERIAL_CODE = ? and a.inout_type in ('1','4') group by uom) t1,("+
@@ -317,6 +318,7 @@
bean = BeanConvertor.copyProperties(schStatInput, InputBean.class);
bean.setMat(schStatInput.getMdMat().getName());
+ bean.setMatCode(schStatInput.getMdMat().getCode());
bean.setUnit(schStatInput.getMdUnit().getName());
//鏌ヨ姣忎釜鐗╂枡娑堣�楀搴旀爣鍑嗗崟鑰楄〃鐨勪笂闄愬�硷紝涓嬮檺鍊笺��
@@ -779,7 +781,17 @@
"where o.eqptype = e.equipmentPosition and o.bom_lot_id=? and o.mdMat.id not in " +
"(select i.mdMat.id from SchStatInput i where i.schStatOutput.schWorkorder.id=?) " +
"and e.id = ? ";
- return BeanConvertor.copyList(schStatInputDao.query(List.class, hql, bean.getBomVersion(), bean.getId(),bean.getEquipmentId()), Combobox.class);
+ //return BeanConvertor.copyList(schStatInputDao.query(List.class, hql, bean.getBomVersion(), bean.getId(),bean.getEquipmentId()), Combobox.class);
+ //杩斿洖鏁版嵁text鐢眓ame鏇存柊涓簄ame(code)
+ List<?> mats = schStatInputDao.query(List.class, hql, bean.getBomVersion(), bean.getId(), bean.getEquipmentId());
+ List<Combobox> list = new java.util.ArrayList<Combobox>();
+ if (mats != null && mats.size() > 0) {
+ for (Object o : mats) {
+ com.shlanbao.tzsc.base.mapping.MdMat m = (com.shlanbao.tzsc.base.mapping.MdMat) o;
+ list.add(new Combobox(m.getId(), m.getName() + "(" + m.getCode() + ")"));
+ }
+ }
+ return list;
}
@Override
--
Gitblit v1.9.3