yzc пре 1 година
родитељ
комит
9a62c3c539

+ 7 - 6
hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockCheckServiceImpl.java

@@ -193,7 +193,7 @@ public class StockCheckServiceImpl extends ServiceImpl<StockCheckMapper, StockCh
         IWrapper<Stock> wrapper = IWrapper.getWrapper();
 
         //仓库过滤
-        wrapper.eq("s",Stock::getWarehouseId, dto.getWarehouseId());
+        wrapper.eq("s", Stock::getWarehouseId, dto.getWarehouseId());
 
         //关键字
         String keyword = dto.getKeyword();
@@ -201,7 +201,7 @@ public class StockCheckServiceImpl extends ServiceImpl<StockCheckMapper, StockCh
             //根据 库存数量 产品自定义编码 产品名称 过滤
             List<Long> productIds = productInfoService.listObject(ProductInfo::getId,
                     q -> q.like(ProductInfo::getCustomCode, keyword).or().like(ProductInfo::getName, keyword));
-            wrapper.and(q -> q.like("s",Stock::getQuantity, keyword).or().in("s",Stock::getProductId, productIds));
+            wrapper.and(q -> q.like("s", Stock::getQuantity, keyword).or().in("s", Stock::getProductId, productIds));
         }
 
         //已登记过滤
@@ -211,10 +211,10 @@ public class StockCheckServiceImpl extends ServiceImpl<StockCheckMapper, StockCh
             sIds.add(-1L);
             if (ObjectUtil.equals(isCheckRegister, 1)) {
                 //过滤已经登记
-                wrapper.in("s",Stock::getId, sIds);
+                wrapper.in("s", Stock::getId, sIds);
             } else {
                 //过滤没有登记
-                wrapper.notIn("s",Stock::getId, sIds);
+                wrapper.notIn("s", Stock::getId, sIds);
             }
         }
 
@@ -254,15 +254,16 @@ public class StockCheckServiceImpl extends ServiceImpl<StockCheckMapper, StockCh
         );
         Map<Long, List<StockCheckRegisterVo>> checkRegisterMap = stockCheckRegisterList.stream().collect(Collectors.groupingBy(StockCheckRegister::getStockId));
         for (StockVo stockVo : records) {
-            stockVo.setStockCheckRegisterList(checkRegisterMap.getOrDefault(stockVo.getId(),new ArrayList<>()));
+            stockVo.setStockCheckRegisterList(checkRegisterMap.getOrDefault(stockVo.getId(), new ArrayList<>()));
         }
         return page;
     }
 
     @DSTransactional
     @Override
-    public void submitAll(){
+    public void submitAll() {
         List<StockCheckRegister> list = stockCheckRegisterService.list();
+        Assert.notEmpty(list, "无盘点登记信息,盘点提交失败!");
         Map<Long, List<StockCheckRegister>> collect = list.stream().collect(Collectors.groupingBy(StockCheckRegister::getWarehouseId));
         for (Map.Entry<Long, List<StockCheckRegister>> entry : collect.entrySet()) {
             //生成盘点明细