增加Matreq历史ID

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

@@ -199,4 +199,8 @@ public class Constants {
      * 镁光接口参数：    Type:
      * 镁光接口参数：    Type:
      */
      */
     public static final String CACHE_APIPARAM_Type="CACHE_APIPARAM_Type";
     public static final String CACHE_APIPARAM_Type="CACHE_APIPARAM_Type";
+    /**
+     * 历史订单号Map： key=pn,value=matreqOrderId
+     */
+    public static final String CACHE_History_MatreqOrderMap="CACHE_History_MatreqOrderMap";
 }
 }

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

@@ -4,6 +4,7 @@ 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.common.exception.ApiException;
+import com.neotel.smfcore.common.utils.Constants;
 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.bean.UsageItem;
 import com.neotel.smfcore.core.storage.bean.UsageItem;
@@ -41,6 +42,28 @@ public class MicronSpOrderController {
         return inventoryItemDtos;
         return inventoryItemDtos;
     }
     }
 
 
+    private String GetHistoryMatreqId(String pn){
+
+        Map<String ,String> map=dataCache.getCache(Constants.CACHE_History_MatreqOrderMap);
+        if(ObjectUtil.isNotEmpty(map)&&map.containsKey(pn)){
+            return map.get(pn);
+        }
+        return "";
+    }
+
+    private void UpdateHistoryMatreqId(String pn,String id) {
+        Map<String, String> map = dataCache.getCache(Constants.CACHE_History_MatreqOrderMap);
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        if (map.containsKey(pn)) {
+            map.remove(pn);
+        }
+        map.put(pn, id);
+        dataCache.updateCache(Constants.CACHE_History_MatreqOrderMap, map);
+    }
+
+
     @ApiOperation("勾选PN后点击>获取列表")
     @ApiOperation("勾选PN后点击>获取列表")
     @RequestMapping(value = "/stockAvailable")
     @RequestMapping(value = "/stockAvailable")
     public ResultBean checkStockAvailable(@RequestBody List<String> pnList) throws ApiException {
     public ResultBean checkStockAvailable(@RequestBody List<String> pnList) throws ApiException {
@@ -77,7 +100,8 @@ public class MicronSpOrderController {
             }
             }
             for (MatOrderBean bean :
             for (MatOrderBean bean :
                     stockResults) {
                     stockResults) {
-                OrderInfoDto orderInfoDto = new OrderInfoDto(bean.getMicronPN(), 0, slotsCount, bean.getQuantity(), bean.getUnitOfMeasures());
+                String hisPn=GetHistoryMatreqId(bean.getMicronPN());
+                OrderInfoDto orderInfoDto = new OrderInfoDto(bean.getMicronPN(), 0, slotsCount, bean.getQuantity(), bean.getUnitOfMeasures(),hisPn);
 
 
                 if (inventoryItemDtoMap.containsKey(bean.getMicronPN())) {
                 if (inventoryItemDtoMap.containsKey(bean.getMicronPN())) {
                     InventoryItem item = inventoryItemDtoMap.get(bean.getMicronPN());
                     InventoryItem item = inventoryItemDtoMap.get(bean.getMicronPN());
@@ -119,6 +143,10 @@ public class MicronSpOrderController {
                 Map<String, String> resultMap=new HashMap<>();
                 Map<String, String> resultMap=new HashMap<>();
                 resultMap.put("partNumber",partNumber);
                 resultMap.put("partNumber",partNumber);
                 resultMap.put("matReqNo",orderBean1.getMatReqNo());
                 resultMap.put("matReqNo",orderBean1.getMatReqNo());
+
+                //保存
+                UpdateHistoryMatreqId(partNumber,orderBean1.getMatReqNo());
+
                 return ResultBean.newOkResult(resultMap);
                 return ResultBean.newOkResult(resultMap);
             }
             }
         } catch (ApiException e) {
         } catch (ApiException e) {

src/main/java/com/neotel/smfcore/custom/micron20031/bean/dto/OrderInfoDto.java

@@ -25,4 +25,8 @@ public class OrderInfoDto implements Serializable {
 
 
     @JsonProperty("UnitOfMeasures")
     @JsonProperty("UnitOfMeasures")
     private String unitOfMeasures;
     private String unitOfMeasures;
+
+
+    @JsonProperty("历史订单号")
+    private String hisMatreq;
 }
 }