Merge remote-tracking branch 'origin/master'
wws
1 year ago
commit
b9a9d5c6f0
@ -0,0 +1,477 @@
|
||||
package com.op.device.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.device.domain.EquCheckItemDetail;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
// 检查项维护页面DTO
|
||||
public class SummaryReportDTO {
|
||||
/** 主键 */
|
||||
private String itemId ;
|
||||
/** 检查项编码 */
|
||||
private String itemCode ;
|
||||
/** 检查项名称 */
|
||||
private String itemName ;
|
||||
/** 检查项方法/工具 */
|
||||
private String itemMethod ;
|
||||
/** 维护类型编码 */
|
||||
private String itemType ;
|
||||
/** 维护类型名称 */
|
||||
private String itemTypeName ;
|
||||
/** 检查项备注 */
|
||||
private String itemRemark ;
|
||||
// 检查工具
|
||||
private String itemTools;
|
||||
//标准类型
|
||||
private String standardType;
|
||||
//标准名称
|
||||
private String standardName;
|
||||
// 循环周期类型
|
||||
private String itemLoopType;
|
||||
// 循环周期
|
||||
private int itemLoop;
|
||||
/** 主键 */
|
||||
private String orderId;
|
||||
//设备
|
||||
private String equipmentCode;
|
||||
/** 维修前达标 */
|
||||
private String detailReach;
|
||||
//维修后是否达标
|
||||
private String repairReach;
|
||||
/** 主键 */
|
||||
private String detailId ;
|
||||
/** 主键 */
|
||||
private String id ;
|
||||
|
||||
//1号
|
||||
private String one ;
|
||||
//2号
|
||||
private String two ;
|
||||
//3号
|
||||
private String three ;
|
||||
//4号
|
||||
private String four ;
|
||||
//5号
|
||||
private String five ;
|
||||
//6号
|
||||
private String six ;
|
||||
//7号
|
||||
private String seven ;
|
||||
//8号
|
||||
private String eight ;
|
||||
//9号
|
||||
private String nine ;
|
||||
//10号
|
||||
private String ten ;
|
||||
//11号
|
||||
private String eleven ;
|
||||
//12号
|
||||
private String twelve ;
|
||||
//13号
|
||||
private String thirteen ;
|
||||
//14号
|
||||
private String fourteen;
|
||||
//15号
|
||||
private String fifteen;
|
||||
//16号
|
||||
private String sixteen;
|
||||
//17号
|
||||
private String seventeen;
|
||||
//18号
|
||||
private String eighteen;
|
||||
//19号
|
||||
private String nineteen;
|
||||
//20号
|
||||
private String twenty;
|
||||
//21号
|
||||
private String twentyOne;
|
||||
//22号
|
||||
private String twentyTwo;
|
||||
//23号
|
||||
private String twentyThree;
|
||||
//24号
|
||||
private String twentyFour;
|
||||
//25号
|
||||
private String twentyFive;
|
||||
//26号
|
||||
private String twentySix;
|
||||
//27号
|
||||
private String twentySeven;
|
||||
//28号
|
||||
private String twentyEight;
|
||||
//29号
|
||||
private String twentyNine;
|
||||
//30号
|
||||
private String thirty;
|
||||
//31号
|
||||
private String thirtyOne;
|
||||
|
||||
/** 实际结束时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date orderEnd;
|
||||
|
||||
/** 时间 */
|
||||
private String yearMouth;
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setOrderId(String orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
public String getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public String getItemTools() {
|
||||
return itemTools;
|
||||
}
|
||||
public void setItemTools(String itemTools) {
|
||||
this.itemTools = itemTools;
|
||||
}
|
||||
|
||||
public String getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
public void setItemId(String itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public String getItemCode() {
|
||||
return itemCode;
|
||||
}
|
||||
public void setItemCode(String itemCode) {
|
||||
this.itemCode = itemCode;
|
||||
}
|
||||
|
||||
public String getItemName() {
|
||||
return itemName;
|
||||
}
|
||||
public void setItemName(String itemName) {
|
||||
this.itemName = itemName;
|
||||
}
|
||||
|
||||
public String getItemMethod() {
|
||||
return itemMethod;
|
||||
}
|
||||
public void setItemMethod(String itemMethod) {
|
||||
this.itemMethod = itemMethod;
|
||||
}
|
||||
|
||||
public String getItemType() {
|
||||
return itemType;
|
||||
}
|
||||
public void setItemType(String itemType) {
|
||||
this.itemType = itemType;
|
||||
}
|
||||
|
||||
public String getItemTypeName() {
|
||||
return itemTypeName;
|
||||
}
|
||||
public void setItemTypeName(String itemTypeName) {
|
||||
this.itemTypeName = itemTypeName;
|
||||
}
|
||||
|
||||
public String getItemRemark() {
|
||||
return itemRemark;
|
||||
}
|
||||
public void setItemRemark(String itemRemark) {
|
||||
this.itemRemark = itemRemark;
|
||||
}
|
||||
|
||||
public String getStandardType() {
|
||||
return standardType;
|
||||
}
|
||||
public void setStandardType(String standardType) {
|
||||
this.standardType = standardType;
|
||||
}
|
||||
|
||||
public String getStandardName() {
|
||||
return standardName;
|
||||
}
|
||||
public void setStandardName(String standardName) {
|
||||
this.standardName = standardName;
|
||||
}
|
||||
|
||||
public int getItemLoop() {
|
||||
return itemLoop;
|
||||
}
|
||||
public void setItemLoop(int itemLoop) {
|
||||
this.itemLoop = itemLoop;
|
||||
}
|
||||
|
||||
public String getItemLoopType() {
|
||||
return itemLoopType;
|
||||
}
|
||||
public void setItemLoopType(String itemLoopType) {
|
||||
this.itemLoopType = itemLoopType;
|
||||
}
|
||||
|
||||
public void setEquipmentCode(String equipmentCode) {
|
||||
this.equipmentCode = equipmentCode;
|
||||
}
|
||||
public String getEquipmentCode() {
|
||||
return equipmentCode;
|
||||
}
|
||||
|
||||
public void setDetailId(String detailId) {
|
||||
this.detailId = detailId;
|
||||
}
|
||||
public String getDetailId() {
|
||||
return detailId;
|
||||
}
|
||||
|
||||
public String getRepairReach() {
|
||||
return repairReach;
|
||||
}
|
||||
public void setRepairReach(String repairReach) {
|
||||
this.repairReach = repairReach;
|
||||
}
|
||||
|
||||
public String getDetailReach() {
|
||||
return detailReach;
|
||||
}
|
||||
public void setDetailReach(String detailReach) {
|
||||
this.detailReach = detailReach;
|
||||
}
|
||||
|
||||
public void setOrderEnd(Date orderEnd) {
|
||||
this.orderEnd = orderEnd;
|
||||
}
|
||||
public Date getOrderEnd() {
|
||||
return orderEnd;
|
||||
}
|
||||
|
||||
public void setYearMouth(String yearMouth) {
|
||||
this.yearMouth = yearMouth;
|
||||
}
|
||||
public String getYearMouth() {
|
||||
return yearMouth;
|
||||
}
|
||||
|
||||
public void setOne(String one) {
|
||||
this.one = one;
|
||||
}
|
||||
public String getOne() {
|
||||
return one;
|
||||
}
|
||||
|
||||
public void setTwo(String two) {
|
||||
this.two = two;
|
||||
}
|
||||
public String getTwo() {
|
||||
return two;
|
||||
}
|
||||
|
||||
public void setThree(String three) {
|
||||
this.three = three;
|
||||
}
|
||||
public String getThree() {
|
||||
return three;
|
||||
}
|
||||
|
||||
public void setFour(String four) {
|
||||
this.four = four;
|
||||
}
|
||||
public String getFour() {
|
||||
return four;
|
||||
}
|
||||
|
||||
public void setFive(String five) {
|
||||
this.five = five;
|
||||
}
|
||||
public String getFive() {
|
||||
return five;
|
||||
}
|
||||
|
||||
public void setSix(String six) {
|
||||
this.six = six;
|
||||
}
|
||||
public String getSix() {
|
||||
return six;
|
||||
}
|
||||
|
||||
public void setSeven(String seven) {
|
||||
this.seven = seven;
|
||||
}
|
||||
public String getSeven() {
|
||||
return seven;
|
||||
}
|
||||
|
||||
public void setEight(String eight) {
|
||||
this.eight = eight;
|
||||
}
|
||||
public String getEight() {
|
||||
return eight;
|
||||
}
|
||||
|
||||
public void setNine(String nine) {
|
||||
this.nine = nine;
|
||||
}
|
||||
public String getNine() {
|
||||
return nine;
|
||||
}
|
||||
|
||||
public void setTen(String ten) {
|
||||
this.ten = ten;
|
||||
}
|
||||
public String getTen() {
|
||||
return ten;
|
||||
}
|
||||
|
||||
public void setEleven(String eleven) {
|
||||
this.eleven = eleven;
|
||||
}
|
||||
public String getEleven() {
|
||||
return eleven;
|
||||
}
|
||||
|
||||
public void setTwelve(String twelve) {
|
||||
this.twelve = twelve;
|
||||
}
|
||||
public String getTwelve() {
|
||||
return twelve;
|
||||
}
|
||||
|
||||
public void setThirteen(String thirteen) {
|
||||
this.thirteen = thirteen;
|
||||
}
|
||||
public String getThirteen() {
|
||||
return thirteen;
|
||||
}
|
||||
|
||||
public void setFourteen(String fourteen) {
|
||||
this.fourteen = fourteen;
|
||||
}
|
||||
public String getFourteen() {
|
||||
return fourteen;
|
||||
}
|
||||
|
||||
public void setFifteen(String fifteen) {
|
||||
this.fifteen = fifteen;
|
||||
}
|
||||
public String getFifteen() {
|
||||
return fifteen;
|
||||
}
|
||||
|
||||
public void setSixteen(String sixteen) {
|
||||
this.sixteen = sixteen;
|
||||
}
|
||||
public String getSixteen() {
|
||||
return sixteen;
|
||||
}
|
||||
|
||||
public void setSeventeen(String seventeen) {
|
||||
this.seventeen = seventeen;
|
||||
}
|
||||
public String getSeventeen() {
|
||||
return seventeen;
|
||||
}
|
||||
|
||||
public void setEighteen(String eighteen) {
|
||||
this.eighteen = eighteen;
|
||||
}
|
||||
public String getEighteen() {
|
||||
return eighteen;
|
||||
}
|
||||
|
||||
public void setNineteen(String nineteen) {
|
||||
this.nineteen = nineteen;
|
||||
}
|
||||
public String getNineteen() {
|
||||
return nineteen;
|
||||
}
|
||||
|
||||
public void setTwenty(String twenty) {
|
||||
this.twenty = twenty;
|
||||
}
|
||||
public String getTwenty() {
|
||||
return twenty;
|
||||
}
|
||||
|
||||
public void setTwentyOne(String twentyOne) {
|
||||
this.twentyOne = twentyOne;
|
||||
}
|
||||
public String getTwentyOne() {
|
||||
return twentyOne;
|
||||
}
|
||||
|
||||
public void setTwentyTwo(String twentyTwo) {
|
||||
this.twentyTwo = twentyTwo;
|
||||
}
|
||||
public String getTwentyTwo() {
|
||||
return twentyTwo;
|
||||
}
|
||||
|
||||
public void setTwentyThree(String twentyThree) {
|
||||
this.twentyThree = twentyThree;
|
||||
}
|
||||
public String getTwentyThree() {
|
||||
return twentyThree;
|
||||
}
|
||||
|
||||
public void setTwentyFour(String twentyFour) {
|
||||
this.twentyFour = twentyFour;
|
||||
}
|
||||
public String getTwentyFour() {
|
||||
return twentyFour;
|
||||
}
|
||||
|
||||
public void setTwentyFive(String twentyFive) {
|
||||
this.twentyFive = twentyFive;
|
||||
}
|
||||
public String getTwentyFive() {
|
||||
return twentyFive;
|
||||
}
|
||||
|
||||
public void setTwentySix(String twentySix) {
|
||||
this.twentySix = twentySix;
|
||||
}
|
||||
public String getTwentySix() {
|
||||
return twentySix;
|
||||
}
|
||||
|
||||
public void setTwentySeven(String twentySeven) {
|
||||
this.twentySeven = twentySeven;
|
||||
}
|
||||
public String getTwentySeven() {
|
||||
return twentySeven;
|
||||
}
|
||||
|
||||
public void setTwentyEight(String twentyEight) {
|
||||
this.twentyEight = twentyEight;
|
||||
}
|
||||
public String getTwentyEight() {
|
||||
return twentyEight;
|
||||
}
|
||||
|
||||
public void setTwentyNine(String twentyNine) {
|
||||
this.twentyNine = twentyNine;
|
||||
}
|
||||
public String getTwentyNine() {
|
||||
return twentyNine;
|
||||
}
|
||||
|
||||
public void setThirty(String thirty) {
|
||||
this.thirty = thirty;
|
||||
}
|
||||
public String getThirty() {
|
||||
return thirty;
|
||||
}
|
||||
|
||||
public void setThirtyOne(String thirtyOne) {
|
||||
this.thirtyOne = thirtyOne;
|
||||
}
|
||||
public String getThirtyOne() {
|
||||
return thirtyOne;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package com.op.quality.controller;
|
||||
|
||||
import com.op.common.core.utils.StringUtils;
|
||||
import com.op.quality.domain.QcCheckType;
|
||||
import com.op.quality.domain.QcInterface;
|
||||
import com.op.quality.service.IQcInterfaceService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 质量看板接口
|
||||
*
|
||||
* @author zxl
|
||||
* @date 2023-11-15
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/qcInterface")
|
||||
public class QcInterfaceController {
|
||||
|
||||
@Autowired
|
||||
private IQcInterfaceService qcInterfaceService;
|
||||
|
||||
|
||||
/**
|
||||
*/
|
||||
@GetMapping("/getDictData")
|
||||
public List<QcInterface> getDictData(QcInterface qcInterface) {
|
||||
return qcInterfaceService.getDictData(qcInterface);
|
||||
}
|
||||
|
||||
/**
|
||||
* 来料--订单异常信息
|
||||
* @param qcInterface
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/getOverallInfo")
|
||||
public List<QcInterface> getOverallInfo(QcInterface qcInterface) {
|
||||
return qcInterfaceService.getOverallInfo(qcInterface);
|
||||
}
|
||||
|
||||
/**
|
||||
* 来料--异常分布
|
||||
* @param qcInterface
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/getCheckProjectsPie")
|
||||
public List<QcInterface> getCheckProjectsPie(QcInterface qcInterface) {
|
||||
return qcInterfaceService.getCheckProjectsPie(qcInterface);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
package com.op.quality.domain;
|
||||
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
/**
|
||||
* 看板
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-12
|
||||
*/
|
||||
public class QcInterface extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private String ymdType;
|
||||
private String ymdTypeName;
|
||||
private String dictType;
|
||||
private String factoryCode;
|
||||
private String quality;
|
||||
private String ymd;
|
||||
private String projectName;
|
||||
|
||||
public String getProjectName() {
|
||||
return projectName;
|
||||
}
|
||||
|
||||
public void setProjectName(String projectName) {
|
||||
this.projectName = projectName;
|
||||
}
|
||||
|
||||
public String getYmd() {
|
||||
return ymd;
|
||||
}
|
||||
|
||||
public void setYmd(String ymd) {
|
||||
this.ymd = ymd;
|
||||
}
|
||||
|
||||
public String getQuality() {
|
||||
return quality;
|
||||
}
|
||||
|
||||
public void setQuality(String quality) {
|
||||
this.quality = quality;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getYmdType() {
|
||||
return ymdType;
|
||||
}
|
||||
|
||||
public void setYmdType(String ymdType) {
|
||||
this.ymdType = ymdType;
|
||||
}
|
||||
|
||||
public String getYmdTypeName() {
|
||||
return ymdTypeName;
|
||||
}
|
||||
|
||||
public void setYmdTypeName(String ymdTypeName) {
|
||||
this.ymdTypeName = ymdTypeName;
|
||||
}
|
||||
|
||||
public String getDictType() {
|
||||
return dictType;
|
||||
}
|
||||
|
||||
public void setDictType(String dictType) {
|
||||
this.dictType = dictType;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package com.op.quality.mapper;
|
||||
|
||||
import com.op.quality.domain.QcCheckProject;
|
||||
import com.op.quality.domain.QcCheckType;
|
||||
import com.op.quality.domain.QcInterface;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 质量看板Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-13
|
||||
*/
|
||||
@Mapper
|
||||
public interface QcInterfaceMapper {
|
||||
|
||||
List<QcInterface> getDictData(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getOverallInfo(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getCheckProjectsPie(QcInterface qcInterface);
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.op.quality.service;
|
||||
|
||||
|
||||
import com.op.quality.domain.QcCheckType;
|
||||
import com.op.quality.domain.QcInterface;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-13
|
||||
*/
|
||||
public interface IQcInterfaceService {
|
||||
|
||||
List<QcInterface> getDictData(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getOverallInfo(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getCheckProjectsPie(QcInterface qcInterface);
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package com.op.quality.service.impl;
|
||||
|
||||
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import com.op.quality.domain.QcCheckType;
|
||||
import com.op.quality.domain.QcInterface;
|
||||
import com.op.quality.mapper.QcInterfaceMapper;
|
||||
import com.op.quality.service.IQcInterfaceService;
|
||||
import com.op.system.api.domain.SysDictData;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 检验项目维护Service业务层处理
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-13
|
||||
*/
|
||||
@Service
|
||||
public class QcInterfaceServiceImpl implements IQcInterfaceService {
|
||||
@Autowired
|
||||
private QcInterfaceMapper qcInterfaceMapper;
|
||||
|
||||
@Override
|
||||
public List<QcInterface> getDictData(QcInterface qcInterface) {
|
||||
DynamicDataSourceContextHolder.push("master");
|
||||
return qcInterfaceMapper.getDictData(qcInterface);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QcInterface> getOverallInfo(QcInterface qcInterface) {
|
||||
DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
|
||||
|
||||
String nowYMD = DateUtils.getDate();
|
||||
qcInterface.setYmd(nowYMD);
|
||||
List<QcInterface> dtos = qcInterfaceMapper.getOverallInfo(qcInterface);
|
||||
if(!CollectionUtils.isEmpty(dtos)&&dtos.size()==2){
|
||||
QcInterface qif = new QcInterface();
|
||||
qif.setYmdTypeName("okRate");
|
||||
if(dtos.get(1).getQuality().equals("0")){
|
||||
qif.setQuality("100%");
|
||||
}else{
|
||||
BigDecimal okRate = (new BigDecimal(dtos.get(0).getQuality())
|
||||
.subtract(new BigDecimal(dtos.get(1).getQuality())))
|
||||
.multiply(new BigDecimal("100"))
|
||||
.divide(new BigDecimal(dtos.get(0).getQuality()),2, RoundingMode.HALF_UP);
|
||||
qif.setQuality(okRate.toString()+"%");
|
||||
}
|
||||
dtos.add(qif);
|
||||
}
|
||||
return dtos;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QcInterface> getCheckProjectsPie(QcInterface qcInterface) {
|
||||
DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
|
||||
|
||||
String nowYMD = DateUtils.getDate();
|
||||
qcInterface.setYmd(nowYMD);
|
||||
List<QcInterface> dtos = qcInterfaceMapper.getCheckProjectsPie(qcInterface);
|
||||
|
||||
return dtos;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.op.quality.mapper.QcInterfaceMapper">
|
||||
|
||||
|
||||
<select id="getDictData" resultType="com.op.quality.domain.QcInterface">
|
||||
select dict_label ymdTypeName,
|
||||
dict_value ymdType
|
||||
from sys_dict_data
|
||||
where dict_type = #{dictType} and status = '0'
|
||||
</select>
|
||||
<select id="getOverallInfo" resultType="com.op.quality.domain.QcInterface">
|
||||
select count(0) quality,'all' ymdTypeName
|
||||
from wms_raw_order_in
|
||||
where active_flag = '1'
|
||||
<if test='ymdType=="yyyy"'>
|
||||
and CONVERT(varchar(4),receipt_time, 120) = SUBSTRING(#{ymd},0,5)
|
||||
</if>
|
||||
<if test='ymdType=="mm"'>
|
||||
and CONVERT(varchar(7),receipt_time, 120) =SUBSTRING(#{ymd},0,8)
|
||||
</if>
|
||||
<if test='ymdType=="dd"'>
|
||||
and CONVERT(varchar(10),receipt_time, 120) = SUBSTRING(#{ymd},0,11)
|
||||
</if>
|
||||
union ALL
|
||||
select count(0),'unOk'
|
||||
from qc_check_unqualified qcu
|
||||
left join qc_check_type qct on qcu.type = qct.order_code
|
||||
where qct.type_code = #{typeCode} and qcu.del_flag = '0'
|
||||
<if test='ymdType=="yyyy"'>
|
||||
and CONVERT(varchar(4),qcu.create_time, 120) = SUBSTRING(#{ymd},0,5)
|
||||
</if>
|
||||
<if test='ymdType=="mm"'>
|
||||
and CONVERT(varchar(7),qcu.create_time, 120) = SUBSTRING(#{ymd},0,8)
|
||||
</if>
|
||||
<if test='ymdType=="dd"'>
|
||||
and CONVERT(varchar(10),qcu.create_time, 120) = SUBSTRING(#{ymd},0,11)
|
||||
</if>
|
||||
</select>
|
||||
<select id="getCheckProjectsPie" resultType="com.op.quality.domain.QcInterface">
|
||||
select count(0) quality,
|
||||
qctd.project_no,
|
||||
qctd.rule_name projectName
|
||||
from qc_check_task_detail qctd
|
||||
left join qc_check_task qct on qctd.belong_to = qct.record_id
|
||||
where qct.check_result = 'N' and qct.type_code = #{typeCode}
|
||||
<if test='ymdType=="yyyy"'>
|
||||
and CONVERT(varchar(4),qctd.update_time, 120) = SUBSTRING(#{ymd},0,5)
|
||||
</if>
|
||||
<if test='ymdType=="mm"'>
|
||||
and CONVERT(varchar(7),qcu.update_time, 120) = SUBSTRING(#{ymd},0,8)
|
||||
</if>
|
||||
<if test='ymdType=="dd"'>
|
||||
and CONVERT(varchar(10),qcu.update_time, 120) = SUBSTRING(#{ymd},0,11)
|
||||
</if>
|
||||
group by qctd.project_no,qctd.rule_name
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,101 @@
|
||||
package com.op.wms.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
public class WCSInventoryPlan {
|
||||
private String reqCode;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date reqTime;//请求时间
|
||||
private String rfidNo;//rfid编号
|
||||
private String batchNo;//批次号
|
||||
private String sku;////物料编码
|
||||
private String location;//扫码获取
|
||||
private String qty; //数量
|
||||
private String qualityStatus;////质检状态
|
||||
private String factoryCode;
|
||||
private String createBy;
|
||||
|
||||
public String getCreateBy() {
|
||||
return createBy;
|
||||
}
|
||||
|
||||
public void setCreateBy(String createBy) {
|
||||
this.createBy = createBy;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getReqCode() {
|
||||
return reqCode;
|
||||
}
|
||||
|
||||
public void setReqCode(String reqCode) {
|
||||
this.reqCode = reqCode;
|
||||
}
|
||||
|
||||
public Date getReqTime() {
|
||||
return reqTime;
|
||||
}
|
||||
|
||||
public void setReqTime(Date reqTime) {
|
||||
this.reqTime = reqTime;
|
||||
}
|
||||
|
||||
public String getRfidNo() {
|
||||
return rfidNo;
|
||||
}
|
||||
|
||||
public void setRfidNo(String rfidNo) {
|
||||
this.rfidNo = rfidNo;
|
||||
}
|
||||
|
||||
public String getBatchNo() {
|
||||
return batchNo;
|
||||
}
|
||||
|
||||
public void setBatchNo(String batchNo) {
|
||||
this.batchNo = batchNo;
|
||||
}
|
||||
|
||||
public String getSku() {
|
||||
return sku;
|
||||
}
|
||||
|
||||
public void setSku(String sku) {
|
||||
this.sku = sku;
|
||||
}
|
||||
|
||||
public String getLocation() {
|
||||
return location;
|
||||
}
|
||||
|
||||
public void setLocation(String location) {
|
||||
this.location = location;
|
||||
}
|
||||
|
||||
public String getQty() {
|
||||
return qty;
|
||||
}
|
||||
|
||||
public void setQty(String qty) {
|
||||
this.qty = qty;
|
||||
}
|
||||
|
||||
public String getQualityStatus() {
|
||||
return qualityStatus;
|
||||
}
|
||||
|
||||
public void setQualityStatus(String qualityStatus) {
|
||||
this.qualityStatus = qualityStatus;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
package com.op.wms.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
public class WMSDesignatedPalle {
|
||||
private String reqCode;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date reqTime;//请求时间
|
||||
private String rfidNo;//rfid编号//如果是空托出库的话，这个字段就传固定的那个物料号
|
||||
private String warehouseNo; //仓库编号
|
||||
private String factoryCode;
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getWarehouseNo() {
|
||||
return warehouseNo;
|
||||
}
|
||||
|
||||
public void setWarehouseNo(String warehouseNo) {
|
||||
this.warehouseNo = warehouseNo;
|
||||
}
|
||||
|
||||
private String location;//填包装线
|
||||
|
||||
private String type; //类型１是托盘出库，２是空托出库计划下发
|
||||
|
||||
public String getReqCode() {
|
||||
return reqCode;
|
||||
}
|
||||
|
||||
public void setReqCode(String reqCode) {
|
||||
this.reqCode = reqCode;
|
||||
}
|
||||
|
||||
public Date getReqTime() {
|
||||
return reqTime;
|
||||
}
|
||||
|
||||
public void setReqTime(Date reqTime) {
|
||||
this.reqTime = reqTime;
|
||||
}
|
||||
|
||||
public String getRfidNo() {
|
||||
return rfidNo;
|
||||
}
|
||||
|
||||
public void setRfidNo(String rfidNo) {
|
||||
this.rfidNo = rfidNo;
|
||||
}
|
||||
|
||||
public String getLocation() {
|
||||
return location;
|
||||
}
|
||||
|
||||
public void setLocation(String location) {
|
||||
this.location = location;
|
||||
}
|
||||
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(String type) {
|
||||
this.type = type;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue