Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/system/service/manager/IDataLogManager.java

@@ -17,4 +17,6 @@ public interface IDataLogManager extends IBaseManager<DataLog> {
     List<SpDailyLog> getSpDailyLogs(Date start, Date end, String inoutType);
 
     List<SpDailyLog> getSpPnSummaryLists(String inoutType);
+
+    DataLog findOne(Query query);
 }

src/main/java/com/neotel/smfcore/core/system/service/manager/impl/DataLogManagerImpl.java

@@ -83,4 +83,9 @@ public class DataLogManagerImpl implements IDataLogManager {
 
         return dataLogDao.getSpPnSummaryLists( inoutType );
     }
+
+    @Override
+    public DataLog findOne(Query query) {
+        return dataLogDao.findOne(query);
+    }
 }

src/main/java/com/neotel/smfcore/custom/jiahe1671/JiaHe1671DeviceController.java

+package com.neotel.smfcore.custom.jiahe1671;
+
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.barcode.service.po.Barcode;
+import com.neotel.smfcore.core.barcode.utils.CodeResolve;
+import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
+import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
+import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
+import com.neotel.smfcore.core.system.service.po.DataLog;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Api(tags = "客户端对接")
+@Slf4j
+@RestController
+@RequestMapping("/1671device")
+public class JiaHe1671DeviceController {
+
+    @Autowired
+    private CodeResolve codeResolve;
+
+    @Autowired
+    private IDataLogManager dataLogManager;
+
+    @Autowired
+    private ILiteOrderItemManager liteOrderItemManager;
+
+    @ApiOperation("根据barcode获取最后一条出库任务对应的站位信息")
+    @RequestMapping("/getLastestOrderTask")
+    @ResponseBody
+    @AnonymousAccess
+    public ResultBean getLastestOrderTask(@RequestBody Map<String, String> paramMap) {
+        String code = paramMap.get("code");
+        log.info("收到获取站位信息:" + code);
+        Barcode barcode = null;
+        try {
+            barcode = codeResolve.resolveOneValideBarcode(code);
+        } catch (ValidateException e) {
+            return ResultBean.newErrorResult(-1, e.getMsgKey(), e.getMessage(), e.getMsgParam());
+        }
+        //开始寻找最后一条任务
+        Criteria c = Criteria.where("barcode").is(barcode.getBarcode());
+        Query query = new Query(c);
+        query.with(Sort.by(Sort.Direction.DESC,"createDate"));
+        DataLog dataLog = dataLogManager.findOne(query);
+        if (dataLog != null && dataLog.isCheckOutTask()){
+            String subSourceId = dataLog.getSubSourceId();
+            if (StringUtils.isNotBlank(subSourceId)){
+                LiteOrderItem item = liteOrderItemManager.get(subSourceId);
+                if (item != null){
+                    Map<String,Object> resultMap = new HashMap<>();
+                    resultMap.put("slotNum",item.getSlotNum());
+                    resultMap.put("feederInfo",item.getFeederInfo());
+                    resultMap.put("barcode",barcode.getBarcode());
+                    resultMap.put("partNumber",barcode.getPartNumber());
+                    resultMap.put("w",barcode.getPlateSize());
+                    resultMap.put("h",barcode.getHeight());
+                    return ResultBean.newOkResult(resultMap);
+                }
+            }
+        }
+        return ResultBean.newErrorResult(-1,"smfcore.barcode.notFindFeerder","未找到[{0}]站位信息",new String[]{barcode.getBarcode()});
+    }
+}

src/main/resources/messages.properties

@@ -461,4 +461,5 @@ smfcore.reelPosMove.paramerror=\u53C2\u6570\u4E0D\u5B8C\u6574
 smfcore.reelPosMove.posIsNull=\u5E93\u4F4D[{1}]\u4E3A\u7A7A
 smfcore.liteOrder.exist=\u9700\u6C42\u5355{0}\u5DF2\u5B58\u5728
 smfcore.reelPosMove.barcodeError=\u5E93\u4F4D{0}\u6761\u7801\u4E3A{1}\uFF0C\u4E0E\u79FB\u5E93\u6761\u7801{1}\u4E0D\u4E00\u81F4
+smfcore.barcode.notFindFeerder=\u672A\u627E\u5230[{0}]\u7AD9\u4F4D\u4FE1\u606F
 

src/main/resources/messages_de_DE.properties

@@ -450,4 +450,5 @@ smfcore.pos.noInventory=Echtzeit-Bestandsinformationen nicht gefunden
 smfcore.reelPosMove.paramerror=Incomplete Parameter
 smfcore.reelPosMove.posIsNull=Lagerort [{1}] ist leer
 smfcore.liteOrder.exist=Bedarfsauftrag {0} existiert bereits
-smfcore.reelPosMove.barcodeError=Der Barcode des Lagerorts {0} ist {1}, nicht identisch mit dem Umzugscode {1}
\ No newline at end of file
+smfcore.reelPosMove.barcodeError=Der Barcode des Lagerorts {0} ist {1}, nicht identisch mit dem Umzugscode {1}
+smfcore.barcode.notFindFeerder=Stationsinformation [{0}] nicht gefunden
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -451,4 +451,5 @@ smfcore.pos.noInventory=Real-time inventory information not found
 smfcore.reelPosMove.paramerror=Incomplete parameters
 smfcore.reelPosMove.posIsNull=Location [{1}] is empty
 smfcore.liteOrder.exist=Requirement order {0} already exists
