I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量检测 1

Browse Source
yun-zuoyi
wynne1005 5 years ago
parent 9bfd9ef279
commit 1e9f1a5c47
27 changed files with 187 additions and 55 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-andon/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-aps/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-base-mongo/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-base/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

36
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -5170,4 +5170,40 @@ public class MesPcnEnumUtil {
}
}
/**
* 客户JIT生产队列状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_CHECK_DATA_SOURCE {
DB(10, "数据库"),
PLC(20, "PLC"),
MANUAL_INPUT(30, "人工输入");
private int value;
private String description;
QC_CHECK_DATA_SOURCE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

2
modules/i3plus-pojo-form/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-hardswitch/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-ics/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-jobflow/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-lac/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mdm/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mes-pcn/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mes/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

47
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java
Unescape Escape View File

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/9/11 14:29
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CHECK_DATA_CFG", indexes = {
@Index(columnList = "CHECK_CFG_NO")
})
@Api("检测数据源配置")
public class MesCheckDataCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -5608847087804566577L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name = "FIELD_CODE")
@ApiParam("字段代码")
private String fieldCode;
@Column(name = "CHECK_CFG_NO")
@ApiParam("检测值配置编号")
private String checkCfgNo;
}

50
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
Unescape Escape View File

@ -64,18 +64,6 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("频率")
private String checkFrequency;
@Transient
@ApiParam("物料名称")
private String partName;
@Transient
@ApiParam("检测结果")
private String checkResult;
@Transient
@ApiParam("检测值")
private String checkValue;
@Column(name = "CHECK_ITEM_TYPE")
@ApiParam("检测项类型")
private String checkItemType;
@ -86,12 +74,32 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@Column(name = "IS_CONCESSION")
@ApiParam("是否允许让步")
private Integer isConcession = 0;
private Integer isConcession;
@Column(name = "NUMBER_FLAG")
@ApiParam("数量标识")
private String numberFlag;
@Column(name = "QTY")
@ApiParam("检测数量")
private Integer qty;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CHECK_ORDER_TYPE")
@ApiParam("任务单类型")
private String checkOrderType;
@Column(name = "DATA_SOURCE")
@ApiParam("数据来源")
private String dataSource;
@Column(name = "CHECK_VALUE_TYPE")
@ApiParam("任务单类型")
private String checkValueType;
@Column(name = "MAXIMUM")
@ApiParam("最大数")
private Double maximum = 0d;
@ -100,6 +108,22 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("最小数")
private Double minimum = 0d;
@Column(name = "IS_KEY_CHECK_ITEM")
@ApiParam("是否关键检测项")
private Integer isKeyCheckItem;
@Transient
@ApiParam("物料名称")
private String partName;
@Transient
@ApiParam("检测结果")
private String checkResult;
@Transient
@ApiParam("检测值")
private String checkValue;
@Transient
@ApiParam("检测类型名称")
private String checkTypeName;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
Unescape Escape View File

@ -112,6 +112,10 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("样本类型")
private Integer sampleType;
@Column(name = "CHECK_ORDER_TYPE")
@ApiParam("任务单类型")
private String checkOrderType;
@ApiParam(value = "检测结果")
@Transient
private String reulstStatus;

45
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
Unescape Escape View File

@ -68,6 +68,10 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@ApiParam("判定结果")
private Integer checkReulst = 0;
@Column(name = "CHECK_VALUE")
@ApiParam("检测值")
private String checkValue;
@Column(name = "ITEM_NO")
@ApiParam("检验行号")
private Integer itemNo = 0;
@ -76,17 +80,13 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "CHECK_VALUE")
@ApiParam("检测值")
private String checkValue;
@ApiParam(value = "已完成数量")
@Transient
private Integer finishQty = 0;
@Column(name = "QTY")
@ApiParam("数量")
private Integer qty;
@ApiParam(value = "检测项类型名称")
@Transient
private String businessTypeName;
@Column(name = "FINISH_QTY")
@ApiParam("已检数量")
private Integer finishQty;
@Column(name = "MAXIMUM")
@ApiParam("最大数")
@ -95,4 +95,29 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@Column(name = "MINIMUM")
@ApiParam("最小数")
private Double minimum = 0d;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "DATA_SOURCE")
@ApiParam("数据源")
private String dataSource;
@Column(name = "CHECK_VALUE_TYPE")
@ApiParam("检测值类型")
private String checkValueType;
@Column(name = "IS_KEY_CHECK_ITEM")
@ApiParam("是否关键检测项")
private Integer isKeyCheckItem;
@ApiParam(value = "检测项类型名称")
@Transient
private String businessTypeName;
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
Unescape Escape View File

@ -465,20 +465,16 @@ public class MesPcnHqlPack {
}
/**
* 获取工作中心下所有的投料数据
* 获取检测单下的所有检测明细
*
* @param mesQcOrderDetail
* @param qcOrder
* @param organizeCode
* @return
*/
public static DdlPackBean getMesQcOrderDetail(MesQcOrderDetail mesQcOrderDetail, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean);
DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean);
if (mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()) {
DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty() + 1, "itemNo", packBean);
}
public static DdlPackBean getMesQcOrderDetail(MesQcOrder qcOrder, String organizeCode) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean);
return packBean;
}

2
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-platform/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-ptl/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-report/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-softswitch/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-sweb/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-wms/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-workflow/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
Unescape Escape View File

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Write Preview
Loading…
Cancel
Save