1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehousePositionInfo.java

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -60,7 +61,11 @@ public class WarehousePositionInfo extends BaseModel<WarehousePositionInfo> {
      */
     @TableField(exist = false)
     private String detailStorage;
-
+    /**
+     * 仓库货名列表
+     */
+    @TableField(exist = false)
+    private List<WarehousePositionStorageInfo> warehousePositionStorageInfoList;
 
 
     @Override

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -649,12 +649,15 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("delete_flag", "0"));
             Float storage = 0f;
             String detailStorage = "";
-            for (WarehousePositionStorageInfo warehousePositionStorageInfo : warehousePositionStorageInfoList) {
-                storage = storage + Float.valueOf(String.valueOf(warehousePositionStorageInfo.getStorage()));
-                detailStorage = detailStorage + warehousePositionStorageInfo.getGoodsName() + "(" + warehousePositionStorageInfo.getStorage() + ")  ";
+            if (!CollectionUtils.isEmpty(warehousePositionStorageInfoList)) {
+                for (WarehousePositionStorageInfo warehousePositionStorageInfo : warehousePositionStorageInfoList) {
+                    storage = storage + Float.valueOf(String.valueOf(warehousePositionStorageInfo.getStorage()));
+                    detailStorage = detailStorage + warehousePositionStorageInfo.getGoodsName() + "(" + warehousePositionStorageInfo.getStorage() + ")  ";
+                }
+                warehousePositionInfo.setWarehousePositionStorageInfoList(warehousePositionStorageInfoList);
+                warehousePositionInfo.setDetailStorage(detailStorage);
+                warehousePositionInfo.setNowStorage(storage);
             }
-            warehousePositionInfo.setDetailStorage(detailStorage);
-            warehousePositionInfo.setNowStorage(storage);
         });
         if (!CollectionUtils.isEmpty(warehousePositionInfoList)) {
             warehouseBaseInfo.setWarehousePositionInfoList(warehousePositionInfoList);

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/CostManagementInfoMapper.xml

@@ -5,6 +5,7 @@
     <select id="getListByCondition" resultType="com.yh.saas.plugin.yiliangyiyun.entity.CostManagementInfo">
         SELECT
         wbi.warehouse_name AS warehouseName,
+        wbi.id AS warehouseId,
         IFNULL( wpsi.goods_name, cgi.goods_name ) AS goodsName,
         CASE
         wbi.warehouse_type