1.点料增加Mpn返回

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -211,6 +211,9 @@ public class TaskService {
     public void addTaskToExecute(DataLog taskToExecute) throws ValidateException {
     public void addTaskToExecute(DataLog taskToExecute) throws ValidateException {
         Collection<DataLog> tasks = taskMap.values();
         Collection<DataLog> tasks = taskMap.values();
         for (DataLog task : tasks) {
         for (DataLog task : tasks) {
+            if (!task.isWait() && !task.isExecuting()){
+                continue;
+            }
             String barcode = taskToExecute.getBarcode();
             String barcode = taskToExecute.getBarcode();
             String posName = taskToExecute.getPosName();
             String posName = taskToExecute.getPosName();
             if(task.getType() == taskToExecute.getType()){
             if(task.getType() == taskToExecute.getType()){

src/main/java/com/neotel/smfcore/custom/Jkem21481/controller/JkemController.java

@@ -556,12 +556,14 @@ public class JkemController {
         resultMap.put("orderNo",barcode.getOrderNo());
         resultMap.put("orderNo",barcode.getOrderNo());
         resultMap.put("checkingRi",newBarcode.getBarcode());
         resultMap.put("checkingRi",newBarcode.getBarcode());
         resultMap.put("feeder","");
         resultMap.put("feeder","");
+        resultMap.put("mpn","");
         DataLog lastTask = dataLogManager.findOne(new Query(Criteria.where("barcode").is(barcode.getBarcode())).with(Sort.by(Sort.Direction.DESC, "createDate")));
         DataLog lastTask = dataLogManager.findOne(new Query(Criteria.where("barcode").is(barcode.getBarcode())).with(Sort.by(Sort.Direction.DESC, "createDate")));
         if (lastTask != null && lastTask.isCheckOutTask()) {
         if (lastTask != null && lastTask.isCheckOutTask()) {
             String export = lastTask.getExport();
             String export = lastTask.getExport();
             if (StringUtils.isNotEmpty(export)) {
             if (StringUtils.isNotEmpty(export)) {
                 String feederInfo = lastTask.getAppendData("feederInfo");
                 String feederInfo = lastTask.getAppendData("feederInfo");
                 resultMap.put("feeder",feederInfo);
                 resultMap.put("feeder",feederInfo);
+                resultMap.put("mpn",lastTask.getMpn());
             }
             }
         }
         }
         log.info("获取点料数量,barcode为:"+barcodeStr+",返回结果为:"+JSON.toJSONString(resultMap));
         log.info("获取点料数量,barcode为:"+barcodeStr+",返回结果为:"+JSON.toJSONString(resultMap));