基础功能

hx-service/basics/src/main/java/com/fjhx/controller/StockController.java

@@ -78,7 +78,7 @@ public class StockController {
     }
 
     /**
-     * 出库分页记录
+     * 出入库分页记录
      */
     @PostMapping("getInOutPage")
     public R getInOutPage(@RequestBody Map<String, String> condition) {

hx-service/basics/src/main/java/com/fjhx/controller/WarehouseController.java

@@ -59,4 +59,9 @@ public class WarehouseController {
         return R.success();
     }
 
+    @PostMapping("/list")
+    public R list() {
+        return R.success(warehouseService.list());
+    }
+
 }

hx-service/basics/src/main/java/com/fjhx/mapper/StockExMapper.xml

@@ -15,7 +15,7 @@
         sj.create_user
         from stock_journal sj
         left join warehouse w on sj.warehouse_id=w.id
-        left join
+        inner join
         <include refid="unionAllMaterialAndProduct"/>
         t on t.id = sj.goods_id
         ${ew.customSqlSegment}
@@ -31,7 +31,7 @@
         s.quantity
         from stock s
         left join warehouse w on s.warehouse_id=w.id
-        left join
+        inner join
         <include refid="unionAllMaterialAndProduct"/>
         t on t.id = s.goods_id
         ${ew.customSqlSegment}

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockDetailMapper.java

@@ -36,6 +36,7 @@ public interface StockDetailMapper extends BaseMapper<StockDetail> {
     @MapKey("jobNo")
     Map<String, Map<String, String>> selectUserByJobNoList(@Param("ew") QueryWrapper<Object> wrapper);
 
+    @MapKey("code")
     List<Map<String, Object>> getPlanListByUser(@Param("ew") QueryWrapper<Object> wrapper, @Param("jobNo") String jobNo);
 
     List<Map<String, Object>> getOutputList(@Param("ew") QueryWrapper<Object> wrapper);

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockDetailServiceImpl.java

@@ -2,6 +2,7 @@ package com.fjhx.stock.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -17,7 +18,6 @@ import com.fjhx.stock.service.StockDetailService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.BigDecimalUtil;
 import org.springblade.core.tenant.annotation.TenantIgnore;
-import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -267,7 +267,12 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
         setPlan(result, list, codeWidthMap);
 
         // 获取指定和推荐领料map
-        List<Long> flagList = list.stream().map(item -> (Long) item.get("flag")).distinct().collect(Collectors.toList());
+        List<Long> flagList = list.stream()
+                .filter(item -> ObjectUtil.isNotEmpty(item.get("flag")))
+                .map(item -> (Long) item.get("flag"))
+                .distinct()
+                .collect(Collectors.toList());
+
         List<SchedulingActual> schedulingActualListByFlag = getSchedulingActualListByFlag(flagList, null);
 
         // 赋值实际领料