物资管理-入库

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/controller/MaterialController.java

@@ -1,16 +1,13 @@
-package com.jeeplus.test.materialManagement.controller;
+package com.jeeplus.test.materialManagement.purchase.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.common.utils.ResponseUtil;
-import com.jeeplus.sys.constant.enums.LogTypeEnum;
-import com.jeeplus.test.materialManagement.service.MaterialService;
-import com.jeeplus.test.materialManagement.service.dto.MaterialInfoDto;
+import com.jeeplus.test.materialManagement.purchase.service.MaterialService;
+import com.jeeplus.test.materialManagement.purchase.service.dto.MaterialInfoDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/domain/MaterialBasic.java

@@ -1,4 +1,4 @@
-package com.jeeplus.test.materialManagement.domain;
+package com.jeeplus.test.materialManagement.purchase.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/domain/MaterialDetailed.java

@@ -1,9 +1,8 @@
-package com.jeeplus.test.materialManagement.domain;
+package com.jeeplus.test.materialManagement.purchase.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
-import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import lombok.Data;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/mapper/MaterialBasicMapper.java

@@ -1,12 +1,12 @@
-package com.jeeplus.test.materialManagement.mapper;
+package com.jeeplus.test.materialManagement.purchase.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.test.materialManagement.domain.MaterialBasic;
-import com.jeeplus.test.materialManagement.service.dto.MaterialInfoDto;
+import com.jeeplus.test.materialManagement.purchase.domain.MaterialBasic;
+import com.jeeplus.test.materialManagement.purchase.service.dto.MaterialInfoDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/mapper/MaterialDetailedMapper.java

@@ -1,8 +1,7 @@
-package com.jeeplus.test.materialManagement.mapper;
+package com.jeeplus.test.materialManagement.purchase.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jeeplus.test.materialManagement.domain.MaterialDetailed;
-import com.jeeplus.test.oss.domain.WorkAttachment;
+import com.jeeplus.test.materialManagement.purchase.domain.MaterialDetailed;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 
 import java.util.List;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/mapper/xml/MaterialBasicMapper.xml

@@ -1,11 +1,11 @@
 <?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.jeeplus.test.materialManagement.mapper.MaterialBasicMapper">
+<mapper namespace="com.jeeplus.test.materialManagement.purchase.mapper.MaterialBasicMapper">
     <update id="updateStatusById">
 		UPDATE material_management_pruchase_request_basics SET status = #{type}
 		WHERE id = #{id}
 	</update>
-    <select id="findList" resultType="com.jeeplus.test.materialManagement.service.dto.MaterialInfoDto">
+    <select id="findList" resultType="com.jeeplus.test.materialManagement.purchase.service.dto.MaterialInfoDto">
         SELECT
         	DISTINCT
 			a.id,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/mapper/xml/MaterialDetailedMapper.xml

@@ -1,7 +1,7 @@
 <?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.jeeplus.test.materialManagement.mapper.MaterialDetailedMapper">
-    <select id="getByBasicId" resultType="com.jeeplus.test.materialManagement.domain.MaterialDetailed">
+<mapper namespace="com.jeeplus.test.materialManagement.purchase.mapper.MaterialDetailedMapper">
+    <select id="getByBasicId" resultType="com.jeeplus.test.materialManagement.purchase.domain.MaterialDetailed">
         select * from material_management_pruchase_request_detailed where basic_id = #{basicId} and del_flag = '0'
     </select>
     <select id="getByAttachmentId" resultType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/service/MaterialService.java

@@ -1,31 +1,28 @@
-package com.jeeplus.test.materialManagement.service;
+package com.jeeplus.test.materialManagement.purchase.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.google.common.collect.Lists;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.cw.contractRegistration.service.ContractInfoService;
-import com.jeeplus.test.materialManagement.domain.MaterialBasic;
-import com.jeeplus.test.materialManagement.domain.MaterialDetailed;
-import com.jeeplus.test.materialManagement.mapper.MaterialBasicMapper;
-import com.jeeplus.test.materialManagement.mapper.MaterialDetailedMapper;
-import com.jeeplus.test.materialManagement.service.dto.MaterialInfoDto;
+import com.jeeplus.test.materialManagement.purchase.domain.MaterialBasic;
+import com.jeeplus.test.materialManagement.purchase.domain.MaterialDetailed;
+import com.jeeplus.test.materialManagement.purchase.mapper.MaterialBasicMapper;
+import com.jeeplus.test.materialManagement.purchase.mapper.MaterialDetailedMapper;
+import com.jeeplus.test.materialManagement.purchase.service.dto.MaterialInfoDto;
 import com.jeeplus.test.mould.service.SerialnumTplService;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.oss.mapper.OssServiceMapper;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import org.springframework.beans.BeanUtils;
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/service/dto/MaterialInfoDto.java

