采购付款页面增加“项目组”筛选

hx-purchase/src/main/java/com/fjhx/purchase/controller/purchase/PurchaseController.java

@@ -1,17 +1,18 @@
 package com.fjhx.purchase.controller.purchase;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseSelectDto;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseSelectDto;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.purchase.service.purchase.PurchaseService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -104,4 +105,12 @@ public class PurchaseController {
         return purchaseService.getPurchaseUserList();
     }
 
+    /**
+     * 获取已采购产品部门列表
+     */
+    @GetMapping("/getDepts")
+    public List<SysDept> getDepts() {
+        return purchaseService.getDepts();
+    }
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/dto/PurchaseSelectDto.java

@@ -76,4 +76,9 @@ public class PurchaseSelectDto extends BaseSelectDto {
      * 是否在途
      */
     private Integer isTransit;
+
+    /**
+     * 部门[项目组]id
+     */
+    private Long deptId;
 }

hx-purchase/src/main/java/com/fjhx/purchase/mapper/purchase/PurchaseMapper.java

@@ -1,11 +1,12 @@
 package com.fjhx.purchase.mapper.purchase;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
-import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
+import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -49,4 +50,9 @@ public interface PurchaseMapper extends BaseMapper<Purchase> {
      * @return
      */
     List<PurchaseDto> paidAmount(@Param("ew") QueryWrapper<Object> wrapper);
+
+    /**
+     * 获取已采购产品部门列表
+     */
+    List<SysDept> getDepts();
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/PurchaseService.java

@@ -5,6 +5,7 @@ import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
 import com.fjhx.purchase.entity.purchase.dto.PurchaseSelectDto;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.service.BaseService;
 
@@ -68,4 +69,9 @@ public interface PurchaseService extends BaseService<Purchase> {
      * 获取已采购 采购人列表
      */
     List<SysUser> getPurchaseUserList();
+
+    /**
+     * 获取已采购产品部门列表
+     */
+    List<SysDept> getDepts();
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -53,6 +53,7 @@ import com.fjhx.wms.service.stock.StockService;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -213,7 +214,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         wrapper.le("p", Purchase::getCreateTime, dto.getPurchaseEndTime());
 
         //是否在途过滤
-        if(ObjectUtil.isNotEmpty(dto.getIsTransit())) {
+        if (ObjectUtil.isNotEmpty(dto.getIsTransit())) {
             wrapper.having("(IF(sum( dg.`status` ) != count( dg.`status` ), 1, 0)) = {0}", dto.getIsTransit());
         }
 
@@ -230,6 +231,9 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
             }
         }
 
+        //部门(项目组)过滤
+        wrapper.eq("de.dept_id", dto.getDeptId());
+
         wrapper.groupBy("p.id");
         Page<PurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<PurchaseVo> list = page.getRecords();
@@ -578,4 +582,12 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         userList.forEach(item -> item.setPassword(null));
         return userList;
     }
+
+    /**
+     * 获取已采购产品部门列表
+     */
+    @Override
+    public List<SysDept> getDepts() {
+        return baseMapper.getDepts();
+    }
 }

hx-purchase/src/main/resources/mapper/purchase/PurchaseMapper.xml

@@ -2,8 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.purchase.mapper.purchase.PurchaseMapper">
     <select id="getPage" resultType="com.fjhx.purchase.entity.purchase.vo.PurchaseVo">
-        SELECT p.*,
-               IF(sum( dg.`status` ) != count( dg.`status` ), 1, 0) isTransit
+        SELECT p.id,
+               p.purchase_name,
+               p.purchase_time,
+               p.code,
+               p.supply_id,
+               p.purchase_content,
+               p.purchase_status,
+               p.arrival_status,
+               p.pay_status,
+               p.approved_date,
+               p.process_instance_id,
+               p.amount,
+               p.currency,
+               p.rate,
+               p.invoice_type,
+               p.create_user,
+               p.create_time,
+               p.update_user,
+               p.update_time,
+               p.victoriatourist_json,
+               p.flow_id,
+               p.count,
+               p.data_resource,
+               p.data_resource_id,
+               IF(sum( dg.`status` ) != count( dg.`status` ), 1, 0) isTransit,
+               de.dept_name
         FROM purchase p
                  LEFT JOIN purchase_detail pd ON pd.purchase_id = p.id
                  LEFT JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id
@@ -49,5 +73,16 @@
                 LEFT JOIN pay p ON pd.pay_id = p.id
             ${ew.customSqlSegment}
     </select>
+    <select id="getDepts" resultType="com.ruoyi.common.core.domain.entity.SysDept">
+        SELECT
+            de.dept_id,
+            de.dept_name
+        FROM
+            purchase_detail pd
+                JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id
+                JOIN bytesailing_base.sys_dept de ON json_unquote( pi.victoriatourist_json -> '$.deptId' ) = de.dept_id
+        GROUP BY
+            de.dept_id
+    </select>
 
 </mapper>

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/logistics/LogisticsInfosController.java

@@ -7,11 +7,11 @@ import com.fjhx.victoriatourist.entity.logistics.dto.LogisticsInfosSelectDto;
 import com.fjhx.victoriatourist.entity.logistics.vo.LogisticsInfosVo;
 import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**
