Merge branch 'master' of https://gitee.com/wen-gitee/scada-visual-board
commit
f33346bb9d
@ -0,0 +1,33 @@
|
||||
package com.productionboard.entity.MesProduction;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 小时产量
|
||||
* @author WenJY
|
||||
* @date 2022年06月09日 16:43
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
@TableName("SCADA_PRODUCTION_B")
|
||||
public class MesHourProdutionStatistics implements Serializable {
|
||||
|
||||
/** 小时数 */
|
||||
@TableField("hournumber")
|
||||
private String xValue;
|
||||
|
||||
/** 产量数 */
|
||||
@TableField("productionamount")
|
||||
private String yValue;
|
||||
|
||||
/** 工位编号 */
|
||||
@TableField("POSIONID")
|
||||
private String locationNumber;
|
||||
}
|
@ -0,0 +1,33 @@
|
||||
package com.productionboard.entity.MesProduction;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* MES物料产量统计
|
||||
* @author WenJY
|
||||
* @date 2022年06月09日 17:01
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
@TableName("SCADA_PRODUCTION_C")
|
||||
public class MesMaterialProductionStatistics implements Serializable {
|
||||
|
||||
/** 物料名称 */
|
||||
@TableField("materialname")
|
||||
private String xValue;
|
||||
|
||||
/** 产量数 */
|
||||
@TableField("productionamount")
|
||||
private String yValue;
|
||||
|
||||
/** 工位编号 */
|
||||
@TableField("POSIONID")
|
||||
private String locationNumber;
|
||||
}
|
@ -0,0 +1,38 @@
|
||||
package com.productionboard.entity.MesProduction;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 库存统计
|
||||
* @author WenJY
|
||||
* @date 2022年06月09日 17:10
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
@TableName("SCADA_PRODUCTION_E")
|
||||
public class MesMaterialStoreStatistics implements Serializable {
|
||||
|
||||
/** 物料名称 */
|
||||
@TableField("MATERIALNAME")
|
||||
private String materialName;
|
||||
|
||||
/** 内胆库库存 */
|
||||
@TableField("LINERSTOREAMOUNT")
|
||||
private String lineStoreAmount;
|
||||
|
||||
/** 箱壳库库存 */
|
||||
@TableField("HULLSTOREAMOUNT")
|
||||
private String hullStoreAmount;
|
||||
|
||||
/** 工位编号 */
|
||||
@TableField("POSIONID")
|
||||
private String locationNumber;
|
||||
|
||||
}
|
@ -0,0 +1,40 @@
|
||||
package com.productionboard.entity.MesProduction;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author WenJY
|
||||
* @date 2022年06月09日 16:24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
@TableName("SCADA_PRODUCTION_A")
|
||||
public class MesTeamStatistics implements Serializable {
|
||||
|
||||
/** 班组名称 */
|
||||
@TableField("CLASSNAME")
|
||||
private String className;
|
||||
|
||||
/** 计划数量 */
|
||||
@TableField("PLANAMOUNT")
|
||||
private String planAmount;
|
||||
|
||||
/** 实际数量 */
|
||||
@TableField("ACTUALAMOUNT")
|
||||
private String actualAmount;
|
||||
|
||||
/** 差异值 */
|
||||
@TableField("DIFFERENCEAMOUNT")
|
||||
private String differenceAmount;
|
||||
|
||||
/** 工位编号 */
|
||||
@TableField("POSIONID")
|
||||
private String locationNumber;
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package com.productionboard.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.productionboard.entity.MesProduction.MesHourProdutionStatistics;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @author WenJY
|
||||
* @date 2022年06月09日 16:45
|
||||
*/
|
||||
@Mapper
|
||||
public interface MesHourProdutionStatisticsMapper extends BaseMapper<MesHourProdutionStatistics> {
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package com.productionboard.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.productionboard.entity.MesProduction.MesMaterialProductionStatistics;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @author WenJY
|
||||
* @date 2022年06月09日 17:02
|
||||
*/
|
||||
@Mapper
|
||||
public interface MesMaterialProductionStatisticsMapper extends BaseMapper<MesMaterialProductionStatistics> {
|
||||
}
|
@ -0,0 +1,14 @@
|
||||
package com.productionboard.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* MES物料库存统计
|
||||
* @author WenJY
|
||||
* @date 2022年06月09日 17:14
|
||||
*/
|
||||
@Mapper
|
||||
public interface MesMaterialStoreStatisticsMapper extends BaseMapper<MesMaterialStoreStatistics>{
|
||||
}
|
@ -0,0 +1,14 @@
|
||||
package com.productionboard.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.productionboard.entity.MesProduction.MesTeamStatistics;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* Mes班组生产统计
|
||||
* @author WenJY
|
||||
* @date 2022年06月09日 16:26
|
||||
*/
|
||||
@Mapper
|
||||
public interface MesTeamStatisticsMapper extends BaseMapper<MesTeamStatistics> {
|
||||
}
|
@ -0,0 +1,53 @@
|
||||
package com.productionboard.service;
|
||||
|
||||
import com.productionboard.entity.MesProduction.MesHourProdutionStatistics;
|
||||
import com.productionboard.entity.MesProduction.MesMaterialProductionStatistics;
|
||||
import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics;
|
||||
import com.productionboard.entity.MesProduction.MesTeamStatistics;
|
||||
import com.productionboard.mapper.MesHourProdutionStatisticsMapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Mes生产数据接口
|
||||
* @author WenJY
|
||||
* @date 2022年06月09日 16:27
|
||||
*/
|
||||
public interface IMesProductionDataService {
|
||||
|
||||
/**
|
||||
* 通过工位号获取班组计划信息
|
||||
* @author WenJY
|
||||
* @date 2022-06-09 16:33
|
||||
* @param locationNumber
|
||||
* @return java.util.List<com.productionboard.entity.MesProduction.MesTeamStatistics>
|
||||
*/
|
||||
List<MesTeamStatistics> getMesTeamStatisticsList(String locationNumber);
|
||||
|
||||
/**
|
||||
* 通过工位号获取MES小时产量
|
||||
* @author WenJY
|
||||
* @date 2022-06-09 16:46
|
||||
* @param locationNumber
|
||||
* @return java.util.List<com.productionboard.entity.MesProduction.MesHourProdutionStatistics>
|
||||
*/
|
||||
List<MesHourProdutionStatistics> getMesHourProdutionStatisticsList(String locationNumber);
|
||||
|
||||
/**
|
||||
* 通过工位号获取MES物料产量
|
||||
* @author WenJY
|
||||
* @date 2022-06-09 17:03
|
||||
* @param locationNumber
|
||||
* @return java.util.List<com.productionboard.entity.MesProduction.MesMaterialProductionStatistics>
|
||||
*/
|
||||
List<MesMaterialProductionStatistics> getMesMaterialProductionStatisticsList(String locationNumber);
|
||||
|
||||
/**
|
||||
* 获取MES物料库存
|
||||
* @author WenJY
|
||||
* @date 2022-06-09 17:15
|
||||
* @param locationNumber
|
||||
* @return java.util.List<com.productionboard.entity.MesProduction.MesMaterialStoreStatistics>
|
||||
*/
|
||||
List<MesMaterialStoreStatistics> getMesMaterialStoreStatisticsList(String locationNumber);
|
||||
}
|
@ -0,0 +1,95 @@
|
||||
package com.productionboard.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.productionboard.entity.MesProduction.MesHourProdutionStatistics;
|
||||
import com.productionboard.entity.MesProduction.MesMaterialProductionStatistics;
|
||||
import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics;
|
||||
import com.productionboard.entity.MesProduction.MesTeamStatistics;
|
||||
import com.productionboard.mapper.MesHourProdutionStatisticsMapper;
|
||||
import com.productionboard.mapper.MesMaterialProductionStatisticsMapper;
|
||||
import com.productionboard.mapper.MesMaterialStoreStatisticsMapper;
|
||||
import com.productionboard.mapper.MesTeamStatisticsMapper;
|
||||
import com.productionboard.service.IMesProductionDataService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author WenJY
|
||||
* @date 2022年06月09日 16:28
|
||||
*/
|
||||
@Service
|
||||
public class MesProductionDataServiceImpl implements IMesProductionDataService {
|
||||
|
||||
@Autowired
|
||||
private MesTeamStatisticsMapper teamStatisticsMapper;
|
||||
|
||||
@Autowired
|
||||
private MesHourProdutionStatisticsMapper hourProdutionStatisticsMapper;
|
||||
|
||||
@Autowired
|
||||
private MesMaterialProductionStatisticsMapper materialProductionStatisticsMapper;
|
||||
|
||||
@Autowired
|
||||
private MesMaterialStoreStatisticsMapper materialStoreStatisticsMapper;
|
||||
/**
|
||||
* 通过工位号获取工位信息
|
||||
* @author WenJY
|
||||
* @date 2022-06-09 16:33
|
||||
* @param locationNumber
|
||||
* @return java.util.List<com.productionboard.entity.MesProduction.MesTeamStatistics>
|
||||
*/
|
||||
@Override
|
||||
public List<MesTeamStatistics> getMesTeamStatisticsList(String locationNumber) {
|
||||
QueryWrapper<MesTeamStatistics> wrapper = new QueryWrapper<MesTeamStatistics>();
|
||||
wrapper.eq("POSIONID",locationNumber);
|
||||
List<MesTeamStatistics> mesTeamStatistics = teamStatisticsMapper.selectList(wrapper);
|
||||
return mesTeamStatistics;
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过工位号获取MES小时产量
|
||||
* @author WenJY
|
||||
* @date 2022-06-09 16:47
|
||||
* @param locationNumber
|
||||
* @return java.util.List<com.productionboard.entity.MesProduction.MesHourProdutionStatistics>
|
||||
*/
|
||||
@Override
|
||||
public List<MesHourProdutionStatistics> getMesHourProdutionStatisticsList(String locationNumber) {
|
||||
QueryWrapper<MesHourProdutionStatistics> wrapper = new QueryWrapper<MesHourProdutionStatistics>();
|
||||
wrapper.eq("POSIONID",locationNumber);
|
||||
List<MesHourProdutionStatistics> mesHourProdutionStatistics = hourProdutionStatisticsMapper.selectList(wrapper);
|
||||
return mesHourProdutionStatistics;
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过工位号获取MES物料产量
|
||||
* @author WenJY
|
||||
* @date 2022-06-09 17:03
|
||||
* @param locationNumber
|
||||
* @return java.util.List<com.productionboard.entity.MesProduction.MesMaterialProductionStatistics>
|
||||
*/
|
||||
@Override
|
||||
public List<MesMaterialProductionStatistics> getMesMaterialProductionStatisticsList(String locationNumber) {
|
||||
QueryWrapper<MesMaterialProductionStatistics> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq("POSIONID",locationNumber);
|
||||
List<MesMaterialProductionStatistics> mesMaterialProductionStatistics = materialProductionStatisticsMapper.selectList(wrapper);
|
||||
return mesMaterialProductionStatistics;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取MES物料库存
|
||||
* @author WenJY
|
||||
* @date 2022-06-09 17:16
|
||||
* @param locationNumber
|
||||
* @return java.util.List<com.productionboard.entity.MesProduction.MesMaterialStoreStatistics>
|
||||
*/
|
||||
@Override
|
||||
public List<MesMaterialStoreStatistics> getMesMaterialStoreStatisticsList(String locationNumber) {
|
||||
QueryWrapper<MesMaterialStoreStatistics> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq("POSIONID",locationNumber);
|
||||
List<MesMaterialStoreStatistics> mesMaterialStoreStatistics = materialStoreStatisticsMapper.selectList(wrapper);
|
||||
return mesMaterialStoreStatistics;
|
||||
}
|
||||
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue