20031锡膏料仓修改。

src/main/java/com/neotel/smfcore/core/device/handler/impl/SisoBoxHandler.java

@@ -4,12 +4,14 @@ import com.neotel.smfcore.core.device.bean.StatusBean;
 import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.Storage;
+import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import lombok.ToString;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 @Service
 @Service
 @Slf4j
 @Slf4j
@@ -41,6 +43,9 @@ public class SisoBoxHandler extends BaseDeviceHandler {
             statusBean =taskService.checkOut(storage, statusBean);
             statusBean =taskService.checkOut(storage, statusBean);
         }
         }
 
 
+        //获取操作
+        Map<String, String> opMap = DevicesStatusUtil.getAndRemoveOp(cid);
+        statusBean.putOp(opMap);
         return statusBean;
         return statusBean;
     }
     }
     @Override
     @Override

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

@@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
+import com.neotel.smfcore.custom.micron20031.bean.PosInfoDto;
 import com.neotel.smfcore.custom.micron20031.bean.PosRowDto;
 import com.neotel.smfcore.custom.micron20031.bean.PosRowDto;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -31,7 +32,7 @@ public class MicronController {
     @ApiOperation("获取库位使用列表")
     @ApiOperation("获取库位使用列表")
     @GetMapping("/posUsedData")
     @GetMapping("/posUsedData")
     @AnonymousAccess
     @AnonymousAccess
-    public Map<String,List<PosRowDto>> posUsedData(String storageId ) {
+    public Map<String, List<PosRowDto>> posUsedData(String storageId) {
         if (ObjectUtil.isEmpty(storageId)) {
         if (ObjectUtil.isEmpty(storageId)) {
             return new HashMap<>();
             return new HashMap<>();
         }
         }
@@ -96,5 +97,28 @@ public class MicronController {
 
 
     }
     }
 
 
+    @ApiOperation("获取库位信息")
+    @GetMapping("/posInfo")
+    @AnonymousAccess
+    public PosInfoDto posInfo(String posName) {
+        PosInfoDto dto = new PosInfoDto();
+        if (ObjectUtil.isEmpty(posName)) {
+            return dto;
+        }
+        dto.setPosName(posName);
+        StoragePos pos = storagePosManager.getByPosName(posName);
+        if (pos == null) {
+            return dto;
+        }
+
+        if(pos.getBarcode()!=null){
+            dto.setBarcode(pos.getBarcode().getBarcode());
+            dto.setPartNumber(pos.getBarcode().getPartNumber());
+            dto.setAmount(pos.getBarcode().getAmount());
+            dto.setExpTime(pos.getBarcode().getExpTime());
+        }
+
+        return dto;
+    }
 
 
 }
 }

src/main/java/com/neotel/smfcore/custom/micron20031/bean/PosInfoDto.java

+package com.neotel.smfcore.custom.micron20031.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PosInfoDto implements Serializable {
+
+    @ApiModelProperty("库位号")
+    private String posName;
+    @ApiModelProperty("条码编号")
+    private String barcode;
+    @ApiModelProperty("料件编号")
+    private String partNumber;
+    @ApiModelProperty("数量")
+    private int amount;
+    @ApiModelProperty("过期时间（入库时间+最大存储时间）")
+    private Date expTime;
+}