@@ -93,4 +93,14 @@ public class LogisticsInfosController {
         logisticsInfosService.arrivalNotice(entity);
     }
 
+    /**
+     * 获取物流关联产品部门列表
+     *
+     * @return
+     */
+    @GetMapping("/getDepts")
+    public List<SysDept> getDepts() {
+        return logisticsInfosService.getDepts();
+    }
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/logistics/dto/LogisticsInfosSelectDto.java

@@ -25,4 +25,9 @@ public class LogisticsInfosSelectDto extends BaseSelectDto {
      * 完成状态过滤
      */
     private Integer status;
+
+    /**
+     * 部门[项目组]id
+     */
+    private Long deptId;
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/logistics/vo/LogisticsInfosVo.java

@@ -38,5 +38,8 @@ public class LogisticsInfosVo extends LogisticsInfos implements SetCustomizeArea
      */
     private String provinceName;
 
-
+    /**
+     * 部门名称
+     */
+    private String deptName;
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/logistics/LogisticsInfosMapper.java

@@ -1,12 +1,15 @@
 package com.fjhx.victoriatourist.mapper.logistics;
 
-import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import com.fjhx.victoriatourist.entity.logistics.vo.LogisticsInfosVo;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -23,4 +26,8 @@ public interface LogisticsInfosMapper extends BaseMapper<LogisticsInfos> {
      */
     Page<LogisticsInfosVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<LogisticsInfos> wrapper);
 
+    /**
+     * 获取物流关联产品部门列表
+     */
+    List<SysDept> getDepts();
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/logistics/LogisticsInfosService.java

@@ -6,8 +6,11 @@ import com.fjhx.victoriatourist.entity.logistics.dto.LogisticsInfosDto;
 import com.fjhx.victoriatourist.entity.logistics.dto.LogisticsInfosSelectDto;
 import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import com.fjhx.victoriatourist.entity.logistics.vo.LogisticsInfosVo;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.service.BaseService;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -59,4 +62,8 @@ public interface LogisticsInfosService extends BaseService<LogisticsInfos> {
      */
     void arrivalNotice(LogisticsInfosVo entity);
 
+    /**
+     * 获取物流关联产品部门列表
+     */
+    List<SysDept> getDepts();
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/logistics/impl/LogisticsInfosServiceImpl.java

@@ -29,6 +29,7 @@ import com.fjhx.victoriatourist.service.jd.JdBackService;
 import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
 import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
 import com.fjhx.victoriatourist.utils.LogisticsConstant;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.service.ISysRoleService;
@@ -93,6 +94,10 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
                         .like("de.ancestors", SecurityUtils.getDeptId()));
             }
         }
+
+        //部门(项目组)过滤
+        wrapper.eq("de.dept_id", dto.getDeptId());
+
         wrapper.groupBy("li.id");
 
         wrapper.orderByDesc("li", LogisticsInfos::getId);
@@ -214,6 +219,12 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
         updateById(logisticsInfo);
     }
 
-
+    /**
+     * 获取物流关联产品部门列表
+     */
+    @Override
+    public List<SysDept> getDepts() {
+        return baseMapper.getDepts();
+    }
 
 }

hx-victoriatourist/src/main/resources/mapper/logistics/LogisticsInfosMapper.xml

@@ -22,7 +22,8 @@
             li.province_id,
             li.city_id,
             li.address,
-            li.purchase_id
+            li.purchase_id,
+            de.dept_name
         from logistics_infos li
                  LEFT JOIN bytesailing_purchase.purchase p ON li.purchase_id = p.id
                  LEFT JOIN bytesailing_purchase.purchase_detail pd ON pd.purchase_id = p.id
@@ -31,5 +32,18 @@
                            ON json_unquote(pi.victoriatourist_json -> '$.deptId') = de.dept_id
             ${ew.customSqlSegment}
     </select>
+    <select id="getDepts" resultType="com.ruoyi.common.core.domain.entity.SysDept">
+        SELECT
+            de.dept_id,
+            de.dept_name
+        FROM
+            logistics_infos li
+                JOIN bytesailing_purchase.purchase p ON li.purchase_id = p.id
+                JOIN bytesailing_purchase.purchase_detail pd ON pd.purchase_id = p.id
+                JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id
+                JOIN bytesailing_base.sys_dept de ON json_unquote( pi.victoriatourist_json -> '$.deptId' ) = de.dept_id
+        GROUP BY
+            de.dept_id
+    </select>
 
 </mapper>

hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockController.java

@@ -1,16 +1,19 @@
 package com.fjhx.wms.controller.stock;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.wms.entity.stock.dto.StockDto;
 import com.fjhx.wms.entity.stock.dto.StockSelectDto;
 import com.fjhx.wms.entity.stock.po.Stock;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.wms.entity.stock.vo.StockVo;
-import com.fjhx.wms.entity.stock.dto.StockDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.wms.service.stock.StockService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**
@@ -113,5 +116,13 @@ public class StockController {
         stockService.qualifiedToDefective(stock);
     }
 
+    /**
+     * 获取库存产品部门列表
+     */
+    @GetMapping("/getDepts")
+    public List<SysDept> getDepts() {
+        return stockService.getDepts();
+    }
+
 
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockSelectDto.java

@@ -43,4 +43,9 @@ public class StockSelectDto extends BaseSelectDto {
      */
     private Integer updateTimeSort;
 
+    /**
+     * 部门[项目组]id
+     */
+    private Long deptId;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockVo.java

@@ -120,4 +120,9 @@ public class StockVo extends Stock {
      */
     private String productClassifyNames;
 
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
 }

hx-wms/src/main/java/com/fjhx/wms/mapper/stock/StockMapper.java

@@ -1,12 +1,15 @@
 package com.fjhx.wms.mapper.stock;
 
-import com.fjhx.wms.entity.stock.po.Stock;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.wms.entity.stock.po.Stock;
 import com.fjhx.wms.entity.stock.vo.StockVo;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -27,4 +30,8 @@ public interface StockMapper extends BaseMapper<Stock> {
 
     Page<StockVo> pageByProductSpu(@Param("page") Page<Object> page, @Param("ew") IWrapper<Stock> wrapper);
 
+    /**
+     * 获取库存产品部门列表
+     */
+    List<SysDept> getDepts();
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/StockService.java

@@ -8,6 +8,7 @@ import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.Stock;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.entity.stock.vo.StockVo;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
@@ -89,4 +90,5 @@ public interface StockService extends BaseService<Stock> {
      */
     void inOut(List<? extends InOutBo> list, Long warehouseId, JournalType journalType, Long businessId);
 
+    List<SysDept> getDepts();
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -33,6 +33,7 @@ import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.fjhx.wms.utils.CodeEnum;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BaseIdPo;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.service.ISysRoleService;
@@ -130,6 +131,9 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             }
         }
 
+        //部门(项目组)过滤
+        wrapper.eq("de.dept_id", dto.getDeptId());
+
         wrapper.orderByDesc("s", Stock::getId);
         Page<StockVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockVo> stockVos = page.getRecords();
@@ -290,6 +294,9 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             }
         }
 
+        //部门(项目组)过滤
+        wrapper.eq("de.dept_id", dto.getDeptId());
+
         wrapper.orderByDesc("s", Stock::getId);
         Page<StockVo> page = this.baseMapper.pageByProduct(dto.getPage(), wrapper);
         List<StockVo> stockVos = page.getRecords();
@@ -378,6 +385,9 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             }
         }
 
+        //部门(项目组)过滤
+        wrapper.eq("de.dept_id", dto.getDeptId());
+
         wrapper.orderByDesc("s", Stock::getId);
 
         Page<StockVo> page = this.baseMapper.pageByProductSpu(dto.getPage(), wrapper);
@@ -742,4 +752,12 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         stockJournalDetailsService.saveBatch(journalDetailsList);
     }
 
+    /**
+     * 获取库存产品部门列表
+     */
+    @Override
+    public List<SysDept> getDepts() {
+        return baseMapper.getDepts();
+    }
+
 }

hx-wms/src/main/resources/mapper/stock/StockMapper.xml

@@ -12,7 +12,8 @@
             s.create_time,
             s.update_user,
             s.update_time,
-            s.victoriatourist_json
+            s.victoriatourist_json,
+            de.dept_name
         FROM
             stock s
                 LEFT JOIN bytesailing_item.product_info pi ON s.product_id = pi.id
@@ -30,7 +31,8 @@
             s.update_user,
             s.update_time,
             sum(json_unquote( s.victoriatourist_json -> '$.frozenQuantity' )) frozenQuantity,
-            sum(json_unquote( s.victoriatourist_json -> '$.defectiveQuantity' )) defectiveQuantity
+            sum(json_unquote( s.victoriatourist_json -> '$.defectiveQuantity' )) defectiveQuantity,
+            de.dept_name
         FROM
             stock s
                 LEFT JOIN bytesailing_item.product_info pi ON s.product_id = pi.id
@@ -44,7 +46,8 @@
             ps.`code` productSpuCode,
             ps.`name` productSpuName,
             sum( s.quantity ) quantity,
-            pi.victoriatourist_json
+            pi.victoriatourist_json,
+            de.dept_name
         FROM
             stock s
                 LEFT JOIN bytesailing_item.product_info pi ON s.product_id = pi.id
@@ -52,5 +55,16 @@
                 LEFT JOIN bytesailing_base.sys_dept de ON json_unquote( pi.victoriatourist_json -> '$.deptId' ) = de.dept_id
             ${ew.customSqlSegment}
     </select>
+    <select id="getDepts" resultType="com.ruoyi.common.core.domain.entity.SysDept">
+        SELECT
+            de.dept_id,
+            de.dept_name
+        FROM
+            stock s
+                JOIN bytesailing_item.product_info pi ON s.product_id = pi.id
+                JOIN bytesailing_base.sys_dept de ON json_unquote( pi.victoriatourist_json -> '$.deptId' ) = de.dept_id
+        GROUP BY
+            de.dept_id
+    </select>
 
 </mapper>