|
|
@@ -1,18 +1,5 @@
|
|
|
package com.uas.mes.pm.service.impl;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.Iterator;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Set;
|
|
|
-
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Propagation;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
-
|
|
|
import com.uas.mes.common.dao.MakeDao;
|
|
|
import com.uas.mes.common.dao.MakeNoticeDetailDao;
|
|
|
import com.uas.mes.common.dao.MrpDao;
|
|
|
@@ -32,8 +19,13 @@ import com.uas.mes.core.util.MapComparator;
|
|
|
import com.uas.mes.dao.TransferRepository;
|
|
|
import com.uas.mes.model.Key;
|
|
|
import com.uas.mes.pm.service.BatchDealService;
|
|
|
-
|
|
|
import net.sf.json.JSONObject;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Propagation;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
+
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Service("PmBatchDealService")
|
|
|
public class BatchDealServiceImpl implements BatchDealService {
|
|
|
@@ -2183,4 +2175,15 @@ public class BatchDealServiceImpl implements BatchDealService {
|
|
|
return "确认成功";
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public String SmtMessageConfirm(String caller, String data) {
|
|
|
+ List<Map<Object, Object>> store = BaseUtil.parseGridStoreToMaps(data);
|
|
|
+ // 1.判断是否为待确认状态
|
|
|
+ String ids = CollectionUtil.pluckSqlString(store, "sml_id");
|
|
|
+ // 2.更新ms_checkpack=0
|
|
|
+ String updateSql = "UPDATE SMTMESSAGELOG SET sml_confirm=-1 WHERE sml_id IN (" + ids + ")";
|
|
|
+ baseDao.execute(updateSql);
|
|
|
+ return "确认成功";
|
|
|
+ }
|
|
|
+
|
|
|
}
|