1.工单出库,从所有料仓中查找

2.点料提供feeder信息

src/main/java/com/neotel/smfcore/common/bean/ResultBean.java

@@ -31,7 +31,7 @@ public class ResultBean<T> {
         result.setCode(code);
         result.setCode(code);
         result.setMsgKey(msgKey);
         result.setMsgKey(msgKey);
         result.setParams(params);
         result.setParams(params);
-        result.setMsg(MessageUtils.getText(msgKey, params, new Locale(SecurityUtils.getCurrentUserLanguage()), msg));
+        result.setMsg(MessageUtils.getText(msgKey, params, Locale.forLanguageTag(SecurityUtils.getCurrentUserLanguage()), msg));
         if (writeLog) {
         if (writeLog) {
             log.info(result.getMsg());
             log.info(result.getMsg());
         }
         }
@@ -45,7 +45,7 @@ public class ResultBean<T> {
         result.setCode(0);
         result.setCode(0);
         result.setMsgKey(msgKey);
         result.setMsgKey(msgKey);
         result.setParams(params);
         result.setParams(params);
-        result.setMsg(MessageUtils.getText(msgKey, params, new Locale(SecurityUtils.getCurrentUserLanguage()), msg));
+        result.setMsg(MessageUtils.getText(msgKey, params, Locale.forLanguageTag(SecurityUtils.getCurrentUserLanguage()), msg));
         result.setData(data);
         result.setData(data);
         return result;
         return result;
     }
     }

src/main/java/com/neotel/smfcore/common/utils/SecurityUtils.java

@@ -124,7 +124,7 @@ public class SecurityUtils {
         if(user!=null){
         if(user!=null){
             return user.getLanguage();
             return user.getLanguage();
         }
         }
-        return "zh-CN";
+        return "en-US";
     }
     }
     public static Map<String,Boolean> debugModelCache=new ConcurrentHashMap<>();
     public static Map<String,Boolean> debugModelCache=new ConcurrentHashMap<>();
 
 

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -794,7 +794,7 @@ public class DataCache {
         List<String> availableStorageIds = new ArrayList<>();
         List<String> availableStorageIds = new ArrayList<>();
         for (Storage storage : getAllStorage().values()) {
         for (Storage storage : getAllStorage().values()) {
             StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
             StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
-            if (bean == null || bean.timeOut() || !bean.isAvailable()) {
+            if (bean == null /*|| bean.timeOut() || !bean.isAvailable()*/) {
                 continue;
                 continue;
             }
             }
             log.info("获取到可用料仓为:"+storage.getName());
             log.info("获取到可用料仓为:"+storage.getName());

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

@@ -40,6 +40,9 @@ import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -551,6 +554,15 @@ public class JkemController {
         resultMap.put("checkingAmount",barcode.getCheckingAmount());
         resultMap.put("checkingAmount",barcode.getCheckingAmount());
         resultMap.put("orderNo",barcode.getOrderNo());
         resultMap.put("orderNo",barcode.getOrderNo());
         resultMap.put("checkingRi",newBarcode.getBarcode());
         resultMap.put("checkingRi",newBarcode.getBarcode());
+        resultMap.put("feeder","");
+        DataLog lastTask = dataLogManager.findOne(new Query(Criteria.where("barcode").is(barcode.getBarcode())).with(Sort.by(Sort.Direction.DESC, "createDate")));
+        if (lastTask != null && lastTask.isCheckOutTask()) {
+            String export = lastTask.getExport();
+            if (StringUtils.isNotEmpty(export)) {
+                String feederInfo = lastTask.getAppendData("feederInfo");
+                resultMap.put("feeder",feederInfo);
+            }
+        }
         log.info("获取点料数量,barcode为:"+barcodeStr+",返回结果为:"+JSON.toJSONString(resultMap));
         log.info("获取点料数量,barcode为:"+barcodeStr+",返回结果为:"+JSON.toJSONString(resultMap));
         return ResultBean.newOkResult(resultMap);
         return ResultBean.newOkResult(resultMap);
     }
     }