盘损

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehouseInOutInfoController.java

@@ -6,6 +6,7 @@ import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -29,7 +30,6 @@ public class WarehouseInOutInfoController {
     private IWarehouseInOutInfoService warehouseInOutInfoService;
     /**
      * 待完成页面分页列表查询
-     *
      * @param warehouseInOutInfo
      * @return
      */
@@ -37,6 +37,7 @@ public class WarehouseInOutInfoController {
     public Page<WarehouseInOutInfo> selectWarehouseInOutInfo(@RequestBody WarehouseInOutInfo warehouseInOutInfo){
         return warehouseInOutInfoService.selectWarehouseInOutInfo(warehouseInOutInfo);
     }
+
     /**
      * 删除记录
      * @param example
@@ -52,9 +53,14 @@ public class WarehouseInOutInfoController {
      * @return
      */
     @GetMapping("/InOutWarehouse")
-    public String InOutWarehouse (@RequestBody WarehouseInOutInfo warehouseInOutInfo){
+    public String InOutWarehouse (@RequestBody WarehouseInOutInfo warehouseInOutInfo) {
         return warehouseInOutInfoService.InOutWarehouse(warehouseInOutInfo);
     }
 
+    @GetMapping("/selectInfo")
+    public Page<WarehouseInOutInfo> selectInfo(WarehouseInOutInfo warehouseInOutInfo) {
+        return warehouseInOutInfoService.selectInfo(warehouseInOutInfo);
+    }
+
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehouseInventoryCountInfoController.java

@@ -1,8 +1,16 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInventoryCountInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInventoryCountInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -17,5 +25,27 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/warehouseInventoryCountInfo")
 public class WarehouseInventoryCountInfoController {
 
+    @Autowired
+    private IWarehouseInventoryCountInfoService warehouseInventoryCountInfoService;
+    /**
+     * 盘损记录分页查询
+     *
+     * @param warehouseInventoryCountInfo
+     * @return
+     */
+    @GetMapping("/selectInfo")
+    public Page<WarehouseInventoryCountInfo> selectInfo(WarehouseInventoryCountInfo warehouseInventoryCountInfo) {
+        return warehouseInventoryCountInfoService.selectInfo(warehouseInventoryCountInfo);
+    }
+
+    /**
+     * 盘损
+     */
+    @GetMapping("/getInfo")
+    public WarehouseInventoryCountInfo getInfo(WarehouseInventoryCountInfo warehouseInventoryCountInfo) {
+        return warehouseInventoryCountInfoService.getInfo(warehouseInventoryCountInfo);
+    }
+
+
 }
 

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

@@ -131,8 +131,48 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
     @TableField(exist = false)
     private WarehouseInOutDetail warehouseInOutDetail;
 
+
+    /**
+     * 查询类型
+     */
     @TableField(exist = false)
-    private WarehouseInOutDetail warehouseInOutDetail;
+    private String searchType;
+
+    /**
+     * 质检员
+     */
+    @TableField(exist = false)
+    private String qualityInspector;
+    /**
+     * 水分
+     */
+    @TableField(exist = false)
+    private String waterContent;
+    /**
+     * 杂质
+     */
+    @TableField(exist = false)
+    private String impurity;
+    /**
+     * 霉变粒
+     */
+    @TableField(exist = false)
+    private String mildewGrain;
+    /**
+     * 不完善粒
+     */
+    @TableField(exist = false)
+    private String imperfectGrain;
+    /**
+     * 容重
+     */
+    @TableField(exist = false)
+    private String bulkDensity;
+    /**
+     * 热损伤
+     */
+    @TableField(exist = false)
+    private String jiaorenli;
 
     @Override
     protected Serializable pkVal() {

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

@@ -88,6 +88,7 @@ public class WarehouseInventoryCountInfo extends BaseModel<WarehouseInventoryCou
     private String inventoryRatio;
 
 
+
     @Override
     protected Serializable pkVal() {
         return this.id;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WarehouseInOutInfoMapper.java

@@ -1,8 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 记录出入库信息 Mapper 接口
@@ -12,5 +16,20 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @since 2021-05-21
  */
 public interface WarehouseInOutInfoMapper extends BaseMapper<WarehouseInOutInfo> {
+    /**
+     * 根据条件流转记录总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询流转记录列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<WarehouseInOutInfo> getListByCondition(Map<String, Object> pageView);
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WarehouseInventoryCountInfoMapper.java

@@ -1,8 +1,13 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInventoryCountInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 记录库存盘点信息 Mapper 接口
@@ -13,4 +18,20 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface WarehouseInventoryCountInfoMapper extends BaseMapper<WarehouseInventoryCountInfo> {
 
+    /**
+     * 根据条件查询盘损记录总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询盘损记录列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<WarehouseInventoryCountInfo> getListByCondition(Map<String, Object> pageView);
+
 }

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

@@ -3,9 +3,6 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
-
-import java.util.List;
 /**
  * <p>
  * 记录出入库信息 服务类
@@ -32,4 +29,12 @@ public interface IWarehouseInOutInfoService extends IService<WarehouseInOutInfo>
      */
     String InOutWarehouse (WarehouseInOutInfo warehouseInOutInfo);
 
+    /**
+     * 流转记录分页查询
+     *
+     * @param warehouseInOutInfo
+     * @return
+     */
+    Page<WarehouseInOutInfo> selectInfo(WarehouseInOutInfo warehouseInOutInfo);
+
 }

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

@@ -1,5 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInventoryCountInfo;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -13,4 +15,20 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface IWarehouseInventoryCountInfoService extends IService<WarehouseInventoryCountInfo> {
 
+    /**
+     * 盘损记录分页查询
+     *
+     * @param warehouseInventoryCountInfo
+     * @return
+     */
+    Page<WarehouseInventoryCountInfo> selectInfo(WarehouseInventoryCountInfo warehouseInventoryCountInfo);
+
+    /**
+     * 盘损当期仓损
+     *
+     * @param warehouseInventoryCountInfo
+     * @return
+     */
+    WarehouseInventoryCountInfo getInfo(WarehouseInventoryCountInfo warehouseInventoryCountInfo);
+
 }

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

@@ -14,9 +14,7 @@ import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutDetail;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
-import com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseInOutInfoMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
+import com.google.common.collect.Lists;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutDetailService;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -25,8 +23,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * <p>
@@ -124,12 +122,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         // 判断是否有货
                         if (warehousePositionStorageInfo != null) {
                             // 更新库存量
-                            warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage()+warehouseInOutInfo.getNetWeight());
+                            warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + warehouseInOutInfo.getNetWeight());
                             warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
                         }
-                         // 没有货
-                        else{
-                            WarehousePositionStorageInfo  warehousePositionStorageInfo1 = new WarehousePositionStorageInfo();
+                        // 没有货
+                        else {
+                            WarehousePositionStorageInfo warehousePositionStorageInfo1 = new WarehousePositionStorageInfo();
                             warehousePositionStorageInfo1.setId(IdGenerator.generateUUID());
                             warehousePositionStorageInfo1.setPositionId(warehouseInOutInfo.getPositionId());
                             warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo.getBinNumber());
@@ -156,28 +154,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 .eq("delete_flag", "0"));
                         // 判断是否有货
                         if (warehousePositionStorageInfo != null) {
-                            if(warehouseInOutInfo.getNetWeight() <= warehousePositionStorageInfo.getStorage()){
+                            if (warehouseInOutInfo.getNetWeight() <= warehousePositionStorageInfo.getStorage()) {
                                 // 更新库存量
-                                warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage()-warehouseInOutInfo.getNetWeight());
+                                warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - warehouseInOutInfo.getNetWeight());
                                 warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
                             }
                             //出库量大于库存量
-                            else{
+                            else {
                                 throw new YException(YExceptionEnum.INVENTORY_NO_ERROR);
                             }
                         }
                         // 没有储存量
-                        else{
+                        else {
                             throw new YException(YExceptionEnum.POSITIONSTORAGE_NO_ERROR);
                         }
                     }
                     //库位不存在
-                    else{
+                    else {
                         throw new YException(YExceptionEnum.POSITION_NO_ERROR);
                     }
                 }
                 //仓库不存在
-                else{
+                else {
                     throw new YException(YExceptionEnum.WAREHOUSE_NO_ERROR);
                 }
             }
@@ -202,4 +200,32 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
 
         return "OK";
     }
+    /**
+     * 流转记录
+     *
+     * @param warehouseInOutInfo
+     * @return
+     */
+    @Override
+    public Page<WarehouseInOutInfo> selectInfo(WarehouseInOutInfo warehouseInOutInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (warehouseInOutInfo.getCurrentPage() - 1)
+                * warehouseInOutInfo.getPageSize());
+        //  仓库ID
+        pageView.put("baseId", warehouseInOutInfo.getBaseId());
+        //  仓位ID
+        pageView.put("positionId", warehouseInOutInfo.getPositionId());
+        pageView.put("searchType", warehouseInOutInfo.getSearchType());
+        pageView.put("pageSize", warehouseInOutInfo.getPageSize());
+        pageView.put("currentPage", warehouseInOutInfo.getCurrentPage());
+        // 查询记录总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<WarehouseInOutInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<WarehouseInOutInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(warehouseInOutInfo.getCurrentPage());
+        page.setSize(warehouseInOutInfo.getPageSize());
+        return page;
+    }
 }

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

