20031锡膏料仓Order功能修改

src/main/java/com/neotel/smfcore/custom/micron20031/MicronSpOrderController.java

@@ -3,6 +3,7 @@ package com.neotel.smfcore.custom.micron20031;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.exception.ApiException;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.storage.bean.InventoryItem;
 import com.neotel.smfcore.core.storage.bean.InventoryItem;
 import com.neotel.smfcore.core.storage.rest.dto.InventoryItemDto;
 import com.neotel.smfcore.core.storage.rest.dto.InventoryItemDto;
@@ -17,10 +18,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
@@ -43,31 +41,54 @@ public class MicronSpOrderController {
 
 
     @ApiOperation("勾选PN后点击>获取列表")
     @ApiOperation("勾选PN后点击>获取列表")
     @RequestMapping(value = "/stockAvailable")
     @RequestMapping(value = "/stockAvailable")
-    public List<OrderInfoDto> checkStockAvailable(@RequestBody List<String> pnList) {
-        List<MatOrderBean> stockResults = Micron20031Api.checkStockAvailable(pnList);
+    public ResultBean checkStockAvailable(@RequestBody List<String> pnList) throws ApiException {
         List<OrderInfoDto> resultList = new ArrayList<>();
         List<OrderInfoDto> resultList = new ArrayList<>();
         Map<String, InventoryItem> inventoryItemDtoMap = dataCache.getAllInventory(null, "");
         Map<String, InventoryItem> inventoryItemDtoMap = dataCache.getAllInventory(null, "");
-        for (MatOrderBean bean :
-                stockResults) {
-            OrderInfoDto orderInfoDto = new OrderInfoDto(bean.getMicronPN(), 0, bean.getQuantity(), bean.getUnitOfMeasures());
+        Map<String, Integer> pnVMap = new HashMap<>();
+        for (String pn :
+                pnList) {
+            Integer qty = 0;
+            if (inventoryItemDtoMap.containsKey(pn)) {
+                InventoryItem item = inventoryItemDtoMap.get(pn);
+                qty = item.getStockCount();
+            }
+            pnVMap.put(pn, qty);
+        }
+        try {
+            List<MatOrderBean> stockResults = Micron20031Api.checkStockAvailable(pnVMap);
 
 
-            if (inventoryItemDtoMap.containsKey(bean.getMicronPN())) {
-                InventoryItem item = inventoryItemDtoMap.get(bean.getMicronPN());
-                orderInfoDto.setStockCount(item.getStockCount());
+            for (MatOrderBean bean :
+                    stockResults) {
+                OrderInfoDto orderInfoDto = new OrderInfoDto(bean.getMicronPN(), 0, bean.getQuantity(), bean.getUnitOfMeasures());
+
+                if (inventoryItemDtoMap.containsKey(bean.getMicronPN())) {
+                    InventoryItem item = inventoryItemDtoMap.get(bean.getMicronPN());
+                    orderInfoDto.setStockCount(item.getStockCount());
+                }
+                resultList.add(orderInfoDto);
             }
             }
-            resultList.add(orderInfoDto);
+        }catch (ApiException e){
+            return ResultBean.newErrorResult(1, e.getMessage(), e.getMessage());
         }
         }
-        return resultList;
+
+        return ResultBean.newOkResult(resultList);
     }
     }
 
 
     @ApiOperation("修改PN数量后提交")
     @ApiOperation("修改PN数量后提交")
     @RequestMapping(value = "/submitPn")
     @RequestMapping(value = "/submitPn")
     public ResultBean submitPn(String partNumber, Integer qty) {
     public ResultBean submitPn(String partNumber, Integer qty) {
-        MatOrderBean orderBean1 = Micron20031Api.triggerMatReqOrder(partNumber, qty);
-        if (ObjectUtil.isNotEmpty(orderBean1.getMessage())) {
-            return ResultBean.newErrorResult(1, orderBean1.getMessage(), orderBean1.getMessage());
-        } else {
-            return ResultBean.newOkResult(partNumber);
+        MatOrderBean bean = new MatOrderBean();
+        bean.setMicronPN(partNumber);
+        bean.setQuantity(qty);
+        try {
+            MatOrderBean orderBean1 = Micron20031Api.triggerMatReqOrder(bean);
+            if (ObjectUtil.isNotEmpty(orderBean1.getMessage())) {
+                return ResultBean.newErrorResult(1, orderBean1.getMessage(), orderBean1.getMessage());
+            } else {
+                return ResultBean.newOkResult(partNumber);
+            }
+        } catch (ApiException e) {
+            return ResultBean.newErrorResult(1, e.getMessage(), e.getMessage());
         }
         }
     }
     }