Browse Source

pda新增当前派工单显示

master
qiankanghui 1 day ago
parent
commit
a56b3bb2de
  1. 1
      src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
  2. 4
      src/main/resources/static/js/pda/scanningOfToolProductionTransfer2.js
  3. 1
      src/main/resources/templates/pda/scanningOfToolProductionTransfer2.ftl

1
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("toolDescription",toolDesc);
map.put("residualLife",new BigDecimal(toolDetailData.getEstUseQty()+"").subtract(new BigDecimal(toolDetailData.getActualUseQty()+""))); 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("lifeReminder",new BigDecimal(toolDetailData.getActualUseQty()+"").compareTo(new BigDecimal(toolDetailData.getEstUseQty()+"").multiply(new BigDecimal("0.9"))) > 0);
map.put("nowSeqNo",toolDetailData.getNowSeqNo());
return map; return map;
} }

4
src/main/resources/static/js/pda/scanningOfToolProductionTransfer2.js

@ -100,10 +100,10 @@ function initTableBody(){
let toolDetail = resultToolList[i] let toolDetail = resultToolList[i]
html+=`<tr class="${toolDetail.lifeReminder?'danger':''}"><td>${toolDetail.toolInstanceID}</td> html+=`<tr class="${toolDetail.lifeReminder?'danger':''}"><td>${toolDetail.toolInstanceID}</td>
<td style="display: none;">${toolDetail.toolID}</td><td>${toolDetail.toolDescription}</td> <td style="display: none;">${toolDetail.toolID}</td><td>${toolDetail.toolDescription}</td>
<td style="display: none;">${toolDetail.residualLife}</td><td><span style="cursor: pointer;text-decoration:underline" onclick="removeToolDetail(${i})">删除</span></td></tr>`
<td style="display: none;">${toolDetail.residualLife}</td><td>${toolDetail.nowSeqNo == null ? '' : toolDetail.nowSeqNo}</td><td><span style="cursor: pointer;text-decoration:underline" onclick="removeToolDetail(${i})">删除</span></td></tr>`
} }
}else { }else {
html = `<tr"><td colspan="3">暂无数据</td></tr>`
html = `<tr"><td colspan="4">暂无数据</td></tr>`
} }
$(".tool_body").html(html) $(".tool_body").html(html)
} }

1
src/main/resources/templates/pda/scanningOfToolProductionTransfer2.ftl

@ -92,6 +92,7 @@
<th style="display: none;">模具编码</th> <th style="display: none;">模具编码</th>
<th>模具名称</th> <th>模具名称</th>
<th style="display: none;">剩余寿命</th> <th style="display: none;">剩余寿命</th>
<th>当前派工单号</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>

Loading…
Cancel
Save