bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

盘点入库，入库出库查询

This commit is contained in:
itcast 2026-01-16 15:00:08 +08:00
parent 22a3ad16ff
commit 970f65f962
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WarehousingController.java
View File

@ -8,6 +8,7 @@ import com.bonus.material.common.annotation.PreventRepeatSubmit;
import com.bonus.material.ma.domain.PutInStorageBean; import com.bonus.material.ma.domain.PutInStorageBean;
import com.bonus.material.ma.domain.SavePutInfoDto; import com.bonus.material.ma.domain.SavePutInfoDto;
import com.bonus.material.ma.domain.SupplierInfo; import com.bonus.material.ma.domain.SupplierInfo;
import com.bonus.material.ma.service.ITypeService;
import com.bonus.material.ma.service.WarehousingService; import com.bonus.material.ma.service.WarehousingService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -28,12 +29,17 @@ public class WarehousingController extends BaseController {
@Autowired @Autowired
private WarehousingService warehousingService; private WarehousingService warehousingService;
@Autowired
private ITypeService typeService;
/** /**
* 查询入库盘点列表 * 查询入库盘点列表
*/ */
@ApiOperation(value = "获取入库盘点列表") @ApiOperation(value = "获取入库盘点列表")
@GetMapping("/getList") @GetMapping("/getList")
public TableDataInfo getList(PutInStorageBean bean) { public TableDataInfo getList(PutInStorageBean bean) {
Long deptId = typeService.getUserDeptId();
bean.setCompanyId(deptId);
startPage(); startPage();
List<PutInStorageBean> list = warehousingService.getList(bean); List<PutInStorageBean> list = warehousingService.getList(bean);
return getDataTable(list); return getDataTable(list);

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PutInStorageBean.java
View File

@ -98,4 +98,6 @@ public class PutInStorageBean extends BaseEntity {
private String code; private String code;
private Integer infoId; private Integer infoId;
private Long companyId;
} }

4
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
View File

@ -279,7 +279,7 @@
AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
</if> </if>
<if test="companyId!=null"> <if test="companyId!=null">
and bs.company_id = #{companyId} and mt.company_id = #{companyId}
</if> </if>
order by bs.create_time desc order by bs.create_time desc
</select> </select>
@ -357,7 +357,7 @@
AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
</if> </if>
<if test="companyId!=null"> <if test="companyId!=null">
and bs.company_id = #{companyId} and mt.company_id = #{companyId}
</if> </if>
order by bs.create_time desc order by bs.create_time desc
</select> </select>

3
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WarehousingMapper.xml
View File

@ -22,6 +22,9 @@
left join ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = '0' left join ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = '0'
left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0' left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0'
WHERE 1=1 WHERE 1=1
<if test="companyId !=null">
and mt.company_id=#{companyId}
</if>
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
AND ( AND (
psi.code LIKE CONCAT('%',#{keyWord},'%') OR psi.code LIKE CONCAT('%',#{keyWord},'%') OR