diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/RepairTransdetailController.java b/src/main/java/com/xujie/sys/modules/pms/controller/RepairTransdetailController.java index a6442280..ef236faf 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/RepairTransdetailController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/RepairTransdetailController.java @@ -2,6 +2,7 @@ package com.xujie.sys.modules.pms.controller; import com.xujie.sys.common.utils.PageUtils; import com.xujie.sys.common.utils.R; +import com.xujie.sys.modules.pms.data.EamAdminData; import com.xujie.sys.modules.pms.entity.RepairTransdetailEntity; import com.xujie.sys.modules.pms.entity.RepairTransdetailVoData; import com.xujie.sys.modules.pms.entity.vo.RepairTransdetailVo; @@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Arrays; +import java.util.List; /** * ${comments} @@ -32,6 +34,14 @@ public class RepairTransdetailController { PageUtils page = repairTransdetailService.queryPage(params); return R.ok().put("page", page); } + /** + * 查询 查看出入库记录 单价栏位角色 用户列表 + */ + @PostMapping("/getaveragePriceFlagList") + public R getaveragePriceFlagList(){ + List list = repairTransdetailService.getaveragePriceFlagList(); + return R.ok().put("rows", list); + } /** diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/RepairTransdetailVoData.java b/src/main/java/com/xujie/sys/modules/pms/entity/RepairTransdetailVoData.java index bb01d91c..be10e8ba 100644 --- a/src/main/java/com/xujie/sys/modules/pms/entity/RepairTransdetailVoData.java +++ b/src/main/java/com/xujie/sys/modules/pms/entity/RepairTransdetailVoData.java @@ -3,8 +3,11 @@ package com.xujie.sys.modules.pms.entity; import com.xujie.sys.modules.pms.entity.vo.RepairTransdetailVo; import lombok.Data; +import java.math.BigDecimal; + @Data public class RepairTransdetailVoData extends RepairTransdetailVo { private String username; private String buDesc; + private BigDecimal averagePrice; } diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/RepairTransdetailMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/RepairTransdetailMapper.java index 31f00d8b..6b529949 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/RepairTransdetailMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/RepairTransdetailMapper.java @@ -3,12 +3,15 @@ package com.xujie.sys.modules.pms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.sys.modules.pms.data.EamAdminData; import com.xujie.sys.modules.pms.entity.RepairTransdetailEntity; import com.xujie.sys.modules.pms.entity.RepairTransdetailVoData; import com.xujie.sys.modules.pms.entity.vo.RepairTransdetailVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 出入库明细 * @@ -28,4 +31,5 @@ public interface RepairTransdetailMapper extends BaseMapper queryPage(Page objectPage,@Param("query") RepairTransdetailVoData params); + List getaveragePriceFlagList(); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/RepairTransdetailServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/RepairTransdetailServiceImpl.java index 2a533ea8..477e3fa2 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/RepairTransdetailServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/RepairTransdetailServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xujie.sys.common.utils.PageUtils; +import com.xujie.sys.modules.pms.data.EamAdminData; import com.xujie.sys.modules.pms.entity.RepairTransdetailEntity; import com.xujie.sys.modules.pms.entity.RepairTransdetailVoData; import com.xujie.sys.modules.pms.entity.vo.RepairTransdetailVo; @@ -11,6 +12,9 @@ import com.xujie.sys.modules.pms.mapper.RepairTransdetailMapper; import com.xujie.sys.modules.pms.service.RepairTransdetailService; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + @Service("repairTransdetailService") public class RepairTransdetailServiceImpl extends ServiceImpl implements RepairTransdetailService { @@ -21,4 +25,9 @@ public class RepairTransdetailServiceImpl extends ServiceImpl getaveragePriceFlagList() { + return this.baseMapper.getaveragePriceFlagList(); + } + } \ No newline at end of file diff --git a/src/main/java/com/xujie/sys/modules/pms/service/RepairTransdetailService.java b/src/main/java/com/xujie/sys/modules/pms/service/RepairTransdetailService.java index d1b502d8..4dfb288a 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/RepairTransdetailService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/RepairTransdetailService.java @@ -2,10 +2,13 @@ package com.xujie.sys.modules.pms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.xujie.sys.common.utils.PageUtils; +import com.xujie.sys.modules.pms.data.EamAdminData; import com.xujie.sys.modules.pms.entity.RepairTransdetailEntity; import com.xujie.sys.modules.pms.entity.RepairTransdetailVoData; import com.xujie.sys.modules.pms.entity.vo.RepairTransdetailVo; +import java.util.List; + /** * ${comments} @@ -17,5 +20,7 @@ import com.xujie.sys.modules.pms.entity.vo.RepairTransdetailVo; public interface RepairTransdetailService extends IService { PageUtils queryPage(RepairTransdetailVoData params); + + List getaveragePriceFlagList(); } diff --git a/src/main/resources/mapper/pms/RepairTransdetailMapper.xml b/src/main/resources/mapper/pms/RepairTransdetailMapper.xml index b9b7bd46..86157c82 100644 --- a/src/main/resources/mapper/pms/RepairTransdetailMapper.xml +++ b/src/main/resources/mapper/pms/RepairTransdetailMapper.xml @@ -19,6 +19,7 @@ B.id, C.spec, C.part_description, + C.average_price, A.remark, A.PartnerID as supplier_id, vcmv.supplier_name, @@ -69,6 +70,12 @@ order By A.TransNo, B.ItemNo, A.TransDate desc + \ No newline at end of file