From dd3f33d7e1899995175b85dec2b54876cdb7ef7a Mon Sep 17 00:00:00 2001
From: Stang <32996823@qq.com>
Date: Mon, 11 Nov 2024 17:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BF=E5=91=BD=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java
index 2feba77..efd6801 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java
@@ -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);
 
             // 注入出库信息对象