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 +++++++++++++-
src/main/webapp/pms/sch/stat/stat_chengxing_fb.jsp | 5 +++++
src/main/webapp/pms/sch/stat/stat_chengxing.jsp | 12 +++++++++---
src/main/webapp/pms/sch/stat/stat_juanbao_fb.jsp | 5 +++++
src/main/webapp/pms/sch/stat/stat_juanbao.jsp | 5 +++++
5 files changed, 37 insertions(+), 4 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
diff --git a/src/main/webapp/pms/sch/stat/stat_chengxing.jsp b/src/main/webapp/pms/sch/stat/stat_chengxing.jsp
index 7dd6521..c97ad7c 100644
--- a/src/main/webapp/pms/sch/stat/stat_chengxing.jsp
+++ b/src/main/webapp/pms/sch/stat/stat_chengxing.jsp
@@ -10,6 +10,7 @@
<script type="text/javascript">
var inputGrid = null;
var outputGrid = null;
+ var curOutId = null;
$(function () {
@@ -232,6 +233,7 @@
},
onClickRow: function (rowIndex, rowData) {
+ curOutId = rowData.id;
getAllInputsByOutput(rowData.id);
}
});
@@ -253,15 +255,19 @@
rownumbers: true,
columns: [[{
field: 'id',
- title: 'id',
- width: 120,
- hidden: true
+ title: '缂栧彿',
+ checkbox: true
}, {
field: 'mat',
title: '鐗╂枡鍚嶇О',
width: 200,
align: 'center'
}, {
+ field: 'matCode',
+ title: '鐗╂枡缂栫爜',
+ width: 100,
+ align: 'center'
+ }, {
field: 'qty',
title: '娑堣�楅噺',
align: 'right',
diff --git a/src/main/webapp/pms/sch/stat/stat_chengxing_fb.jsp b/src/main/webapp/pms/sch/stat/stat_chengxing_fb.jsp
index 98b1e4b..e7c1075 100644
--- a/src/main/webapp/pms/sch/stat/stat_chengxing_fb.jsp
+++ b/src/main/webapp/pms/sch/stat/stat_chengxing_fb.jsp
@@ -264,6 +264,11 @@
width: 200,
align: 'center'
}, {
+ field: 'matCode',
+ title: '鐗╂枡缂栫爜',
+ width: 100,
+ align: 'center'
+ },{
field: 'qty',
title: '娑堣�楅噺',
align: 'right',
diff --git a/src/main/webapp/pms/sch/stat/stat_juanbao.jsp b/src/main/webapp/pms/sch/stat/stat_juanbao.jsp
index 58e0f24..2dbd98a 100644
--- a/src/main/webapp/pms/sch/stat/stat_juanbao.jsp
+++ b/src/main/webapp/pms/sch/stat/stat_juanbao.jsp
@@ -275,6 +275,11 @@
width: 200,
align: 'center'
}, {
+ field: 'matCode',
+ title: '鐗╂枡缂栫爜',
+ width: 100,
+ align: 'center'
+ }, {
field: 'qty',
title: '娑堣�楅噺',
align: 'right',
diff --git a/src/main/webapp/pms/sch/stat/stat_juanbao_fb.jsp b/src/main/webapp/pms/sch/stat/stat_juanbao_fb.jsp
index c34c777..e285087 100644
--- a/src/main/webapp/pms/sch/stat/stat_juanbao_fb.jsp
+++ b/src/main/webapp/pms/sch/stat/stat_juanbao_fb.jsp
@@ -273,6 +273,11 @@
title: '鐗╂枡鍚嶇О',
width: 200,
align: 'center'
+ },{
+ field: 'matCode',
+ title: '鐗╂枡缂栫爜',
+ width: 100,
+ align: 'center'
}, {
field: 'qty',
title: '娑堣�楅噺',
--
Gitblit v1.9.3