邮件内容和格式修改

src/main/java/com/neotel/smfcore/core/inList/util/InListCache.java

@@ -137,10 +137,10 @@ public class InListCache {
         if (listOk) {
         if (listOk) {
             inList.setStatus(INLIST_STATUS.OK);
             inList.setStatus(INLIST_STATUS.OK);
             log.info("UpdateInList  入库单["  + inListName + "]更改状态为：OK");
             log.info("UpdateInList  入库单["  + inListName + "]更改状态为：OK");
-        } /*else if (updateOk) {
+        } else if (updateOk && !listOk) {
             inList.setStatus(INLIST_STATUS.ABNORMAL);
             inList.setStatus(INLIST_STATUS.ABNORMAL);
             log.info("UpdateInList  入库单["  + inListName + "]更改状态为：ABNORMAL");
             log.info("UpdateInList  入库单["  + inListName + "]更改状态为：ABNORMAL");
-        }*/
+        }
         listManager.save(inList);
         listManager.save(inList);
         addInListToMap(inList);
         addInListToMap(inList);
 
 

src/main/java/com/neotel/smfcore/custom/micron20031/manager/MicronSpTimerProcess.java

 package com.neotel.smfcore.custom.micron20031.manager;
 package com.neotel.smfcore.custom.micron20031.manager;
 
 
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.Constants;
+import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
@@ -89,8 +90,11 @@ public class MicronSpTimerProcess {
                             if (item.getNum() - item.getInNum() > 0) {
                             if (item.getNum() - item.getInNum() > 0) {
                                 //发送邮件
                                 //发送邮件
                                 log.info("sendEmail入库单:" + inList.getName());
                                 log.info("sendEmail入库单:" + inList.getName());
-                                String content = "Matreq [" + inList.getName() + "] has exceed expected loading time";
-                                Micron20031Api.sendEmail(Micron20031Api.Email_TO, Micron20031Api.Email_CC, inList.getName(), content);
+                                String subject = "SPMMS-Matreq ["+inList.getName()+"] has exceed expected loading time";
+                                log.info("发送标题为:"+subject);
+                                String content = "SPMMS-Matreq ["+inList.getName()+"] has exceed expected loading time \n First loading date time:"+ DateUtil.toDateString(inList.getStartTime(),"yyyy-MM-dd HH:mm:ss");
+                                log.info("发送内容为:"+content);
+                                Micron20031Api.sendEmail(Micron20031Api.Email_TO, Micron20031Api.Email_CC, subject, content);
                                 log.info("sendEmail  [" + inList.getName() + "] [" + item.getRi() + "]  给[" + Micron20031Api.Email_TO + "][" + Micron20031Api.Email_CC + "] 成功");
                                 log.info("sendEmail  [" + inList.getName() + "] [" + item.getRi() + "]  给[" + Micron20031Api.Email_TO + "][" + Micron20031Api.Email_CC + "] 成功");
                                 item.setSendEmail(true);
                                 item.setSendEmail(true);
                                 inListItemManager.save(item);
                                 inListItemManager.save(item);