@@ -1,10 +1,22 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInventoryCountInfo;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseInventoryCountInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInventoryCountInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +29,122 @@ import org.springframework.stereotype.Service;
 @Service
 public class WarehouseInventoryCountInfoServiceImpl extends ServiceImpl<WarehouseInventoryCountInfoMapper, WarehouseInventoryCountInfo> implements IWarehouseInventoryCountInfoService {
 
+    @Autowired
+    private IWarehouseInOutInfoService warehouseInOutInfoService;
+
+    /**
+     * 查询盘损记录
+     *
+     * @param warehouseInventoryCountInfo
+     * @return
+     */
+    @Override
+    public Page<WarehouseInventoryCountInfo> selectInfo(WarehouseInventoryCountInfo warehouseInventoryCountInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (warehouseInventoryCountInfo.getCurrentPage() - 1)
+                * warehouseInventoryCountInfo.getPageSize());
+        //  仓库ID
+        pageView.put("baseId", warehouseInventoryCountInfo.getBaseId());
+        //  仓位ID
+        pageView.put("positionId", warehouseInventoryCountInfo.getPositionId());
+        pageView.put("pageSize", warehouseInventoryCountInfo.getPageSize());
+        pageView.put("currentPage", warehouseInventoryCountInfo.getCurrentPage());
+        // 查询记录总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<WarehouseInventoryCountInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<WarehouseInventoryCountInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(warehouseInventoryCountInfo.getCurrentPage());
+        page.setSize(warehouseInventoryCountInfo.getPageSize());
+        return page;
+    }
+
+    /**
+     * 盘损
+     *
+     * @param warehouseInventoryCountInfo
+     * @return
+     */
+    @Override
+    public WarehouseInventoryCountInfo getInfo(WarehouseInventoryCountInfo warehouseInventoryCountInfo) {
+        WarehouseInventoryCountInfo warehouseInventoryCountInfoCopy = new WarehouseInventoryCountInfo();
+        Wrapper<WarehouseInventoryCountInfo> warehouseInventoryCountInfoWrapper = new EntityWrapper<>();
+        warehouseInventoryCountInfoWrapper.eq("base_id", warehouseInventoryCountInfo.getBaseId())
+                .eq("position_id", warehouseInventoryCountInfo.getPositionId())
+                .eq("goods_name_key",warehouseInventoryCountInfo.getGoodsNameKey())
+                .eq("delete_flag", "0")
+                .orderBy("create_date",false);
+        List<WarehouseInventoryCountInfo> warehouseInventoryCountInfos = this.selectList(warehouseInventoryCountInfoWrapper);
+        // 有盘损记录
+        if (!CollectionUtils.isEmpty(warehouseInventoryCountInfos)) {
+            WarehouseInventoryCountInfo warehouseInventoryCountInfo1=warehouseInventoryCountInfos.get(0);
+            //最后一次盘损剩余量
+            Float physicalInventory=warehouseInventoryCountInfo1.getPhysicalInventory();
+            //定义入库
+            Float inNetWeight =0f;
+            // 查询入库数量
+            List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                    .eq("base_id", warehouseInventoryCountInfo1.getBaseId())
+                    .eq("position_id", warehouseInventoryCountInfo1.getPositionId())
+                    .eq("in_out_flag", "2")
+                    .ge("create_date",warehouseInventoryCountInfo1.getCreateDate())
+                    .eq("goods_name_key",warehouseInventoryCountInfo1.getGoodsNameKey()));
+            if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                    inNetWeight = inNetWeight + warehouseInOutInfo.getNetWeight();
+                }
+            }
+            warehouseInventoryCountInfoCopy.setCumulativeStockIn(inNetWeight + physicalInventory);
+            //定义出库
+            Float outNetWeight = 0f;
+            // 查询出库数量
+            List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                    .eq("base_id", warehouseInventoryCountInfo1.getBaseId())
+                    .eq("position_id", warehouseInventoryCountInfo1.getPositionId())
+                    .ge("create_date",warehouseInventoryCountInfo1.getCreateDate())
+                    .eq("in_out_flag", "1")
+                    .eq("goods_name_key",warehouseInventoryCountInfo1.getGoodsNameKey()));
+            if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
+                for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
+                        outNetWeight = outNetWeight + warehouseInOutInfo.getNetWeight();
+                }
+            }
+            warehouseInventoryCountInfoCopy.setCumulativeStockOut(outNetWeight);
+
+        }
+        // 未盘损过
+        else{
+            //定义入库
+            Float inNetWeight =0f;
+            // 查询入库数量
+            List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                    .eq("base_id", warehouseInventoryCountInfo.getBaseId())
+                    .eq("position_id", warehouseInventoryCountInfo.getPositionId())
+                    .eq("in_out_flag", "2")
+                    .eq("goods_name_key",warehouseInventoryCountInfo.getGoodsNameKey()));
+            if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                    inNetWeight = inNetWeight + warehouseInOutInfo.getNetWeight();
+                }
+            }
+            warehouseInventoryCountInfoCopy.setCumulativeStockIn(inNetWeight);
+            //定义出库
+            Float outNetWeight = 0f;
+            // 查询出库数量
+            List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                    .eq("base_id", warehouseInventoryCountInfo.getBaseId())
+                    .eq("position_id", warehouseInventoryCountInfo.getPositionId())
+                    .eq("in_out_flag", "1")
+                    .eq("goods_name_key",warehouseInventoryCountInfo.getGoodsNameKey()));
+            if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
+                for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
+                    outNetWeight = outNetWeight + warehouseInOutInfo.getNetWeight();
+                }
+            }
+            warehouseInventoryCountInfoCopy.setCumulativeStockOut(outNetWeight);
+
+        }
+        return warehouseInventoryCountInfoCopy;
+    }
 }

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

