diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index 3bd2b71..93d9372 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -2469,6 +2469,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { map.put("toolDescription",toolDesc); map.put("residualLife",new BigDecimal(toolDetailData.getEstUseQty()+"").subtract(new BigDecimal(toolDetailData.getActualUseQty()+""))); map.put("lifeReminder",new BigDecimal(toolDetailData.getActualUseQty()+"").compareTo(new BigDecimal(toolDetailData.getEstUseQty()+"").multiply(new BigDecimal("0.9"))) > 0); + map.put("nowSeqNo",toolDetailData.getNowSeqNo()); return map; } diff --git a/src/main/resources/static/js/pda/scanningOfToolProductionTransfer2.js b/src/main/resources/static/js/pda/scanningOfToolProductionTransfer2.js index 8ea535e..d2b3d4b 100644 --- a/src/main/resources/static/js/pda/scanningOfToolProductionTransfer2.js +++ b/src/main/resources/static/js/pda/scanningOfToolProductionTransfer2.js @@ -100,10 +100,10 @@ function initTableBody(){ let toolDetail = resultToolList[i] html+=`${toolDetail.toolInstanceID} ${toolDetail.toolID}${toolDetail.toolDescription} - ${toolDetail.residualLife}删除` + ${toolDetail.residualLife}${toolDetail.nowSeqNo == null ? '' : toolDetail.nowSeqNo}删除` } }else { - html = `暂无数据` + html = `暂无数据` } $(".tool_body").html(html) } diff --git a/src/main/resources/templates/pda/scanningOfToolProductionTransfer2.ftl b/src/main/resources/templates/pda/scanningOfToolProductionTransfer2.ftl index 893f40b..6e0b1ec 100644 --- a/src/main/resources/templates/pda/scanningOfToolProductionTransfer2.ftl +++ b/src/main/resources/templates/pda/scanningOfToolProductionTransfer2.ftl @@ -92,6 +92,7 @@ 模具编码 模具名称 剩余寿命 + 当前派工单号 操作