Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f83513ab8c
@ -76,6 +76,7 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService {
|
||||
hashMap.put("mdItemId", mdItem.getItemId()); // 物料ID
|
||||
hashMap.put("mdItemCode", mdItem.getItemCode()); // 物料编码
|
||||
hashMap.put("mdItemName", mdItem.getItemName()); // 物料名称
|
||||
hashMap.put("mdItemKnifeWarn", mdItem.getAttr2()); // 物料名称
|
||||
/* 来自计划 */
|
||||
hashMap.put("planCode", wmsOutPlan.getPlanCode()); // 计划编号
|
||||
hashMap.put("planStatus", wmsOutPlan.getPlanState()); // 计划状态
|
||||
@ -99,6 +100,12 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService {
|
||||
hashMap.put("baseKnifeId", nowWmsOutPlanDetailEntity.getBaseKnifeId());
|
||||
hashMap.put("knifeLife", nowWmsOutPlanDetailEntity.getKnifeLife());
|
||||
hashMap.put("resetCount", nowWmsOutPlanDetailEntity.getResetCount());
|
||||
|
||||
// 寿命预警
|
||||
if (nowWmsOutPlanDetailEntity.getKnifeLife() <= mdItem.getAttr2())
|
||||
hashMap.put("knifeWarning", true);
|
||||
else
|
||||
hashMap.put("knifeWarning", false);
|
||||
hashMapList.add(hashMap);
|
||||
|
||||
// 注入出库信息对象
|
||||
|
Loading…
Reference in New Issue
Block a user