@@ -1,8 +1,8 @@
-package com.jeeplus.test.materialManagement.service.dto;
+package com.jeeplus.test.materialManagement.purchase.service.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jeeplus.test.materialManagement.domain.MaterialDetailed;
+import com.jeeplus.test.materialManagement.purchase.domain.MaterialDetailed;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import lombok.Data;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/controller/WareHouseController.java

@@ -0,0 +1,59 @@
+package com.jeeplus.test.materialManagement.wareHouse.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.test.materialManagement.purchase.domain.MaterialDetailed;
+import com.jeeplus.test.materialManagement.purchase.service.MaterialService;
+import com.jeeplus.test.materialManagement.purchase.service.dto.MaterialInfoDto;
+import com.jeeplus.test.materialManagement.wareHouse.service.WareHouseBasicService;
+import com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author: 王强
+ * @create: 2022-12-29 14:13
+ **/
+@RestController
+@Api(tags ="物资管理-入库")
+@RequestMapping(value = "/material/management/wareHouse")
+public class WareHouseController {
+
+    @Resource
+    private MaterialService service;
+
+    @Resource
+    private WareHouseBasicService basicService;
+
+    /**
+     * 采购编号列表查询
+     * @param dto
+     * @return
+     */
+    @ApiOperation(value = "采购编号列表查询")
+    @GetMapping("/list")
+    public ResponseEntity<IPage<MaterialInfoDto>> list(Page<MaterialInfoDto> page, MaterialInfoDto dto) throws Exception{
+        IPage<MaterialInfoDto> iPage = service.list(page, dto);
+        return ResponseEntity.ok(iPage);
+    }
+
+    /**
+     * 入库列表查询
+     * @param dto
+     * @return
+     */
+    @ApiOperation(value = "入库列表查询")
+    @GetMapping("/wareHouseList")
+    public ResponseEntity<IPage<WareHouseDto>> wareHouseList(Page<WareHouseDto> page, WareHouseDto dto) throws Exception{
+        IPage<WareHouseDto> iPage = basicService.list(page, dto);
+        return ResponseEntity.ok(iPage);
+    }
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/domain/WareHouseBasic.java

@@ -0,0 +1,60 @@
+package com.jeeplus.test.materialManagement.wareHouse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.test.materialManagement.purchase.domain.MaterialDetailed;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 物资管理-入库基础表
+ * @author: 王强
+ * @create: 2022-12-29 15:37
+ **/
+@Data
+@TableName("material_management_warehouse_basics")
+public class WareHouseBasic extends BaseEntity {
+    //入库编号（字典值）
+    public static final String BIZ_CODE = "28";
+
+    /**
+     * 入库编号
+     */
+    private String wareHouseNumber;
+
+    /**
+     * 入库名称
+     */
+    private String wareHouseName;
+
+    /**
+     * 入库时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date wareHouseDare;
+
+    /**
+     * 采购编号
+     */
+    private String purchaseNo;
+
+    /**
+     * 入库明细数据
+     */
+    @TableField(exist = false)
+    List<WareHouseDetailed> detailInfos;
+
+    /**
+     * 经办人
+     */
+    private String handledBy;
+
+    /**
+     * 经办人部门
+     */
+    private String handledByOffice;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/domain/WareHouseDetailed.java

@@ -0,0 +1,60 @@
+package com.jeeplus.test.materialManagement.wareHouse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 入库明细表
+ * @author: 王强
+ * @create: 2022-12-29 15:53
+ **/
+@Data
+@TableName("material_management_warehouse_detailed")
+public class WareHouseDetailed extends BaseEntity {
+
+    /**
+     * 入库基础表id
+     */
+    private String basicId;
+
+    /**
+     * 入库人
+     */
+    private String wareHouseMan;
+
+    /**
+     * 入库人部门
+     */
+    private String wareHouseManOffice;
+
+    /**
+     * 入库类型
+     */
+    private String wareHouseType;
+
+    /**
+     * 商品名称
+     */
+    private String tradeName;
+
+    /**
+     * 商品单价
+     */
+    private String tradePrice;
+
+    /**
+     * 商品数量
+     */
+    private String tradeNumber;
+
+    /**
+     * 单位
+     */
+    private String company;
+
+    /**
+     * 商品总价
+     */
+    private String tradeTotalPrice;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/domain/WareHouseSummary.java

@@ -0,0 +1,35 @@
+package com.jeeplus.test.materialManagement.wareHouse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 物资管理-入库汇总表
+ * @author: 王强
+ * @create: 2022-12-29 16:33
+ **/
+@Data
+@TableName("material_management_warehouse_summary")
+public class WareHouseSummary extends BaseEntity {
+
+    /**
+     * 入库基础表id
+     */
+    private String basicId;
+
+    /**
+     * 入库类型
+     */
+    private String wareHouseType;
+
+    /**
+     * 商品名称
+     */
+    private String tradeName;
+
+    /**
+     * 商品数量
+     */
+    private String tradeNumber;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/WareHouseBasicMapper.java

@@ -0,0 +1,20 @@
+package com.jeeplus.test.materialManagement.wareHouse.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.test.materialManagement.wareHouse.domain.WareHouseBasic;
+import com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author: 王强
+ * @create: 2022-12-29 16:39
+ **/
+public interface WareHouseBasicMapper extends BaseMapper<WareHouseBasic> {
+
+    IPage<WareHouseDto> findList(Page<WareHouseDto> page,@Param(Constants.WRAPPER) QueryWrapper<WareHouseDto> queryWrapper);
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.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.jeeplus.test.materialManagement.wareHouse.mapper.WareHouseBasicMapper">
+    <select id="findList" resultType="com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto">
+		SELECT
+			a.id,
+			a.create_by,
+			a.create_date,
+			a.ware_house_number,
+			a.ware_house_name,
+			a.ware_house_date,
+			a.handled_by,
+			a.handled_by_office,
+			so.name as handledByOfficeName
+		FROM
+			material_management_warehouse_basics a
+			left join sys_office so on a.handled_by_office = so.id
+			${ew.customSqlSegment}
+		ORDER BY a.update_date DESC
+    </select>
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -0,0 +1,54 @@
+package com.jeeplus.test.materialManagement.wareHouse.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.materialManagement.wareHouse.mapper.WareHouseBasicMapper;
+import com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @author: 王强
+ * @create: 2022-12-29 14:19
+ **/
+@Service
+@Transactional
+public class WareHouseBasicService {
+
+    @Resource
+    private WareHouseBasicMapper basicMapper;
+
+    /**
+     * 列表查询
+     */
+    public IPage<WareHouseDto> list(Page<WareHouseDto> page , WareHouseDto dto) throws Exception{
+        QueryWrapper<WareHouseDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, WareHouseDto.class);
+
+        queryWrapper.eq("a.del_flag", "0");
+        if (StringUtils.isNotEmpty(dto.getWareHouseNumber())) {
+            queryWrapper.like("a.ware_house_number", dto.getWareHouseNumber());
+        }
+        if (StringUtils.isNotEmpty(dto.getWareHouseName())) {
+            queryWrapper.like("a.ware_house_name", dto.getWareHouseName());
+        }
+        if (StringUtils.isNotEmpty(dto.getHandledBy())) {
+            queryWrapper.like("a.handled_by", dto.getHandledBy());
+        }
+        if (StringUtils.isNotEmpty(dto.getHandledByOffice())) {
+            queryWrapper.like("a.handled_by_office", dto.getHandledByOffice());
+        }
+        // 入库时间
+        String[] contractDates = dto.getWareHouseDates();
+        if (contractDates != null) {
+
+            queryWrapper.between("a.ware_house_date", contractDates[0], contractDates[1]);
+        }
+
+        return basicMapper.findList(page, queryWrapper);
+    }
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/dto/WareHouseDto.java

@@ -0,0 +1,105 @@
+package com.jeeplus.test.materialManagement.wareHouse.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.test.materialManagement.wareHouse.domain.WareHouseDetailed;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author: 王强
+ * @create: 2022-12-29 16:37
+ **/
+@Data
+public class WareHouseDto {
+
+    /**
+     * 入库基础表id
+     */
+    private String basicId;
+
+    /**
+     * 入库人
+     */
+    private String wareHouseMan;
+
+    /**
+     * 入库人部门
+     */
+    private String wareHouseManOffice;
+
+    /**
+     * 入库类型
+     */
+    private String wareHouseType;
+
+    /**
+     * 商品名称
+     */
+    private String tradeName;
+
+    /**
+     * 商品单价
+     */
+    private String tradePrice;
+
+    /**
+     * 商品数量
+     */
+    private String tradeNumber;
+
+    /**
+     * 单位
+     */
+    private String company;
+
+    /**
+     * 商品总价
+     */
+    private String tradeTotalPrice;
+
+    /**
+     * 入库编号
+     */
+    private String wareHouseNumber;
+
+    /**
+     * 入库名称
+     */
+    private String wareHouseName;
+
+    /**
+     * 入库时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date wareHouseDare;
+
+    /**
+     * 采购编号
+     */
+    private String purchaseNo;
+
+    /**
+     * 入库明细数据
+     */
+    @TableField(exist = false)
+    List<WareHouseDetailed> detailInfos;
+
+    /**
+     * 经办人
+     */
+    private String handledBy;
+
+    /**
+     * 经办人部门
+     */
+    private String handledByOffice;
+
+    /**
+     * 入库时间
+     */
+    @TableField(exist = false)
+    private String[] wareHouseDates;
+}