打印

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

@@ -1,6 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouseCar;
 import com.yh.saas.plugin.yiliangyiyun.service.IDryWarehouseCarService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,5 +50,14 @@ public class DryWarehouseCarController {
     public List<DryWarehouseCar> selectCarNumber(String baseId){
         return dryWarehouseCarService.selectCarNumber(baseId);
     }
+
+    /**
+     * 车辆列表
+     * @return
+     */
+    @GetMapping("/selectCarPage")
+    public Page<DryWarehouseCar> selectCarPage(DryWarehouseCar dryWarehouseCar){
+        return dryWarehouseCarService.selectCarPage(dryWarehouseCar);
+    }
 }
 

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

@@ -54,7 +54,7 @@ public class DryWarehouseController {
      * @param dryWarehouse
      */
     @GetMapping("/selectDryWarehousePage")
-    public Page<DryWarehouse> selectDryWarehousePage(@RequestBody DryWarehouse dryWarehouse){
+    public Page<DryWarehouse> selectDryWarehousePage(DryWarehouse dryWarehouse){
         return dryWarehouseService.selectDryWarehousePage(dryWarehouse);
     }
 }

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

@@ -326,6 +326,12 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
     @TableField(exist = false)
     private String companyName;
 
+    /**
+     * 公司id
+     */
+    @TableField(exist = false)
+    private String compId;
+
     /**
      * 查询类型
      */

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

@@ -1,9 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverViewInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouse;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouseCar;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -35,4 +36,11 @@ public interface IDryWarehouseCarService extends IService<DryWarehouseCar> {
      * @return
      */
     List<DryWarehouseCar> selectCarNumber(String baseId);
+
+    /**
+     * 车辆列表
+     * @param dryWarehouseCar
+     * @return
+     */
+    Page<DryWarehouseCar> selectCarPage(DryWarehouseCar dryWarehouseCar);
 }

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

@@ -1,9 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouseCar;
 import com.yh.saas.plugin.yiliangyiyun.mapper.DryWarehouseCarMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IDryWarehouseCarService;
@@ -64,4 +65,21 @@ public class DryWarehouseCarServiceImpl extends ServiceImpl<DryWarehouseCarMappe
                 .eq(DryWarehouseCar.QueryFiles.BASE_ID, baseId).eq(DryWarehouseCar.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         return dryWarehouseCarList;
     }
+
+    /**
+     * 车辆列表
+     * @param dryWarehouseCar
+     * @return
+     */
+    @Override
+    public Page<DryWarehouseCar> selectCarPage(DryWarehouseCar dryWarehouseCar){
+        Wrapper<DryWarehouseCar> dryWarehouseCarWrapper = new EntityWrapper<DryWarehouseCar>();
+        dryWarehouseCarWrapper.eq(DryWarehouseCar.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0);
+        dryWarehouseCarWrapper.eq(DryWarehouseCar.QueryFiles.BASE_ID,dryWarehouseCar.getBaseId());
+        dryWarehouseCarWrapper.orderBy("update_date", false);
+        Page<DryWarehouseCar> dryWarehouseCarPage = this.selectPage(dryWarehouseCar.getQueryPage(), dryWarehouseCarWrapper);
+        List<DryWarehouseCar> dryWarehouseCarList = dryWarehouseCarPage.getRecords();
+        dryWarehouseCarPage.setRecords(dryWarehouseCarList);
+        return dryWarehouseCarPage;
+    }
 }

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

@@ -2388,8 +2388,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         pageView.put("startRecord", (warehouseInOutInfo.getCurrentPage() - 1)
                 * warehouseInOutInfo.getPageSize());
         //  仓库ID
+        pageView.put("compId", warehouseInOutInfo.getCompId());
         pageView.put("baseId", warehouseInOutInfo.getBaseId());
-        //  仓位ID
         pageView.put("positionId", warehouseInOutInfo.getPositionId());
         pageView.put("searchKeyWord", warehouseInOutInfo.getSearchKeyWord());
         pageView.put("startDate", warehouseInOutInfo.getStartDate());

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

@@ -17,5 +17,80 @@
         ORDER BY dry_number DESC
     </select>
 
+    <!-- 获得烘干入库记录总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(id)
+        FROM dry_warehouse
+        WHERE delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND status_flag = '1'
+            </if>
+        </if>
+        <if test="baseId != null and baseId != ''">
+            AND base_id = #{baseId}
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(car_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(weigher) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        <if test="startDate != null">
+            AND (DATE_FORMAT(in_warehouse_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(in_warehouse_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+    </select>
 
+    <!-- 获得烘干入库记录列表 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouse">
+        SELECT
+        id,
+        comp_id as compId,
+        base_id as baseId,
+        warehouse_name as warehouseName,
+        dry_number as dryNumber,
+        car_no as carNo,
+        goods_name_key as goodsNameKey,
+        goods_name as goodsName,
+        gross_weight as grossWeight,
+        weigher,
+        tare,
+        net_weight as netWeight,
+        status_flag as statusFlag,
+        status,
+        in_warehouse_date as inWarehouseDate,
+        update_date as updateDate,
+        create_date as createDate
+        FROM dry_warehouse
+        WHERE delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND status_flag = '1'
+            </if>
+        </if>
+        <if test="baseId != null and baseId != ''">
+            AND base_id = #{baseId}
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(car_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(weigher) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        <if test="startDate != null">
+            AND (DATE_FORMAT(in_warehouse_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(in_warehouse_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+        ORDER BY in_warehouse_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>

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

@@ -40,6 +40,9 @@
         <if test="baseId != null and baseId != ''">
             AND w.base_id = #{baseId}
         </if>
+        <if test="compId != null and compId != ''">
+            AND wbi.comp_id = #{compId}
+        </if>
         <if test="warehouseName != null and warehouseName != ''">
             and w.warehouse_name = #{warehouseName}
         </if>
@@ -162,6 +165,9 @@
         <if test="baseId != null and baseId != ''">
             AND w.base_id = #{baseId}
         </if>
+        <if test="compId != null and compId != ''">
+            AND wbi.comp_id = #{compId}
+        </if>
         <if test="warehouseName != null and warehouseName != ''">
             and w.warehouse_name = #{warehouseName}
         </if>