烘干入库

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

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","general_audit_info");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","dry_warehouse","dry_warehouse_car");
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -175,6 +175,9 @@ public enum StatusEnum {
     //汽运报表状态
     PENDING_PAY("1", "待请款", "pending_pay"),
 
+    //烘干入库状态
+    WEIGHED_TARE("1", "待称皮重", "weighed_tare"),
+    ALREADY_IN_WAREHOUSE("3", "已入库", "already_in_warehouse"),
 
     ;
     @Getter

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

@@ -0,0 +1,53 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouseCar;
+import com.yh.saas.plugin.yiliangyiyun.service.IDryWarehouseCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记录烘干入库常用车辆信息 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@RestController
+@RequestMapping("/dryWarehouseCar")
+public class DryWarehouseCarController {
+
+    @Autowired
+    private IDryWarehouseCarService dryWarehouseCarService;
+
+    /**
+     * 添加车辆信息
+     * @param dryWarehouseCar
+     */
+    @PostMapping("/api/addDryWarehouseCar")
+    public String addDryWarehouseCar(@RequestBody DryWarehouseCar dryWarehouseCar){
+        return dryWarehouseCarService.addDryWarehouseCar(dryWarehouseCar);
+    }
+
+    /**
+     * 删除车辆信息
+     * @param example
+     */
+    @PostMapping("/api/deleteDryWarehouseCar")
+    public void deleteDryWarehouseCar(@RequestBody DryWarehouseCar example){
+        dryWarehouseCarService.deleteDryWarehouseCar(example.getId());
+    }
+
+    /**
+     * 车牌号下拉列表
+     * @return
+     */
+    @GetMapping("/selectCarNumber")
+    public List<DryWarehouseCar> selectCarNumber(String baseId){
+        return dryWarehouseCarService.selectCarNumber(baseId);
+    }
+}
+

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

@@ -0,0 +1,61 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouse;
+import com.yh.saas.plugin.yiliangyiyun.service.IDryWarehouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 记录烘干入库信息 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@RestController
+@RequestMapping("/dryWarehouse")
+public class DryWarehouseController {
+
+    @Autowired
+    private IDryWarehouseService dryWarehouseService;
+
+    /**
+     * 称毛重
+     * @param dryWarehouse
+     */
+    @PostMapping("/api/addDryWarehouse")
+    public String addDryWarehouse(@RequestBody DryWarehouse dryWarehouse){
+        return dryWarehouseService.addDryWarehouse(dryWarehouse);
+    }
+
+    /**
+     * 称皮重
+     * @param dryWarehouse
+     */
+    @PostMapping("/api/editDryWarehouse")
+    public String editDryWarehouse(@RequestBody DryWarehouse dryWarehouse){
+        return dryWarehouseService.editDryWarehouse(dryWarehouse);
+    }
+
+    /**
+     * 删除
+     * @param example
+     */
+    @PostMapping("/api/deleteDryWarehouse")
+    public void deleteDryWarehouse(@RequestBody DryWarehouse example){
+        dryWarehouseService.deleteDryWarehouse(example.getId());
+    }
+
+    /**
+     * 烘干入库记录
+     * @param dryWarehouse
+     */
+    @GetMapping("/selectDryWarehousePage")
+    public Page<DryWarehouse> selectDryWarehousePage(@RequestBody DryWarehouse dryWarehouse){
+        return dryWarehouseService.selectDryWarehousePage(dryWarehouse);
+    }
+}
+

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

@@ -1,7 +1,6 @@
 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.WarehouseBaseInfo;
@@ -29,6 +28,7 @@ public class WarehouseBaseInfoController {
 
     @Autowired
     private IWarehouseBaseInfoService warehouseBaseInfoService;
+
     /**
      * 添加仓库
      */
@@ -39,13 +39,15 @@ public class WarehouseBaseInfoController {
 
     /**
      * 添加临时仓库
+     *
      * @param warehouseBaseInfo
      * @return
      */
     @PostMapping("/api/addTemporaryWarehouse")
-    public String addTemporaryWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo){
+    public String addTemporaryWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.addTemporaryWarehouse(warehouseBaseInfo);
     }
+
     /**
      * 编辑仓库
      */
@@ -53,46 +55,49 @@ public class WarehouseBaseInfoController {
     public String editWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.editWarehouse(warehouseBaseInfo);
     }
+
     /**
      * 查看库房下拉列表
      */
     @GetMapping("/selectWarehouse")
-    public List<WarehouseBaseInfo> selectWarehouse(@RequestParam String compId,String warehouseType){
-        return warehouseBaseInfoService.selectWarehouse(compId,warehouseType);
+    public List<WarehouseBaseInfo> selectWarehouse(@RequestParam String compId, String warehouseType) {
+        return warehouseBaseInfoService.selectWarehouse(compId, warehouseType);
     }
+
     /**
      * 查看自己负责的常用仓库
      * 公司ID,手机号
      */
     @GetMapping("/selectWarehouseSelf")
-    public List<WarehouseBaseInfo> selectWarehouseSelf(@RequestParam String compId,String personCharge){
-        return warehouseBaseInfoService.selectWarehouseSelf(compId,personCharge);
+    public List<WarehouseBaseInfo> selectWarehouseSelf(@RequestParam String compId, String personCharge) {
+        return warehouseBaseInfoService.selectWarehouseSelf(compId, personCharge);
     }
+
     /**
      * 查看自己负责的常用仓库
      * 公司ID,手机号
      */
     @GetMapping("/selectWarehouseSelfApp")
-    public List<WarehouseBaseInfo> selectWarehouseSelfApp(@RequestParam String compId,String personCharge){
-        return warehouseBaseInfoService.selectWarehouseSelfApp(compId,personCharge);
+    public List<WarehouseBaseInfo> selectWarehouseSelfApp(@RequestParam String compId, String personCharge) {
+        return warehouseBaseInfoService.selectWarehouseSelfApp(compId, personCharge);
     }
+
     /**
      * 查看库房
      */
     @GetMapping("/getWarehouse")
-    public WarehouseBaseInfo getWarehouse(String id){
+    public WarehouseBaseInfo getWarehouse(String id) {
         return warehouseBaseInfoService.getWarehouse(id);
     }
 
     /**
-     * @description 仓库管理页面列表
-     *
      * @param compId
      * @return
+     * @description 仓库管理页面列表
      */
     @GetMapping("/selectWarehouseViewinfo")
-    public WarehouseBaseInfo selectWarehouseViewinfo(String compId,String warehouseName,String warehouseType){
-        return warehouseBaseInfoService.selectWarehouseViewinfo(compId,warehouseName,warehouseType);
+    public WarehouseBaseInfo selectWarehouseViewinfo(String compId, String warehouseName, String warehouseType) {
+        return warehouseBaseInfoService.selectWarehouseViewinfo(compId, warehouseName, warehouseType);
     }
 
     /**
@@ -102,7 +107,7 @@ public class WarehouseBaseInfoController {
      * @return
      */
     @GetMapping("/reservesDetails")
-    public List<WarehouseNumView> reservesDetails(String compId){
+    public List<WarehouseNumView> reservesDetails(String compId) {
         return warehouseBaseInfoService.reservesDetails(compId);
     }
 
@@ -113,57 +118,64 @@ public class WarehouseBaseInfoController {
      * @return
      */
     @GetMapping("/allWarehouse")
-    public List<WarehouseView> allWarehouse(String compId,String warehouseName,String goodsName){
-        return warehouseBaseInfoService.allWarehouse(compId,warehouseName,goodsName);
+    public List<WarehouseView> allWarehouse(String compId, String warehouseName, String goodsName) {
+        return warehouseBaseInfoService.allWarehouse(compId, warehouseName, goodsName);
     }
 
     /**
      * 更改显示状态
      */
     @PostMapping("/api/editShow")
-    public String editShow(@RequestBody WarehouseBaseInfo warehouseBaseInfo){
+    public String editShow(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.editShow(warehouseBaseInfo.getId());
     }
 
     /**
      * 查询所有库房
+     *
      * @param compId,warehouseType
      * @return
      */
     @GetMapping("/selectAllWarehouse")
-    public List<WarehouseBaseInfo> selectAllWarehouse(String compId,String warehouseType,String warehouseName){
-        return warehouseBaseInfoService.selectAllWarehouse(compId,warehouseType,warehouseName);
+    public List<WarehouseBaseInfo> selectAllWarehouse(String compId, String warehouseType, String warehouseName) {
+        return warehouseBaseInfoService.selectAllWarehouse(compId, warehouseType, warehouseName);
     }
 
     /**
      * 删除库房
+     *
      * @param warehouseBaseInfo
      */
     @PostMapping("/api/deleteWarehouse")
-    public void deleteWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo){
+    public void deleteWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         warehouseBaseInfoService.deleteWarehouse(warehouseBaseInfo.getId());
     }
 
     /**
      * 清仓状态
+     *
      * @param warehouseBaseInfo
      * @return
      */
     @PostMapping("/api/editCleared")
-    public String editCleared(@RequestBody WarehouseBaseInfo warehouseBaseInfo){
+    public String editCleared(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.editCleared(warehouseBaseInfo.getId());
     }
+
     /**
      * 出入库合同编号下拉列表
+     *
      * @param compId
      * @return
      */
     @GetMapping("/selectContractNoList")
-    public List<ContractManagementInfo> selectContractNoList(String compId,Integer flag) {
-        return warehouseBaseInfoService.selectContractNoList(compId,flag);
+    public List<ContractManagementInfo> selectContractNoList(String compId, Integer flag) {
+        return warehouseBaseInfoService.selectContractNoList(compId, flag);
     }
+
     /**
      * 获取检斤打印接口
+     *
      * @param id
      * @return
      */
@@ -171,23 +183,27 @@ public class WarehouseBaseInfoController {
     public WarehouseInOutInfo getPrintInfo(String id) {
         return warehouseBaseInfoService.getPrintInfo(id);
     }
+
     /**
      * 查出库时的成本
+     *
      * @param contractNo,carNo
      * @return
      */
     @GetMapping("/selectCost")
-    public Float selectCost(String contractNo,String carNo) {
-        return warehouseBaseInfoService.selectCost(contractNo,carNo);
+    public Float selectCost(String contractNo, String carNo) {
+        return warehouseBaseInfoService.selectCost(contractNo, carNo);
     }
+
     /**
      * 查看自己负责的常用仓库
      * 公司ID,手机号
      */
     @GetMapping("/selectResponsible")
-    public List<WarehouseBaseInfo> selectResponsible(@RequestParam String compId,String personCharge){
-        return warehouseBaseInfoService.selectResponsible(compId,personCharge);
+    public List<WarehouseBaseInfo> selectResponsible(@RequestParam String compId, String personCharge) {
+        return warehouseBaseInfoService.selectResponsible(compId, personCharge);
     }
+
     /**
      * 导出入库
      *
@@ -196,8 +212,9 @@ public class WarehouseBaseInfoController {
      */
     @PostMapping("/export")
     public void export(@RequestBody WarehouseBaseInfo example, HttpServletResponse response) throws Exception {
-        warehouseBaseInfoService.export(example,response);
+        warehouseBaseInfoService.export(example, response);
     }
+
     /**
      * 导出出库
      *
@@ -206,7 +223,7 @@ public class WarehouseBaseInfoController {
      */
     @PostMapping("/exportOut")
     public void exportOut(@RequestBody WarehouseBaseInfo example, HttpServletResponse response) throws Exception {
-        warehouseBaseInfoService.exportOut(example,response);
+        warehouseBaseInfoService.exportOut(example, response);
     }
 
 
@@ -218,8 +235,9 @@ public class WarehouseBaseInfoController {
      */
     @PostMapping("/exportphone")
     public String exportphone(@RequestBody WarehouseBaseInfo example, HttpServletResponse response) throws Exception {
-        return warehouseBaseInfoService.exportphone(example,response);
+        return warehouseBaseInfoService.exportphone(example, response);
     }
+
     /**
      * 导出出库
      *
@@ -228,7 +246,7 @@ public class WarehouseBaseInfoController {
      */
     @PostMapping("/exportPhoneOut")
     public String exportPhoneOut(@RequestBody WarehouseBaseInfo example, HttpServletResponse response) throws Exception {
-        return warehouseBaseInfoService.exportPhoneOut(example,response);
+        return warehouseBaseInfoService.exportPhoneOut(example, response);
     }
 
     /**
@@ -241,6 +259,7 @@ public class WarehouseBaseInfoController {
     public Page<WarehouseBaseInfo> selectBaseInfo(WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.selectBaseInfo(warehouseBaseInfo);
     }
+
     /**
      * 库点利润图表
      */

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

@@ -0,0 +1,129 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yh.saas.common.support.entity.BaseModel;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 记录烘干入库信息
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("dry_warehouse")
+public class DryWarehouse extends BaseModel<DryWarehouse> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 仓库id
+     */
+    private String baseId;
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+    /**
+     * 业务编号
+     */
+    private String dryNumber;
+    /**
+     * 车牌号
+     */
+    private String carNo;
+    /**
+     * 货名key
+     */
+    private String goodsNameKey;
+    /**
+     * 货名
+     */
+    private String goodsName;
+    /**
+     * 检斤员
+     */
+    private String weigher;
+    /**
+     * 毛重（公斤）
+     */
+    private Float grossWeight;
+    /**
+     * 皮重（公斤）
+     */
+    private Float tare;
+    /**
+     * 净重（公斤）
+     */
+    private Float netWeight;
+    /**
+     * 状态标识（1待称皮重3已入库）
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 入库时间
+     */
+    private Date inWarehouseDate;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date startDate;
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date endDate;
+    /**
+     * 查询类型(1待称皮重)
+     */
+    @TableField(exist = false)
+    private String searchType;
+    /**
+     * 仓库编号
+     */
+    @TableField(exist = false)
+    private String warehouseNo;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,62 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.yh.saas.common.support.entity.BaseModel;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 记录烘干入库常用车辆信息
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("dry_warehouse_car")
+public class DryWarehouseCar extends BaseModel<DryWarehouseCar> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 仓库id
+     */
+    private String baseId;
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+    /**
+     * 车牌号
+     */
+    private String carNo;
+    /**
+     * 皮重（公斤）
+     */
+    private Float tare;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+    public static class QueryFiles {
+
+        public static final String BASE_ID = "base_id";
+
+        public static final String DELETE_FLAG = "delete_flag";
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouseCar;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录烘干入库常用车辆信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+public interface DryWarehouseCarMapper extends BaseMapper<DryWarehouseCar> {
+
+}

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

@@ -0,0 +1,44 @@
+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;
+
+/**
+ * <p>
+ * 记录烘干入库信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+public interface DryWarehouseMapper extends BaseMapper<DryWarehouse> {
+
+    /**
+     * 根据条件查询烘干记录总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询烘干记录列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<DryWarehouse> getListByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询业务编号列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<DryWarehouse> getListByConditions(Map<String, Object> pageView);
+}

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

@@ -0,0 +1,38 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouseCar;
+import com.baomidou.mybatisplus.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记录烘干入库常用车辆信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+public interface IDryWarehouseCarService extends IService<DryWarehouseCar> {
+
+    /**
+     * 添加车辆信息
+     *
+     * @param dryWarehouseCar
+     */
+    String addDryWarehouseCar(DryWarehouseCar dryWarehouseCar);
+
+    /**
+     * 删除车辆信息
+     * @param id
+     */
+    void deleteDryWarehouseCar(String id);
+
+    /**
+     * 查看车牌下拉列表
+     *
+     * @param baseId
+     * @return
+     */
+    List<DryWarehouseCar> selectCarNumber(String baseId);
+}

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

@@ -0,0 +1,52 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouse;
+import com.baomidou.mybatisplus.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记录烘干入库信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+public interface IDryWarehouseService extends IService<DryWarehouse> {
+
+    /**
+     * 查询业务编号
+     * @param
+     * @return
+     */
+    List<DryWarehouse> selectDryWarehouseList(DryWarehouse dryWarehouse);
+
+    /**
+     * 称毛重
+     *
+     * @param dryWarehouse
+     */
+    String addDryWarehouse(DryWarehouse dryWarehouse);
+
+    /**
+     * 称皮重
+     *
+     * @param dryWarehouse
+     */
+    String editDryWarehouse(DryWarehouse dryWarehouse);
+
+    /**
+     * 删除
+     * @param id
+     */
+    void deleteDryWarehouse(String id);
+
+    /**
+     * 烘干入库记录
+     * @param dryWarehouse
+     * @return
+     */
+    Page<DryWarehouse> selectDryWarehousePage(DryWarehouse dryWarehouse);
+}

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

@@ -30,6 +30,7 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
 
     /**
      * 添加临时仓库
+     *
      * @param warehouseBaseInfo
      * @return
      */
@@ -42,10 +43,11 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
 
     /**
      * 查看库房下拉列表
+     *
      * @param compId
      * @return
      */
-    List<WarehouseBaseInfo> selectWarehouse(String compId,String warehouseType);
+    List<WarehouseBaseInfo> selectWarehouse(String compId, String warehouseType);
 
     /**
      * 查看库房
@@ -58,10 +60,11 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
      * @param compId
      * @return
      */
-    WarehouseBaseInfo selectWarehouseViewinfo(String compId,String warehouseName,String warehouseType);
+    WarehouseBaseInfo selectWarehouseViewinfo(String compId, String warehouseName, String warehouseType);
 
     /**
      * 今日储量明细
+     *
      * @param compId
      * @return
      */
@@ -69,10 +72,11 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
 
     /**
      * 全部仓库
+     *
      * @param compId
      * @return
      */
-    List<WarehouseView> allWarehouse(String compId,String warehouseName,String goodsName);
+    List<WarehouseView> allWarehouse(String compId, String warehouseName, String goodsName);
 
     /**
      * 更改显示状态
@@ -80,61 +84,73 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
     String editShow(String id);
 
     /**
-     *查询所有库房
+     * 查询所有库房
      */
-    List<WarehouseBaseInfo> selectAllWarehouse(String compId,String warehouseType,String warehouseName);
+    List<WarehouseBaseInfo> selectAllWarehouse(String compId, String warehouseType, String warehouseName);
 
     /**
      * 删除库房
      */
-     void deleteWarehouse(String id);
+    void deleteWarehouse(String id);
 
     /**
      * 清仓状态
+     *
      * @param id
      * @return
      */
-     String editCleared(String id);
+    String editCleared(String id);
+
     /**
      * 出入库合同编号下拉列表
      *
      * @param compId
-     * @param flag 0 采购合同编号 1销售合同编号 2 移库任务编号+采购、销售合同编号 null 采购、销售合同编号
+     * @param flag   0 采购合同编号 1销售合同编号 2 移库任务编号+采购、销售合同编号 null 采购、销售合同编号
      */
-    List<ContractManagementInfo> selectContractNoList(String compId,Integer flag);
+    List<ContractManagementInfo> selectContractNoList(String compId, Integer flag);
 
     /**
      * 查看自己负责的常用仓库
+     *
      * @param compId
      * @return
      */
-    List<WarehouseBaseInfo> selectWarehouseSelf(String compId,String personCharge);
+    List<WarehouseBaseInfo> selectWarehouseSelf(String compId, String personCharge);
+
     /**
      * 查看自己负责的常用仓库
+     *
      * @param compId
      * @return
      */
-    List<WarehouseBaseInfo> selectWarehouseSelfApp(String compId,String personCharge);
+    List<WarehouseBaseInfo> selectWarehouseSelfApp(String compId, String personCharge);
+
     /**
      * 获取打印数据
+     *
      * @param id
      * @return
      */
     WarehouseInOutInfo getPrintInfo(String id);
+
     /**
      * 查出库时的成本
      *
      * @param contractNo
      * @param carNo
      */
-    Float selectCost(String contractNo,String carNo);
+    Float selectCost(String contractNo, String carNo);
+
     /**
      * 查看自己负责的仓库
+     *
      * @param compId
      * @return
      */
-    List<WarehouseBaseInfo> selectResponsible(String compId,String personCharge);
+    List<WarehouseBaseInfo> selectResponsible(String compId, String personCharge);
+
     void export(WarehouseBaseInfo warehouseBaseInfo, HttpServletResponse response) throws Exception;
+
     void exportOut(WarehouseBaseInfo warehouseBaseInfo, HttpServletResponse response) throws Exception;
 
 
@@ -151,6 +167,7 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
      * @return
      */
     Page<WarehouseBaseInfo> selectBaseInfo(WarehouseBaseInfo warehouseBaseInfo);
+
     /**
      * 库点利润图表
      *

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

@@ -0,0 +1,67 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+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;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记录烘干入库常用车辆信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@Service
+public class DryWarehouseCarServiceImpl extends ServiceImpl<DryWarehouseCarMapper, DryWarehouseCar> implements IDryWarehouseCarService {
+
+    /**
+     * 添加车辆信息
+     *
+     * @param dryWarehouseCar
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addDryWarehouseCar(DryWarehouseCar dryWarehouseCar) {
+        //新增主键id
+        dryWarehouseCar.setId(IdGenerator.generateUUID());
+        this.insert(dryWarehouseCar);
+        return "ok";
+    }
+
+    /**
+     * 删除车辆信息
+     *
+     * @param id
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteDryWarehouseCar(String id) {
+        DryWarehouseCar dryWarehouseCar = this.selectById(id);
+        if (dryWarehouseCar != null) {
+            this.deleteById(dryWarehouseCar.getId());
+        }
+    }
+
+    /**
+     * 车牌号下拉列表
+     *
+     * @param baseId
+     * @return
+     */
+    @Override
+    public List<DryWarehouseCar> selectCarNumber(String baseId) {
+        List<DryWarehouseCar> dryWarehouseCarList = this.selectList(new EntityWrapper<DryWarehouseCar>()
+                .eq(DryWarehouseCar.QueryFiles.BASE_ID, baseId).eq(DryWarehouseCar.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        return dryWarehouseCarList;
+    }
+}

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

@@ -0,0 +1,160 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
+import com.yh.saas.plugin.yiliangyiyun.mapper.DryWarehouseMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IDryWarehouseService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 记录烘干入库信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@Service
+public class DryWarehouseServiceImpl extends ServiceImpl<DryWarehouseMapper, DryWarehouse> implements IDryWarehouseService {
+
+
+    /**
+     * 查询业务编号
+     * @param
+     * @return
+     */
+    @Override
+    public List<DryWarehouse> selectDryWarehouseList(DryWarehouse dryWarehouse) {
+        SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
+        String date = f.format(new Date(System.currentTimeMillis()));
+        Map<String, Object> pageView = new HashMap<>(7);
+        pageView.put("date", date);
+        pageView.put("warehouseNo", dryWarehouse.getWarehouseNo());
+        pageView.put("numberLetter", "HGRK");
+        pageView.put("compId", dryWarehouse.getCompId());
+        List<DryWarehouse> dataList = baseMapper.getListByConditions(pageView);
+        return dataList;
+    }
+
+    /**
+     * 称毛重
+     *
+     * @param dryWarehouse
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addDryWarehouse(DryWarehouse dryWarehouse) {
+        //新增主键id
+        dryWarehouse.setId(IdGenerator.generateUUID());
+        if(dryWarehouse.getCompId() == null || dryWarehouse.getCompId().isEmpty()){
+            dryWarehouse.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+        }
+        //获取当前年月日
+        SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
+        String date = f.format(new Date(System.currentTimeMillis()));
+        //查询烘干入库信息数量包括已删除的集合
+        List<DryWarehouse> dryWarehouseList = this.selectDryWarehouseList(dryWarehouse);//调用Service中的方法
+        //生成业务编号
+        if (dryWarehouseList.size() > 0) {
+            //取第一条数据的编号
+            String n = dryWarehouseList.get(0).getDryNumber();
+            int intNumber = 0;
+            //截取编号后3位
+            intNumber = Integer.parseInt(n.substring(15));
+            intNumber++;
+            String Number = String.valueOf(intNumber);
+            for (int i = 0; i < 3; i++) {
+                Number = Number.length() < 3 ? "0" + Number : Number;
+            }
+            //编号自增
+            Number = "HGRK" + date + dryWarehouse.getWarehouseNo() + Number;
+            dryWarehouse.setDryNumber(Number);
+        } else {
+            //如果当天数据为空，生成第一条数据
+            String Number = "HGRK" + date + dryWarehouse.getWarehouseNo() + "001";
+            dryWarehouse.setDryNumber(Number);
+        }
+        if(dryWarehouse.getTare()!= null){
+            //皮重不为空
+            dryWarehouse.setStatus(StatusEnum.ALREADY_IN_WAREHOUSE.getName());
+            dryWarehouse.setStatusFlag(StatusEnum.ALREADY_IN_WAREHOUSE.getFlag());
+        }else {
+            //皮重为空
+            dryWarehouse.setStatus(StatusEnum.WEIGHED_TARE.getName());
+            dryWarehouse.setStatusFlag(StatusEnum.WEIGHED_TARE.getFlag());
+        }
+        dryWarehouse.setInWarehouseDate(new Date());
+        this.insert(dryWarehouse);
+        return "ok";
+    }
+
+    /**
+     * 称皮重
+     *
+     * @param dryWarehouse
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String editDryWarehouse(DryWarehouse dryWarehouse) {
+        dryWarehouse.setStatus(StatusEnum.ALREADY_IN_WAREHOUSE.getName());
+        dryWarehouse.setStatusFlag(StatusEnum.ALREADY_IN_WAREHOUSE.getFlag());
+        this.updateById(dryWarehouse);
+        return "ok";
+    }
+
+    /**
+     * 删除
+     *
+     * @param id
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteDryWarehouse(String id) {
+        DryWarehouse dryWarehouse = this.selectById(id);
+        if (dryWarehouse != null) {
+            this.deleteById(dryWarehouse.getId());
+        }
+    }
+
+    /**
+     * 烘干入库记录列表
+     *
+     * @param dryWarehouse
+     * @return
+     */
+    @Override
+    public Page<DryWarehouse> selectDryWarehousePage(DryWarehouse dryWarehouse) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (dryWarehouse.getCurrentPage() - 1)
+                * dryWarehouse.getPageSize());
+        //公司id
+        pageView.put("baseId", dryWarehouse.getBaseId());
+        pageView.put("startDate", dryWarehouse.getStartDate());
+        pageView.put("endDate", dryWarehouse.getEndDate());
+        pageView.put("searchType", dryWarehouse.getSearchType());
+        pageView.put("searchKeyWord", dryWarehouse.getSearchKeyWord());
+        pageView.put("pageSize", dryWarehouse.getPageSize());
+        pageView.put("currentPage", dryWarehouse.getCurrentPage());
+        // 查询记录总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<DryWarehouse> dataList = baseMapper.getListByCondition(pageView);
+        Page<DryWarehouse> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(dryWarehouse.getCurrentPage());
+        page.setSize(dryWarehouse.getPageSize());
+        return page;
+    }
+}

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

@@ -557,26 +557,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editWarehouse(WarehouseBaseInfo warehouseBaseInfo) {
-        WarehouseBaseInfo warehouseBaseInfo1=this.selectById(warehouseBaseInfo.getId());
+        WarehouseBaseInfo warehouseBaseInfo1 = this.selectById(warehouseBaseInfo.getId());
         String personPhone = warehouseBaseInfo.getPersonPhone();
         String otherPhone = warehouseBaseInfo.getOtherPersonPhone();
-        if(personPhone != null){
-            if(!personPhone.equals(warehouseBaseInfo1.getPersonPhone())){
+        if (personPhone != null) {
+            if (!personPhone.equals(warehouseBaseInfo1.getPersonPhone())) {
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
-        }
-        else{
-            if(warehouseBaseInfo1.getPersonPhone()!=null){
+        } else {
+            if (warehouseBaseInfo1.getPersonPhone() != null) {
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
         }
-        if(otherPhone != null){
-            if(!otherPhone.equals(warehouseBaseInfo1.getOtherPersonPhone())){
+        if (otherPhone != null) {
+            if (!otherPhone.equals(warehouseBaseInfo1.getOtherPersonPhone())) {
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
-        }
-        else{
-            if(warehouseBaseInfo1.getOtherPersonPhone()!=null){
+        } else {
+            if (warehouseBaseInfo1.getOtherPersonPhone() != null) {
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
         }
@@ -837,8 +835,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.MONTH, -3);
         List<ContractManagementInfo> temp = new ArrayList();
-        List<ContractManagementInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_CONTRACTINFO+compId+flag,ContractManagementInfo.class);
-        if(listRedis != null && listRedis.size() > 0 ){
+        List<ContractManagementInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_CONTRACTINFO + compId + flag, ContractManagementInfo.class);
+        if (listRedis != null && listRedis.size() > 0) {
             return listRedis;
         }
         //查所有合同编号
@@ -857,7 +855,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.add(contractManagementInfo);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查采购合同编号
@@ -876,7 +874,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 temp.add(contractManagementInfo);
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查销售合同编号
@@ -896,7 +894,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 temp.add(contractManagementInfo);
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查采购订单审核合同编号
@@ -925,7 +923,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.addAll(contractManagementInfoList);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查销售订单审核合同编号
@@ -953,7 +951,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.addAll(contractManagementInfoList);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查销售合同编号,以及移库任务编号
@@ -963,7 +961,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("delete_flag", "0")
                     .eq("status_flag", "1")
                     .eq("contract_type", "1")
-                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
@@ -1015,7 +1013,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("delete_flag", "0")
                     .eq("task_type_key", "3")
                     .eq("in_out_flag", "1")
-                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
                 ContractManagementInfo contractManagementInfo = new ContractManagementInfo();
@@ -1055,14 +1053,13 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 //移库看成自运
                 contractManagementInfo.setDeliverType("1");
                 contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
-                ContractManagementInfo contractManagementInfo1=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                        .eq("contract_no",inOutWarehouseTask.getWarehouseName())
-                        .eq("comp_id",inOutWarehouseTask.getCompId()));
-                if (contractManagementInfo1!=null&&"定价采购".equals(contractManagementInfo1.getPriceType())) {
+                ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("contract_no", inOutWarehouseTask.getWarehouseName())
+                        .eq("comp_id", inOutWarehouseTask.getCompId()));
+                if (contractManagementInfo1 != null && "定价采购".equals(contractManagementInfo1.getPriceType())) {
                     contractManagementInfo.setContractPrice(Float.valueOf(String.valueOf(contractManagementInfo1.getUnitContractPrice())));
                     contractManagementInfo.setPriceType(contractManagementInfo1.getPriceType());
-                }
-                else if(contractManagementInfo1!=null&&"随行就市".equals(contractManagementInfo1.getPriceType())){
+                } else if (contractManagementInfo1 != null && "随行就市".equals(contractManagementInfo1.getPriceType())) {
                     contractManagementInfo.setPriceType(contractManagementInfo1.getPriceType());
                 }
                 contractManagementInfo.setGrade(inOutWarehouseTask.getGrade());
@@ -1072,7 +1069,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.add(contractManagementInfo);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查采购合同编号(不包含自运）,以及移库任务编号
@@ -1172,7 +1169,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.add(contractManagementInfo);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查采购合同编号(不包含自运）,以及移库任务编号,销售合同
@@ -1186,7 +1183,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("contract_type", "2")
                     .eq("status_flag", "1")
                     .eq("deliver_type", "2")
-                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
@@ -1240,7 +1237,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("status_flag", "1")
                     .eq("contract_type", "1")
                     .eq("delete_flag", "0")
-                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo1 : contractManagementInfoList1) {
                 ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
@@ -1287,7 +1284,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("delete_flag", "0")
                     .eq("task_type_key", "3")
                     .eq("in_out_flag", "1")
-                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
                 ContractManagementInfo contractManagementInfo1 = new ContractManagementInfo();
@@ -1324,17 +1321,17 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     contractManagementInfo1.setFireDirectionList(fireList);
                 }
                 contractManagementInfo1.setContractNo(inOutWarehouseTask.getMoveTaskNo());
-                ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                .eq("contract_no",inOutWarehouseTask.getWarehouseName())
-                .eq("comp_id",inOutWarehouseTask.getCompId()));
-                if (contractManagementInfo!=null&&contractManagementInfo.getUnitContractPrice() != null) {
+                ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("contract_no", inOutWarehouseTask.getWarehouseName())
+                        .eq("comp_id", inOutWarehouseTask.getCompId()));
+                if (contractManagementInfo != null && contractManagementInfo.getUnitContractPrice() != null) {
                     contractManagementInfo1.setContractPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
                 }
                 //自运采购的移库
                 ContractManagementInfo contractManagementInfo2 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                         .eq("comp_id", inOutWarehouseTask.getCompId())
                         .eq("contract_no", inOutWarehouseTask.getSendWarehouse()));
-                if (contractManagementInfo2 != null&&contractManagementInfo2.getUnitContractPrice()!=null) {
+                if (contractManagementInfo2 != null && contractManagementInfo2.getUnitContractPrice() != null) {
                     contractManagementInfo1.setContractPrice(Float.valueOf(String.valueOf(contractManagementInfo2.getUnitContractPrice())));
                 }
                 //移库看成自运
@@ -1346,7 +1343,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             }
 //            temp = temp.stream().sorted(Comparator.comparing(ContractManagementInfo::getCreateDate)).collect(Collectors.toList());
 //            temp = temp.subList(temp.size()-100,temp.size());
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //采购合同不包含自运
@@ -1366,7 +1363,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.add(contractManagementInfo);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查可派任务的收购合同
@@ -1379,12 +1376,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 //一个收购合同只能选一次
-                InOutWarehouseTask inOutWarehouseTask=iInOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
+                InOutWarehouseTask inOutWarehouseTask = iInOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                         .eq("comp_id", contractManagementInfo.getCompId())
                         .eq("contract_no", contractManagementInfo.getContractNo())
                         .eq("delete_flag", "0")
                         .orderBy("update_date", false));
-                if (inOutWarehouseTask==null){
+                if (inOutWarehouseTask == null) {
                     ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                             .eq("contract_id", contractManagementInfo.getId()));
                     contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
@@ -1392,7 +1389,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     temp.add(contractManagementInfo);
                 }
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查收购合同
@@ -1404,13 +1401,13 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("delete_flag", "0")
                     .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
-                    ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
-                            .eq("contract_id", contractManagementInfo.getId()));
-                    contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
-                    contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
-                    temp.add(contractManagementInfo);
+                ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
+                        .eq("contract_id", contractManagementInfo.getId()));
+                contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
+                contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
+                temp.add(contractManagementInfo);
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //未结算的合同编号，用于请款收款下拉
@@ -1429,7 +1426,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 temp.add(contractManagementInfo);
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //flag==2 查所有执行中的合同编号,以及移库任务编号
@@ -1459,7 +1456,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setInOutType("移库入库");
                 temp.add(contractManagementInfo);
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
     }
@@ -1479,8 +1476,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         if (personCharge == null || personCharge.isEmpty()) {
             personCharge = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffMobilePhone();
         }
-        List<WarehouseBaseInfo> listRedis = cacheComponent.getObjList(Const.SELF_WAREHOUSE+personCharge,WarehouseBaseInfo.class);
-        if(listRedis != null && listRedis.size() > 0 ){
+        List<WarehouseBaseInfo> listRedis = cacheComponent.getObjList(Const.SELF_WAREHOUSE + personCharge, WarehouseBaseInfo.class);
+        if (listRedis != null && listRedis.size() > 0) {
             return listRedis;
         }
         Wrapper<WarehouseBaseInfo> warehouseBaseInfoWrapper = new EntityWrapper<>();
@@ -1592,7 +1589,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             }
 
         }
-        cacheComponent.putRaw(Const.SELF_WAREHOUSE+personCharge,JSONObject.toJSONString(warehouseBaseInfoList),60*60*24);
+        cacheComponent.putRaw(Const.SELF_WAREHOUSE + personCharge, JSONObject.toJSONString(warehouseBaseInfoList), 60 * 60 * 24);
         return warehouseBaseInfoList;
     }
 
@@ -1611,8 +1608,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         if (personCharge == null || personCharge.isEmpty()) {
             personCharge = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffMobilePhone();
         }
-        List<WarehouseBaseInfo> listRedis = cacheComponent.getObjList(Const.SELF_WAREHOUSE+personCharge+compId,WarehouseBaseInfo.class);
-        if(listRedis != null && listRedis.size() > 0 ){
+        List<WarehouseBaseInfo> listRedis = cacheComponent.getObjList(Const.SELF_WAREHOUSE + personCharge + compId, WarehouseBaseInfo.class);
+        if (listRedis != null && listRedis.size() > 0) {
             return listRedis;
         }
         Wrapper<WarehouseBaseInfo> warehouseBaseInfoWrapper = new EntityWrapper<>();
@@ -1739,7 +1736,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             }
 
         }
-        cacheComponent.putRaw(Const.SELF_WAREHOUSE+personCharge+compId,JSONObject.toJSONString(warehouseBaseInfoList),60*60*24);
+        cacheComponent.putRaw(Const.SELF_WAREHOUSE + personCharge + compId, JSONObject.toJSONString(warehouseBaseInfoList), 60 * 60 * 24);
         return warehouseBaseInfoList;
     }
 
@@ -2295,12 +2292,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 ExportVView exportVView = dataList.get(i);
                 HSSFRow rowx = sheet.createRow((int) rownum);
                 rowx.setHeightInPoints(20);
-                if(!StringUtils.isEmpty(exportVView.getWaterContent())
-                        &&!StringUtils.isEmpty(exportVView.getImpurity())
-                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
-                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
-                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
-                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                if (!StringUtils.isEmpty(exportVView.getWaterContent())
+                        && !StringUtils.isEmpty(exportVView.getImpurity())
+                        && !StringUtils.isEmpty(exportVView.getMildewGrain())
+                        && !StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        && !StringUtils.isEmpty(exportVView.getBulkDensity())
+                        && !StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     //水分累计和
                     netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
                 }
@@ -2313,7 +2310,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 jiaorenliTotal = jiaorenliTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getJiaorenli()) ? exportVView.getJiaorenli() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
 //                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeightPrice()!=null?exportVView.getNetWeightPrice():"0")));
                 netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
-                amountIngPayableTotal = amountIngPayableTotal + (exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0);
+                amountIngPayableTotal = amountIngPayableTotal + (exportVView.getAmountIngPayable() != null ? exportVView.getAmountIngPayable() : 0);
             }
         }
 
@@ -2701,21 +2698,21 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editDouble(exportVView.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(35);
-                if(exportVView.getPureWeightPrice() == null){
+                if (exportVView.getPureWeightPrice() == null) {
                     cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
-                }else {
+                } else {
                     cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice() * 1000)).toString());
                 }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(36);
-                if(exportVView.getPureWeight() == null){
+                if (exportVView.getPureWeight() == null) {
                     cell.setCellValue(editFloat(exportVView.getPureWeight()));
-                }else {
+                } else {
                     cell.setCellValue(editDouble(Double.valueOf(exportVView.getPureWeight()) / 1000));
                 }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(37);
-                cell.setCellValue(editDouble(exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0));
+                cell.setCellValue(editDouble(exportVView.getAmountIngPayable() != null ? exportVView.getAmountIngPayable() : 0));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(38);
                 cell.setCellValue(new Formatter().format("%.2f", editDouble(exportVView.getAmountEdPayable())).toString());
@@ -3171,12 +3168,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 ExportVView exportVView = dataList.get(i);
                 HSSFRow rowx = sheet.createRow((int) rownum);
                 rowx.setHeightInPoints(20);
-                if(!StringUtils.isEmpty(exportVView.getWaterContent())
-                        &&!StringUtils.isEmpty(exportVView.getImpurity())
-                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
-                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
-                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
-                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                if (!StringUtils.isEmpty(exportVView.getWaterContent())
+                        && !StringUtils.isEmpty(exportVView.getImpurity())
+                        && !StringUtils.isEmpty(exportVView.getMildewGrain())
+                        && !StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        && !StringUtils.isEmpty(exportVView.getBulkDensity())
+                        && !StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     //水分累计和
                     netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
                 }
@@ -3189,7 +3186,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 jiaorenliTotal = jiaorenliTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getJiaorenli()) ? exportVView.getJiaorenli() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
 //                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeightPrice()!=null?exportVView.getNetWeightPrice():"0")));
                 netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
-                amountIngPayableTotal = amountIngPayableTotal + (exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0);
+                amountIngPayableTotal = amountIngPayableTotal + (exportVView.getAmountIngPayable() != null ? exportVView.getAmountIngPayable() : 0);
             }
             HSSFRow rowp = sheet.createRow((int) (rownum));
             rowp.setHeightInPoints(20);
@@ -3562,21 +3559,21 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editDouble(exportVView.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(35);
-                if(exportVView.getPureWeightPrice() == null){
+                if (exportVView.getPureWeightPrice() == null) {
                     cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
-                }else {
+                } else {
                     cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice() * 1000)).toString());
                 }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(36);
-                if(exportVView.getPureWeight() == null){
+                if (exportVView.getPureWeight() == null) {
                     cell.setCellValue(editFloat(exportVView.getPureWeight()));
-                }else {
+                } else {
                     cell.setCellValue(editDouble(Double.valueOf(exportVView.getPureWeight()) / 1000));
                 }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(37);
-                cell.setCellValue(editDouble(exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0));
+                cell.setCellValue(editDouble(exportVView.getAmountIngPayable() != null ? exportVView.getAmountIngPayable() : 0));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(38);
                 cell.setCellValue(new Formatter().format("%.2f", editDouble(exportVView.getAmountEdPayable())).toString());
@@ -4043,12 +4040,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             Double netWeightTmp = 0d;//应收合计
             for (int i = 0; i < dataList.size(); i++) {
                 ExportVView exportVView = dataList.get(i);
-                if(!StringUtils.isEmpty(exportVView.getWaterContent())
-                        &&!StringUtils.isEmpty(exportVView.getImpurity())
-                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
-                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
-                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
-                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                if (!StringUtils.isEmpty(exportVView.getWaterContent())
+                        && !StringUtils.isEmpty(exportVView.getImpurity())
+                        && !StringUtils.isEmpty(exportVView.getMildewGrain())
+                        && !StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        && !StringUtils.isEmpty(exportVView.getBulkDensity())
+                        && !StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     //水分累计和
                     netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
                 }
@@ -4357,7 +4354,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(date);
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(7);
-                if(!StringUtils.isEmpty(exportVView.getContractNo())){
+                if (!StringUtils.isEmpty(exportVView.getContractNo())) {
                     cell.setCellValue(editString(exportVView.getContractNo()));
                 }
                 cell.setCellStyle(styleDetail);
@@ -4942,12 +4939,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 ExportVView exportVView = dataList.get(i);
                 HSSFRow rowx = sheet.createRow((int) rownum);
                 rowx.setHeightInPoints(20);
-                if(!StringUtils.isEmpty(exportVView.getWaterContent())
-                        &&!StringUtils.isEmpty(exportVView.getImpurity())
-                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
-                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
-                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
-                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                if (!StringUtils.isEmpty(exportVView.getWaterContent())
+                        && !StringUtils.isEmpty(exportVView.getImpurity())
+                        && !StringUtils.isEmpty(exportVView.getMildewGrain())
+                        && !StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        && !StringUtils.isEmpty(exportVView.getBulkDensity())
+                        && !StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     //水分累计和
                     netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
                 }
@@ -5415,6 +5412,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     public Integer getTemWareHouseCountByCondition(Map<String, Object> pageView) {
         return baseMapper.getTemWareHouseCountByCondition(pageView);
     }
+
     private String addDateOneDay(Date date) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
@@ -5581,8 +5579,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     }
 
     /**
-     *
      * 库点利润详情列表
+     *
      * @param warehouseBaseInfo
      * @return
      */
@@ -5612,9 +5610,15 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         return page;
     }
 
+    /**
+     * 库点利润列表
+     *
+     * @param warehouseBaseInfo
+     * @return
+     */
     @Override
     public WarehouseBaseInfo selectWarehouseChart(WarehouseBaseInfo warehouseBaseInfo) {
-        WarehouseBaseInfo warehouseBaseInfo1=new WarehouseBaseInfo();
+        WarehouseBaseInfo warehouseBaseInfo1 = new WarehouseBaseInfo();
         Map<String, Object> pageView = new HashMap<>();
         //  公司ID
         pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());

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

@@ -0,0 +1,5 @@
+<?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.DryWarehouseCarMapper">
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.DryWarehouseMapper">
+
+    <!-- 获得业务编号列表 -->
+    <select id="getListByConditions" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouse">
+        SELECT dry_number from dry_warehouse
+        WHERE comp_id = #{compId}
+        <if test="numberLetter != null and numberLetter != ''">
+            <if test="date != null and date != ''">
+                <if test="warehouseNo != null and warehouseNo != ''">
+                    AND (lower(dry_number) like lower(CONCAT('%',#{numberLetter}, + #{date}, + #{warehouseNo},'%')))
+                </if>
+            </if>
+        </if>
+        ORDER BY dry_number DESC
+    </select>
+
+
+</mapper>