-smfcore.reelPosMove.barcodeError=Location {0} barcode is {1}, inconsistent with the transfer barcode {1}
\ No newline at end of file
+smfcore.reelPosMove.barcodeError=Location {0} barcode is {1}, inconsistent with the transfer barcode {1}
+smfcore.barcode.notFindFeerder=Station information [{0}] not found
\ No newline at end of file

src/main/resources/messages_fr_FR.properties

@@ -450,4 +450,5 @@ smfcore.pos.noInventory=Informations de stock en temps r\u00E9el non trouv\u00E9
 smfcore.reelPosMove.paramerror=Param\u00E8tres incomplets
 smfcore.reelPosMove.posIsNull=L'emplacement [{1}] est vide
 smfcore.liteOrder.exist=Le bon de commande {0} existe d\u00E9j\u00E0
-smfcore.reelPosMove.barcodeError=Le code-barres de l'emplacement {0} est {1}, incompatible avec le code-barres de transfert {1}
\ No newline at end of file
+smfcore.reelPosMove.barcodeError=Le code-barres de l'emplacement {0} est {1}, incompatible avec le code-barres de transfert {1}
+smfcore.barcode.notFindFeerder=Informations de station [{0}] non trouv\u00E9es
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -447,4 +447,5 @@ smfcore.pos.noInventory=\u30EA\u30A2\u30EB\u30BF\u30A4\u30E0\u5728\u5EAB\u60C5\u
 smfcore.reelPosMove.paramerror=\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u3067\u3059
 smfcore.reelPosMove.posIsNull=\u5EAB\u4F4D [{1}] \u304C\u7A7A\u3067\u3059
 smfcore.liteOrder.exist=\u8981\u6C42\u5358 {0} \u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059
-smfcore.reelPosMove.barcodeError=\u5EAB\u4F4D {0} \u306E\u30D0\u30FC\u30B3\u30FC\u30C9\u306F {1} \u3067\u3001\u79FB\u5EAB\u30D0\u30FC\u30B3\u30FC\u30C9 {1} \u3068\u4E0D\u4E00\u81F4\u3067\u3059
\ No newline at end of file
+smfcore.reelPosMove.barcodeError=\u5EAB\u4F4D {0} \u306E\u30D0\u30FC\u30B3\u30FC\u30C9\u306F {1} \u3067\u3001\u79FB\u5EAB\u30D0\u30FC\u30B3\u30FC\u30C9 {1} \u3068\u4E0D\u4E00\u81F4\u3067\u3059
+smfcore.barcode.notFindFeerder=[{0}]\u30B9\u30C6\u30FC\u30B7\u30E7\u30F3\u60C5\u5831\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -447,4 +447,5 @@ smfcore.pos.noInventory=\u672A\u627E\u5230\u5B9E\u65F6\u5E93\u5B58\u4FE1\u606F
 smfcore.reelPosMove.paramerror=\u53C2\u6570\u4E0D\u5B8C\u6574
 smfcore.reelPosMove.posIsNull=\u5E93\u4F4D[{1}]\u4E3A\u7A7A
 smfcore.liteOrder.exist=\u9700\u6C42\u5355{0}\u5DF2\u5B58\u5728
-smfcore.reelPosMove.barcodeError=\u5E93\u4F4D{0}\u6761\u7801\u4E3A{1}\uFF0C\u4E0E\u79FB\u5E93\u6761\u7801{1}\u4E0D\u4E00\u81F4
\ No newline at end of file
+smfcore.reelPosMove.barcodeError=\u5E93\u4F4D{0}\u6761\u7801\u4E3A{1}\uFF0C\u4E0E\u79FB\u5E93\u6761\u7801{1}\u4E0D\u4E00\u81F4
+smfcore.barcode.notFindFeerder=\u672A\u627E\u5230[{0}]\u7AD9\u4F4D\u4FE1\u606F
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -447,4 +447,5 @@ smfcore.pos.noInventory=\u672A\u627E\u5230\u5373\u6642\u5EAB\u5B58\u8CC7\u8A0A
 smfcore.reelPosMove.paramerror=\u53C3\u6578\u4E0D\u5B8C\u6574
 smfcore.reelPosMove.posIsNull=\u5EAB\u4F4D [{1}] \u70BA\u7A7A
 smfcore.liteOrder.exist=\u9700\u6C42\u55AE {0} \u5DF2\u5B58\u5728
-smfcore.reelPosMove.barcodeError=\u5EAB\u4F4D {0} \u689D\u78BC\u70BA {1}\uFF0C\u8207\u79FB\u5EAB\u689D\u78BC {1} \u4E0D\u4E00\u81F4
\ No newline at end of file
+smfcore.reelPosMove.barcodeError=\u5EAB\u4F4D {0} \u689D\u78BC\u70BA {1}\uFF0C\u8207\u79FB\u5EAB\u689D\u78BC {1} \u4E0D\u4E00\u81F4
+smfcore.barcode.notFindFeerder=\u672A\u627E\u5230[{0}]\u7AD9\u4F4D\u8CC7\u8A0A
\ No newline at end of file