禁限用报表修改

src/main/java/com/neotel/smfcore/custom/lizhen/LizhenApi.java

@@ -533,6 +533,22 @@ public class LizhenApi extends DefaultSmfApiListener {
         } catch (Exception e){
         } catch (Exception e){
             log.info("批量禁用接口调用失败:"+e.getMessage());
             log.info("批量禁用接口调用失败:"+e.getMessage());
         }
         }
+
+        //添加禁用料信息
+        for (Barcode barcode : barcodeList) {
+            if (reelList.contains(barcode.getBarcode())){
+                barcode.setDisableMsg("禁用料");
+            } else {
+                barcode.setDisableMsg("");
+            }
+            barcode =barcodeManager.save(barcode);
+            StoragePos storagePos = storagePosManager.getByBarcode(barcode.getBarcode());
+            if (storagePos != null){
+                storagePos.setBarcode(barcode);
+                storagePosManager.save(storagePos);
+            }
+        }
+
         return reelList;
         return reelList;
     }
     }
 
 

src/main/java/com/neotel/smfcore/custom/lizhen/report/InnerReportController.java

@@ -9,6 +9,7 @@ import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.FileUtil;
 import com.neotel.smfcore.common.utils.FileUtil;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeDto;
 import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.BarcodeMapper;
 import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.BarcodeMapper;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
@@ -303,6 +304,59 @@ public class InnerReportController {
         }
         }
     }
     }
 
 
+
+    @ApiOperation("禁限用")
+    @RequestMapping("/inner/report/disable")
+    @AnonymousAccess
+    public PageData disable(ReportQueryCondition queryCondition, Pageable pageable) {
+        Query query = QueryHelp.getQuery(queryCondition);
+        query.addCriteria(Criteria.where("disableMsg").nin("").exists(true));
+        PageData<BarcodeDto> resultData = new PageData<>();
+        if (pageable != null) {
+            PageData<Barcode> data = barcodeManager.findByPage(query, pageable);
+            resultData.setTotalElements(data.getTotalElements());
+            resultData.setContent(barcodeMapper.toDto(data.getContent()));
+        } else {
+            List<Barcode> barcodes = barcodeManager.findByQuery(query);
+            if (barcodes != null && !barcodes.isEmpty()) {
+                resultData.setTotalElements(barcodes.size());
+                resultData.setContent(barcodeMapper.toDto(barcodes));
+            }
+        }
+        return resultData;
+    }
+
+
+    @ApiOperation("禁限用导出")
+    @RequestMapping("/inner/report/disable/download")
+    @AnonymousAccess
+    public void disableDownload(ReportQueryCondition queryCondition, Pageable pageable, HttpServletResponse response) {
+        PageData data = disable(queryCondition, null);
+        List<Map<String, Object>> results = new ArrayList<>();
+        List<BarcodeDto> dtos = data.getContent();
+        if (dtos != null && !dtos.isEmpty()) {
+            for (BarcodeDto dto : dtos) {
+                Map<String, Object> resultMap = new LinkedHashMap<>();
+                resultMap.put("ID NO", dto.getBarcode());
+                resultMap.put("料号", dto.getPartNumber());
+                resultMap.put("D/C", dto.getDateCode());
+                resultMap.put("L/C", dto.getBatch());
+                resultMap.put("厂商代码", dto.getProviderNumber());
+                resultMap.put("厂商", dto.getProvider());
+                resultMap.put("数量", dto.getAmount());
+                resultMap.put("禁用信息", dto.getDisableMsg());
+                resultMap.put("库位信息",dto.getPosName());
+                results.add(resultMap);
+            }
+        }
+        try {
+            FileUtil.downloadExcel(results, response);
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.info("内仓禁限用导出导出失败--" + e.getMessage());
+        }
+    }
+
     private List<BCExpire> getBCExpire(List<StoragePos> storagePosList) {
     private List<BCExpire> getBCExpire(List<StoragePos> storagePosList) {
         List<BCExpire> expireList = new ArrayList<>();
         List<BCExpire> expireList = new ArrayList<>();
         for (StoragePos storagePos : storagePosList) {
         for (StoragePos storagePos : storagePosList) {