@@ -1,5 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseInOutInfoMapper">
-
+    <!-- 获得流转记录总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(w.id)
+        FROM warehouse_in_out_info w
+        left join warehouse_in_out_detail d on w.id=d.info_id
+        WHERE
+        w.base_id = #{baseId}
+        and w.position_id = #{positionId}
+        and w.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 2">
+                AND w.in_out_flag = '1'
+            </if>
+            <if test="searchType == 3">
+                AND w.in_out_flag = '2'
+            </if>
+        </if>
+    </select>
+    <!-- 流转记录列表查询 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.warehouseInOutInfo">
+        SELECT
+        w.id,
+        w.goods_name as goodsName,
+        w.gross_weight as grossWeight,
+        w.tare,
+        w.net_weight as netWeight,
+        w.grade,
+        w.in_out_date as inOutDate,
+        w.in_out_type as inOutType,
+        w.contract_no as contractNo,
+        w.car_no as carNo,
+        w.agent,
+        w.back_office as backOffice
+        w.create_date as createDate,
+        d.water_content as waterContent,
+        d.bulk_density as bulkDensity,
+        d.jiaorenli as jiaorenli,
+        d.impurity as impurity,
+        d.mildew_grain as mildewGrain,
+        d.imperfect_grain as imperfectGrain,
+        d.quality_inspector as qualityInspector,
+        w.address_url as addressUrl
+        FROM warehouse_in_out_info w
+        left join warehouse_in_out_detail d on w.id=d.info_id
+        WHERE
+        w.base_id = #{baseId}
+        and w.position_id = #{positionId}
+        and w.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 2">
+                AND w.in_out_flag = '1'
+            </if>
+            <if test="searchType == 3">
+                AND w.in_out_flag = '2'
+            </if>
+        </if>
+        ORDER BY w.update_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>

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

@@ -1,5 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseInventoryCountInfoMapper">
-
+    <!-- 获得盘损记录总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(id)
+        FROM warehouse_inventory_count_info
+        WHERE
+        base_id = #{baseId}
+        and position_id = #{positionId}
+        and delete_flag = '0'
+    </select>
+    <!-- 盘损记录查询 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInventoryCountInfo">
+        SELECT
+        id,
+        goods_name as goodsName,
+        cumulative_stock_in as cumulativeStockIn,
+        cumulative_stock_out as cumulativeStockOut,
+        surplus_inventory as surplusInventory,
+        physical_inventory as physicalinventory,
+        loss,
+        inventory_ratio as inventoryRatio,
+        quality_inspector as qualityInspector,
+        create_date as createDate
+        FROM warehouse_inventory_count_info
+        WHERE
+        base_id = #{baseId}
+        and position_id = #{positionId}
+        and delete_flag = '0'
+        ORDER BY create_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>