pn出库:库存修改库存导出

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -7,10 +7,7 @@ import com.neotel.smfcore.common.base.IExcelDownLoad;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
-import com.neotel.smfcore.common.utils.FileUtil;
-import com.neotel.smfcore.common.utils.QueryHelp;
-import com.neotel.smfcore.common.utils.SecurityUtils;
-import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.common.utils.*;
 import com.neotel.smfcore.core.barcode.bean.CodeBean;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeDto;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.CodeDto;
@@ -293,6 +290,52 @@ public class StoragePosController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @ApiOperation("导出库位")
+    @RequestMapping("/download")
+    @PreAuthorize("@el.check('storagePos:download')")
+    //@AnonymousAccess
+    public void download(StoragePosQueryCriteria criteria,HttpServletResponse response) {
+        if (criteria.getStorageIdList() != null && criteria.getStorageIdList().contains("0")) {
+            criteria.setStorageIdList(null);
+        }
+        String blurry = criteria.getBlurry();
+        if (!Strings.isNullOrEmpty(blurry)) {
+            //去除库位中的SOxxxx
+            blurry = blurry.substring(blurry.indexOf("-") + 1);
+            criteria.setBlurry(blurry);
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        Query query = QueryHelp.getQuery(criteria);
+        List<StoragePos> storagePosList = storagePosManager.findByQuery(query);
+        if (storagePosList != null && !storagePosList.isEmpty()) {
+            for (StoragePos pos : storagePosList) {
+                Map<String, Object> map = new LinkedHashMap<>();
+                Storage storage = dataCache.getStorageById(pos.getStorageId());
+                map.put("设备名称", storage.getName());
+                map.put("库位号", pos.getPosName());
+                map.put("是否可用", pos.isEnabled() ? "是" : "否");
+                map.put("条码", null);
+                map.put("料件编号", null);
+                map.put("是否锁定", null);
+                Barcode barcode = pos.getBarcode();
+                if (barcode != null) {
+                    map.put("条码", barcode.getBarcode());
+                    map.put("料件编号", barcode.getPartNumber());
+                    String reelLockPosId = ReelLockPosUtil.getReelLockPosId(barcode.getBarcode());
+                    if (StringUtils.isNotBlank(reelLockPosId)) {
+                        map.put("是否锁定", "是");
+                    }
+                }
+                list.add(map);
+            }
+        }
+        try {
+            FileUtil.downloadExcel(list, response);
+        } catch (IOException e) {
+            log.error("库位导出失败:" + e.getMessage());
+        }
+    }
+
     private Query getPosFindCriteria(StoragePosFindCriteria criteria){
         if (ObjectUtil.isNotEmpty(criteria.getStorageId())  && criteria.getStorageId().equals("0")) {
             criteria.setStorageId(null);

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/InnerBoxRestController.java

@@ -537,6 +537,7 @@ public class InnerBoxRestController {
                 storagePos.setUsed(false);
                 storagePosManager.save(storagePos);
                 barcodeManager.delete(barcode);
+                dataCache.updateInventory(storagePos,barcode);
             }
         }
         taskService.updateFinishedTask(dataLog);
@@ -628,6 +629,7 @@ public class InnerBoxRestController {
                         storagePos.setUsed(false);
                         storagePosManager.save(storagePos);
                         barcodeManager.delete(barcode);
+                        dataCache.updateInventory(storagePos,barcode);
                     }
                 }
                 taskService.updateFinishedTask(dataLog);

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/VirtualRestController.java

@@ -180,13 +180,13 @@ public class VirtualRestController {
             } else {
                 dataLog.setExtendType(ExtendType.STORAGE_CHECKOUT); //手动出库
             }
-            //dataCache.updateInventoryAmount(storage.getCid(),barcode.getPartNumber(),-barcode.getAmount());
             barcodeManager.delete(barcode);
             taskService.updateFinishedTask(dataLog);
             taskService.removeFinishedTask(dataLog);
             pos.setBarcode(null);
             pos.setUsed(false);
             storagePosManager.save(pos);
+            dataCache.updateInventory(pos,barcode);
         } else {
             DataLog dataLog = new DataLog();
             dataLog.setStatus(OP_STATUS.FINISHED.name());
@@ -307,7 +307,7 @@ public class VirtualRestController {
         taskService.moveTaskToFinished(dataLog);
         taskService.removeFinishedTask(dataLog);
         //更改缓存信息
-        //dataCache.updateInventory(pos, barcode);
+        dataCache.updateInventory(pos, barcode);
     }