server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java
@@ -18,21 +18,22 @@ */ public class ProcedurePlansPageModel { @ApiModelProperty(value = "工序名称", example = "1") private String procedureName; @ApiModelProperty(value = "工序编码", example = "1") private Integer procedureId; @ApiModelProperty(value = "不良品率", example = "1") private BigDecimal unqualifiedRate; @ApiModelProperty(value = "不良品数", example = "1") private BigDecimal unqualifiedNum; @ApiModelProperty(value = "良品数", example = "1") private BigDecimal qualifiedNum; @ApiModelProperty(value = "未完工数量", example = "1") private BigDecimal undoneNum; @ApiModelProperty(value = "计划生产数量", example = "1") @ApiModelProperty(value = "计划数量", example = "1") private BigDecimal num; @ApiModelProperty(value = "计划个数", example = "1") private Integer planCount; @ApiModelProperty(value = "不良品率%", example = "1") private BigDecimal unqualifiedRate; @ApiModelProperty(value = "物料编码") private String materialCode; @ApiModelProperty(value = "工序名称") private String procedureName; @ApiModelProperty(value = "状态 0已生成、1已发布、2已撤回、3已取消、4已分配、5已暂停、6已完工、7已入库、8已关闭", example = "1") private Integer status; } server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java
@@ -15,22 +15,21 @@ * 最后一列的良品数/完工数：为当前产品最后一道工序的良品数/完工数； */ public class ProcedureProcessModel { @ApiModelProperty(value = "工序名称", example = "1") private String procedureName; @ApiModelProperty(value = "工序编码", example = "1") private Integer procedureId; @ApiModelProperty(value = "不良品率", example = "1") private BigDecimal unqualifiedRate; @ApiModelProperty(value = "不良品数", example = "1") private BigDecimal unqualifiedNum; @ApiModelProperty(value = "良品数", example = "1") private BigDecimal qualifiedNum; @ApiModelProperty(value = "未完工数量", example = "1") private BigDecimal undoneNum; @ApiModelProperty(value = "计划数量", example = "1") @ApiModelProperty(value = "计划生产数量", example = "1") private BigDecimal num; @ApiModelProperty(value = "不良品率%", example = "1") private BigDecimal unqualifiedRate; @ApiModelProperty(value = "物料编码") private String materialCode; @ApiModelProperty(value = "工序名称") private String procedureName; @ApiModelProperty(value = "状态 0已生成、1已发布、2已撤回、3已取消、4已分配、5已暂停、6已完工、7已入库、8已关闭", example = "1") private Integer status; @ApiModelProperty(value = "计划个数", example = "1") private Integer planCount; } server/src/main/java/doumeemes/service/ext/DeviceCheckExtService.java
@@ -5,7 +5,6 @@ import doumeemes.dao.business.model.DeviceCheck; import doumeemes.dao.ext.vo.DeviceCheckExtListVO; import doumeemes.dao.ext.dto.QueryDeviceCheckExtDTO; import io.lettuce.core.dynamic.annotation.Param; /** * 设备巡检信息表 EXTService定义 @@ -22,4 +21,6 @@ PageData<DeviceCheckExtListVO> findPage(PageWrap<QueryDeviceCheckExtDTO> pageWrap); DeviceCheck selectOneById(Integer id); PageData<DeviceCheckExtListVO> getDeviceCheckPage( PageWrap<QueryDeviceCheckExtDTO> pageWrap); } server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java
@@ -17,7 +17,6 @@ import doumeemes.dao.ext.DeviceCheckExtMapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.lettuce.core.dynamic.annotation.Param; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -63,6 +62,12 @@ List<DeviceCheckExtListVO> result = deviceCheckExtMapper.selectList(pageWrap.getModel()); return PageData.from(new PageInfo<>(result)); } @Override public PageData<DeviceCheckExtListVO> getDeviceCheckPage (PageWrap<QueryDeviceCheckExtDTO> pageWrap) { PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity()); List<DeviceCheckExtListVO> result = deviceCheckExtMapper.selectList(pageWrap.getModel()); return PageData.from(new PageInfo<>(result)); } @Override public DeviceCheck selectOneById(Integer id){ server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
@@ -223,8 +223,7 @@ //只能查看当前根组织的数据 pageWrap.getModel().setRootDepartId(department.getRootId()); pageWrap.getModel().setComDepartId(departId); PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity()); return deviceCheckExtService.findPage(pageWrap); return deviceCheckExtService.getDeviceCheckPage(pageWrap); } @Override public List<ProcedurePlansPageModel> getProcedurePlansPage(Integer companyId, Integer departId,Integer procedureId){ server/src/main/resources/mappers/DeviceCheckExtMapper.xml
@@ -33,7 +33,7 @@ left join device d on `deviceCheck`.DEVICE_ID = d.id left join procedures p on p.id = d.PROCEDURE_ID left join `system_user` s on s.id = `deviceCheck`.CREATE_USER <where> <where> deviceCheck.deleted=0 <if test="deviceName != null and deviceName != ''"> AND d.NAME like concat('%',#{deviceName},'%') </if>
