diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 2ef9da5..50767c7 100644 --- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -13,7 +13,6 @@ import com.ruoyi.common.k3cloud.service.K3Service; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; 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.mapper.SysDeptMapper; import com.ruoyi.system.role.mapper.SysRoleMapper; @@ -63,7 +62,7 @@ public class SysDeptServiceImpl implements ISysDeptService @Override public List selectDeptTreeList(SysDeptQuery query) { - List depts = SpringUtils.getAopProxy(this).selectDeptList(query); + List depts = this.selectDeptList(query); return buildDeptTreeSelect(depts); } @@ -201,7 +200,7 @@ public class SysDeptServiceImpl implements ISysDeptService { SysDeptQuery dept = new SysDeptQuery(); dept.setDeptId(deptId); - List depts = SpringUtils.getAopProxy(this).selectDeptList(dept); + List depts = this.selectDeptList(dept); if (StringUtils.isEmpty(depts)) { throw new ServiceException("没有权限访问部门数据!"); diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/domain/ReportOrderProdVO.java b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/domain/ReportOrderProdVO.java index 79b9368..227de43 100644 --- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/domain/ReportOrderProdVO.java +++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/domain/ReportOrderProdVO.java @@ -41,6 +41,9 @@ public class ReportOrderProdVO extends ReportOrderProd { @ApiModelProperty("订单未入库数量") private BigDecimal orderErpNoStockInQty; + @ApiModelProperty("订单物料编码") + private String orderMaterialNumber; + @ApiModelProperty("订单ERP状态") private String orderErpStatus; diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/mapper/ReportOrderProdMapper.xml b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/mapper/ReportOrderProdMapper.xml index ba08bde..2ffc540 100644 --- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/mapper/ReportOrderProdMapper.xml +++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/mapper/ReportOrderProdMapper.xml @@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bpo.verified_base_num as verified_base_num, bpo.dept_id as order_dept_id, bpo.erp_status as order_erp_status, + bpo.material_number as order_material_number, bu.erp_name as unit_name, bu_b.erp_name as base_unit_name, br.report_date as report_date,