kelvin/wms-dj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liumingxiy 2024-11-12 08:52:54 +08:00
commit f83513ab8c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java
View File

@ -76,6 +76,7 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService {
hashMap.put("mdItemId", mdItem.getItemId()); // 物料ID hashMap.put("mdItemId", mdItem.getItemId()); // 物料ID
hashMap.put("mdItemCode", mdItem.getItemCode()); // 物料编码 hashMap.put("mdItemCode", mdItem.getItemCode()); // 物料编码
hashMap.put("mdItemName", mdItem.getItemName()); // 物料名称 hashMap.put("mdItemName", mdItem.getItemName()); // 物料名称
hashMap.put("mdItemKnifeWarn", mdItem.getAttr2()); // 物料名称
/* 来自计划 */ /* 来自计划 */
hashMap.put("planCode", wmsOutPlan.getPlanCode()); // 计划编号 hashMap.put("planCode", wmsOutPlan.getPlanCode()); // 计划编号
hashMap.put("planStatus", wmsOutPlan.getPlanState()); // 计划状态 hashMap.put("planStatus", wmsOutPlan.getPlanState()); // 计划状态
@ -99,6 +100,12 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService {
hashMap.put("baseKnifeId", nowWmsOutPlanDetailEntity.getBaseKnifeId()); hashMap.put("baseKnifeId", nowWmsOutPlanDetailEntity.getBaseKnifeId());
hashMap.put("knifeLife", nowWmsOutPlanDetailEntity.getKnifeLife()); hashMap.put("knifeLife", nowWmsOutPlanDetailEntity.getKnifeLife());
hashMap.put("resetCount", nowWmsOutPlanDetailEntity.getResetCount()); hashMap.put("resetCount", nowWmsOutPlanDetailEntity.getResetCount());
// 寿命预警
if (nowWmsOutPlanDetailEntity.getKnifeLife() <= mdItem.getAttr2())
hashMap.put("knifeWarning", true);
else
hashMap.put("knifeWarning", false);
hashMapList.add(hashMap); hashMapList.add(hashMap);
// 注入出库信息对象 // 注入出库信息对象