chuangte/yh-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

临时提交

Browse Source
This commit is contained in:
磷叶 2025-02-15 18:03:28 +08:00
parent b22a0d8c86
commit 2ea21e2c6f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -13,7 +13,6 @@ import com.ruoyi.common.k3cloud.service.K3Service;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.dto.SysDeptQuery; import com.ruoyi.system.domain.dto.SysDeptQuery;
import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.role.mapper.SysRoleMapper; import com.ruoyi.system.role.mapper.SysRoleMapper;
@ -63,7 +62,7 @@ public class SysDeptServiceImpl implements ISysDeptService
@Override @Override
public List<TreeSelect> selectDeptTreeList(SysDeptQuery query) public List<TreeSelect> selectDeptTreeList(SysDeptQuery query)
{ {
List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(query); List<SysDept> depts = this.selectDeptList(query);
return buildDeptTreeSelect(depts); return buildDeptTreeSelect(depts);
} }
@ -201,7 +200,7 @@ public class SysDeptServiceImpl implements ISysDeptService
{ {
SysDeptQuery dept = new SysDeptQuery(); SysDeptQuery dept = new SysDeptQuery();
dept.setDeptId(deptId); dept.setDeptId(deptId);
List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept); List<SysDept> depts = this.selectDeptList(dept);
if (StringUtils.isEmpty(depts)) if (StringUtils.isEmpty(depts))
{ {
throw new ServiceException("没有权限访问部门数据！"); throw new ServiceException("没有权限访问部门数据！");

3
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/domain/ReportOrderProdVO.java
View File

@ -41,6 +41,9 @@ public class ReportOrderProdVO extends ReportOrderProd {
@ApiModelProperty("订单未入库数量") @ApiModelProperty("订单未入库数量")
private BigDecimal orderErpNoStockInQty; private BigDecimal orderErpNoStockInQty;
@ApiModelProperty("订单物料编码")
private String orderMaterialNumber;
@ApiModelProperty("订单ERP状态") @ApiModelProperty("订单ERP状态")
private String orderErpStatus; private String orderErpStatus;

1
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/mapper/ReportOrderProdMapper.xml
View File

@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bpo.verified_base_num as verified_base_num, bpo.verified_base_num as verified_base_num,
bpo.dept_id as order_dept_id, bpo.dept_id as order_dept_id,
bpo.erp_status as order_erp_status, bpo.erp_status as order_erp_status,
bpo.material_number as order_material_number,
bu.erp_name as unit_name, bu.erp_name as unit_name,
bu_b.erp_name as base_unit_name, bu_b.erp_name as base_unit_name,
br.report_date as report_date, br.report_date as report_date,