1.西门子料盘设置接口请求数量

2.提供库存接口给西门子

src/main/java/com/neotel/smfcore/custom/siemens/SiemensApi.java

@@ -176,7 +176,7 @@ public class SiemensApi extends BaseSmfApiListener {
                         barcode.setPlateSize(codebean.getReelWidth());
                         barcode.setPlateSize(codebean.getReelWidth());
                         barcode.setHeight(codebean.getReelHeight());
                         barcode.setHeight(codebean.getReelHeight());
                         barcode.setBarcode(codebean.getCodeStr());
                         barcode.setBarcode(codebean.getCodeStr());
-                        barcode.setAmount(component.getAmount());
+                        barcode.setAmount(info.getQuantity());
                         barcode.setFullCode(codebean.getCodeStr());
                         barcode.setFullCode(codebean.getCodeStr());
                         barcode.setPartNumber(component.getPartNumber());
                         barcode.setPartNumber(component.getPartNumber());
                         barcode = barcodeManager.saveBarcode(barcode);
                         barcode = barcodeManager.saveBarcode(barcode);
@@ -185,7 +185,7 @@ public class SiemensApi extends BaseSmfApiListener {
                         barcode.setPlateSize(codebean.getReelWidth());
                         barcode.setPlateSize(codebean.getReelWidth());
                         barcode.setHeight(codebean.getReelHeight());
                         barcode.setHeight(codebean.getReelHeight());
                         barcode.setBarcode(codebean.getCodeStr());
                         barcode.setBarcode(codebean.getCodeStr());
-                        barcode.setAmount(component.getAmount());
+                        barcode.setAmount(info.getQuantity());
                         barcode.setPartNumber(component.getPartNumber());
                         barcode.setPartNumber(component.getPartNumber());
                         log.info("siemensCheckCode 修改 条码：[" + barcode.getBarcode() + "] pn为 ["+barcode.getPartNumber()+"]  ");
                         log.info("siemensCheckCode 修改 条码：[" + barcode.getBarcode() + "] pn为 ["+barcode.getPartNumber()+"]  ");
                     }
                     }

src/main/java/com/neotel/smfcore/custom/siemens/SiemensController.java

@@ -18,7 +18,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 @Api(tags = "西门子对接")
 @Api(tags = "西门子对接")
@@ -81,4 +83,46 @@ public class SiemensController {
         return resultMap;
         return resultMap;
     }
     }
 
 
+
+    @ApiOperation("获取所有库存信息")
+    @RequestMapping("/getAllInventory")
+    @AnonymousAccess
+    public List<Map<String,String>> getAllInventory(@RequestBody Map<String,String> paramMap){
+        String deviceID = paramMap.get("DeviceID");
+        log.info("收到获取库存信息指令,deviceID为:"+deviceID);
+
+        List<String> deviceIdList = new ArrayList<>();
+        if (StringUtils.isEmpty(deviceID)){
+            for (Storage storage : dataCache.getAllStorage().values()) {
+                deviceIdList.add(storage.getCid());
+            }
+        } else {
+            String[] deviceIdStr = deviceID.split(",");
+            for (String id : deviceIdStr) {
+                deviceIdList.add(id);
+            }
+        }
+
+        List<Map<String,String>> resultList = new ArrayList<>();
+
+        for (String deviceId : deviceIdList) {
+            Map<String, StoragePos> usePosMap = dataCache.getUsedPosList(deviceId);
+            if (usePosMap != null && !usePosMap.isEmpty()){
+                for (StoragePos pos : usePosMap.values()) {
+                    if (pos != null){
+                        Barcode barcode = pos.getBarcode();
+                        if (barcode != null){
+                            Map<String,String> resultMap = new HashMap<>();
+                            resultMap.put("LOTID",barcode.getBarcode());
+                            resultMap.put("DEVICEID",deviceId);
+                            resultMap.put("quantity",barcode.getAmount()+"");
+                            resultList.add(resultMap);
+                        }
+                    }
+                }
+            }
+        }
+        return resultList;
+    }
+
 }
 }