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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
汪云昊 5 years ago
parent d6f4fa7f92 5f144781c9
commit 6ab0f17ac7
51 changed files with 1647 additions and 117 deletions
Show Stats Download Patch File Download Diff File

20
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
Unescape Escape View File

@ -51,6 +51,22 @@ public class AndonPLC extends BaseBean implements Serializable {
@ApiParam(value = "IP地址")
private String nodeIP;
@Column(name = "CHANNEL")
@ApiParam("通道")
private String channel;
@Column(name = "DEVICE")
@ApiParam("终端")
private String device;
@Column(name = "OPC_URL")
@ApiParam("OPCUA路径")
private String opcUrl;
@Column(name = "NAME_SPACE_INDEX")
@ApiParam("空间索引")
private Integer nameSpaceIndex = 2;
@Column(name = "CHANNEL_NAME")
@ApiParam(value = "通道名称")
private String channelName;
@ -67,6 +83,10 @@ public class AndonPLC extends BaseBean implements Serializable {
@ApiParam(value = "标签类型")
private String tagType;
@Column(name = "DATA_TYPE")
@ApiParam("标签数据类型")
private String dataType;
@Column(name = "GROUP_NO")
@ApiParam(value = "分组号")
private String groupNo;

3
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
Unescape Escape View File

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -31,7 +32,7 @@ public class CommonMsgModel implements Serializable {
private String msgType;
@ApiModelProperty("消息数据")
private Map<String, Object> msgData;
private Map<String, Object> msgData = new HashMap<>();
@ApiModelProperty("流程状态集合")
private List<AndonRouteStatus> routeStatusList;

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

@ -3325,7 +3325,8 @@ public class MesEnumUtil {
SPARE_PART_PRODUCTION(100, "备件生产"),
REPRODUCTION_RMS(110, "重新生产-报工"),
REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
REVERSE_SPRAY_ORDER(130, "反喷工单");
REVERSE_SPRAY_ORDER(130, "反喷工单"),
SPARE_RETURN_REPAIR(140, "客退备件返修");
private int value;
private String description;
@ -7217,4 +7218,254 @@ public class MesEnumUtil {
}
}
/**
* 触发类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STEP_TRIGGER_TYPE {
INTERNAL_TRIGGER(10, "内部触发"),
EXTERNAL_TRIGGER(20, "外部触发");
private int value;
private String description;
STEP_TRIGGER_TYPE(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;
}
}
/**
* 客户JIT队列明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_JIT_ACTUAL_DETAIL_STATUS {
NORMAL(10, "正常"),
WASHED_MATERIAL(20, "已冲料");
private int value;
private String description;
QUEUE_JIT_ACTUAL_DETAIL_STATUS(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;
}
}
/**
* JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum JIS_BACKFLUSH_STATUS {
BACKFLUSH("BACKFLUSH", "正常回冲扣减"),
REPAIR("REPAIR", "返修冲料");
private String value;
private String description;
JIS_BACKFLUSH_STATUS(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 质检单审批处理意见
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_ORDER_APPROVAL_CHOICE {
STOP_LINE(10, "停线"),
RELEASE(20, "放行");
private int value;
private String description;
QC_ORDER_APPROVAL_CHOICE(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;
}
}
/**
* 整体检测结果状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CHECK_RESULT {
PASS(10, "通过"),
NON_PASS(20, "不通过"),
CONCESSION_PRODUCTION(30, "让步生产");
private int value;
private String description;
CHECK_RESULT(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;
}
}
/**
* 整体检测结果状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_ORDER_APPROVAL_TYPE {
STOP_LINE(10, "停线"),
RELEASE(20, "放行");
private int value;
private String description;
QC_ORDER_APPROVAL_TYPE(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;
}
}
/**
* 检测单明细的检测结果
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_ORDER_DETAIL_CHECK_RESULT {
OK(10, "OK"),
NG(20, "NG");
private int value;
private String description;
QC_ORDER_DETAIL_CHECK_RESULT(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;
}
}
}

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

@ -80,7 +80,9 @@ public class MesPcnEnumUtil {
return value;
}
public String getData() { return data; }
public String getData() {
return data;
}
public String getDescription() {
return description;
@ -211,7 +213,9 @@ public class MesPcnEnumUtil {
public enum METHOD_TYPE {
EXEC(10, "执行方法"),
COMPLETE(20, "完成方法");
COMPLETE(20, "完成方法"),
HNC_ISSUED(30, "队列自动下达"),
LABEL_PROPERTIES(40, "标签属性查询方法");
private int value;
private String description;
@ -1884,7 +1888,8 @@ public class MesPcnEnumUtil {
SPARE_PART_PRODUCTION(100, "备件生产"),
REPRODUCTION_RMS(110, "重新生产-报工"),
REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
REVERSE_SPRAY_ORDER(130, "反喷工单");
REVERSE_SPRAY_ORDER(130, "反喷工单"),
SPARE_RETURN_REPAIR(140, "客退备件返修");
private int value;
private String description;
@ -3783,7 +3788,7 @@ public class MesPcnEnumUtil {
* 整体检测结果状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CHECK_REULST {
public enum CHECK_RESULT {
PASS(10, "通过"),
NON_PASS(20, "不通过"),
@ -3792,7 +3797,7 @@ public class MesPcnEnumUtil {
private int value;
private String description;
CHECK_REULST(int value, String description) {
CHECK_RESULT(int value, String description) {
this.value = value;
this.description = description;
}
@ -5211,4 +5216,136 @@ public class MesPcnEnumUtil {
}
}
/**
* 是否展示放空队列
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SHOW_VENTING_QUEUE {
CREATE(10, "显示"),
SHIPMENT(20, "不显示");
private int value;
private String description;
SHOW_VENTING_QUEUE(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;
}
}
/**
* 过程检测数据源类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_CHECK_DATA_SOURCE {
MANUAL_INPUT(10, "10", "人工输入"),
DB(30, "30", "数据库"),
PLC(20, "20", "PLC");
private int value;
private String description;
private String code;
QC_CHECK_DATA_SOURCE(int value, String code, String description) {
this.value = value;
this.description = description;
this.code = code;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
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;
}
}
/**
* 过程检测检测对象数据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_CHECK_VALUE_TYPE {
STRING(10, "字符串"),
INTEGER(20, "数值");
private int value;
private String description;
QC_CHECK_VALUE_TYPE(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;
}
}
/**
* 过程检测检测检测结果
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_CHECK_VALUE_RESULT {
OK(10),
NOT_OK(20),
MANUAL(30);
private int value;
QC_CHECK_VALUE_RESULT(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}
}

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

@ -263,6 +263,7 @@ public class WmsEnumUtil {
this.description = description;
}
public int getValue() {
return value;
}

28
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.base.tool;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
@ -649,6 +650,33 @@ public class DdlPreparedPack {
}
}
/**
* 多个字段列or查询
*
* @param data
* @param columnNames
* @param columnNamesKey
* @param packBean
*/
public static void getMultOrPackString(String data, List<String> columnNames, String columnNamesKey, DdlPackBean packBean) {
StringBuffer sbf = new StringBuffer(" and ( ");
if (StringUtil.isEmpty(columnNamesKey)) {
columnNamesKey = "mult_column_name";
}
for (int i = 0; i < columnNames.size(); i++) {
String columnName = columnNames.get(i);
sbf.append(" model." + columnName + "=:m_" + columnNamesKey);
if (i == columnNames.size() - 1) {
continue;
}
sbf.append(" or ");
}
sbf.append(" )");
packBean.addColumnQuery(columnNamesKey, sbf.toString(), data);
}
/**
* 封装in String查询语句
*

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

@ -12,10 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -88,6 +85,14 @@ public class MesBom extends BaseBean implements Serializable {
@ApiParam("BOM代码")
private String bomCode;
@Transient
@ApiParam(value = "过程条码")
public String serialNumber;
@Transient
@ApiParam(value = "已拆解数量")
public Double scrapQty = 0d;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

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;
}

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

@ -45,4 +45,16 @@ public class MesCustProdLine extends BaseBean implements Serializable {
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "CUST_PROD_LINE_FLAG")
@ApiParam("客户产线标识")
private String custProdLineFlag;
@Column(name = "DOCK_NO")
@ApiParam("dock")
private String dockNo;
}

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

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: jessica.chen
* @CreateDate: 2019\11\15 10:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_GENERATE_QC_ORDER")
@Api("待生成检验单")
public class MesGenerateQcOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = 14873669015484197L;
@Column(name = "ORDER_NO")
@ApiParam("质检单号")
private String orderNo;
@Column(name = "IS_GENERATED")
@ApiParam("是否生成了末检单")
private Integer isGenerated = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Column(name = "GENERATE_TIME")
@ApiParam("生成时间")
private String generateTime;
}

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

@ -29,7 +29,7 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_LOOP_QC_GENERATE_DETAIL")
@Api("MES_巡检项生成明细")
public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -5412635747424111476L;
@Column(name = "RELATION_ORDER_NO")
@ -44,9 +44,13 @@ public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
@ApiParam("检测项")
private String checkItem;
@Column(name = "LASR_TIME")
@Column(name = "CHECK_ORDER_TYPE")
@ApiParam("任务单类型")
private String checkOrderType;
@Column(name = "LAST_TIME")
@ApiParam("末次时间")
private String lasrTime;
private String lastTime;
@ApiParam(value = "物料号")
@Transient

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

@ -140,6 +140,10 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("库位代码")
private String locationCode;
@Column(name = "ERP_WORK_CENTER_CODE")
@ApiParam("erp工作中心")
private String erpWorkCenterCode;
@Transient
@ApiParam("目标库位代码")
private String destLocationCode;

54
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,36 @@ 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 = "CHECK_CFG_NO")
@ApiParam("检测值配置编号")
private String checkCfgNo;
@Column(name = "MAXIMUM")
@ApiParam("最大数")
private Double maximum = 0d;
@ -100,6 +112,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;

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

@ -14,6 +14,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
@ -29,7 +30,7 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_ORDER")
@Api("MES_检验单")
public class MesQcOrder extends BaseBean implements Serializable {
public class MesQcOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = -5412635747424111476L;
@Column(name = "ORDER_NO")
@ -84,9 +85,9 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("状态")
private Integer status;
@Column(name = "CHECK_REULST")
@Column(name = "CHECK_RESULT")
@ApiParam("检测整体结果")
private Integer checkReulst = 0;
private Integer checkResult = 0;
@Column(name = "MEMO")
@ApiParam("备注")
@ -112,9 +113,18 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("样本类型")
private Integer sampleType;
@Column(name = "CHECK_ORDER_TYPE")
@ApiParam("任务单类型")
private String checkOrderType;
@Deprecated
@ApiParam(value = "检测结果")
@Transient
private String reulstStatus;
private String resultStatus;
@ApiParam(value = "显示按钮")
@Transient
private List<String> buttons;
@ApiParam(value = "产品条码")
@Transient

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

@ -0,0 +1,89 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/4/18 21:05
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_ORDER_APPROVAL_STATUS")
@Api("检测单审批状态表")
public class MesQcOrderApprovalStatus extends BaseBean implements Serializable {
private static final long serialVersionUID = -3157480917343280506L;
@Column(name = "ORDER_NO")
@ApiParam("质检单号")
private String orderNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "WORK_ORDER_NO")
@ApiParam("工单号")
private String workOrderNo;
@Column(name = "PLAN_QTY")
@ApiParam("计划数量")
private Double planQty;
@Column(name = "CHECK_TYPE")
@ApiParam("检验类型")
private Integer checkType;
@Column(name = "QC_USER")
@ApiParam("检查人")
private String qcUser;
@Column(name = "CHECK_RESULT")
@ApiParam("检验结果")
private String checkResult;
@Column(name = "IS_KEY_CHECK_ITEM")
@ApiParam("是否关键检测")
private Integer isKeyCheckItem;
@Column(name = "QUALITY_APPROVAL_STATUS")
@ApiParam("质量经理审批状态")
private Integer qualityApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Column(name = "QUALITY_CHOICE")
@ApiParam("质量经理审批状态")
private Integer qualityChoice;
@Column(name = "PRODUCE_APPROVAL_STATUS")
@ApiParam("生产经理审批状态")
private Integer produceApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Column(name = "PRODUCE_CHOICE")
@ApiParam("生产经理审批状态")
private Integer produceChoice;
@Column(name = "APPROVAL_STATUS")
@ApiParam("生产经理审批状态")
private Integer approvalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
}

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

@ -29,7 +29,7 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_ORDER_DETAIL")
@Api("MES_检验单明细")
public class MesQcOrderDetail extends BaseBean implements Serializable {
public class MesQcOrderDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -5412635747424111476L;
@Column(name = "ORDER_NO")
@ -64,10 +64,6 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@ApiParam("是否允许让步")
private Integer isConcession = 0;
@Column(name = "CHECK_REULST")
@ApiParam("判定结果")
private Integer checkReulst = 0;
@Column(name = "ITEM_NO")
@ApiParam("检验行号")
private Integer itemNo = 0;
@ -76,17 +72,13 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "CHECK_VALUE")
@ApiParam("检测值")
private String checkValue;
@Column(name = "QTY")
@ApiParam("数量")
private Integer qty;
@ApiParam(value = "已完成数量")
@Transient
private Integer finishQty = 0;
@ApiParam(value = "检测项类型名称")
@Transient
private String businessTypeName;
@Column(name = "FINISH_QTY")
@ApiParam("已检数量")
private Integer finishQty;
@Column(name = "MAXIMUM")
@ApiParam("最大数")
@ -95,4 +87,41 @@ 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;
@Column(name = "CHECK_CFG_NO")
@ApiParam("检测值配置编号")
private String checkCfgNo;
@Transient
@ApiParam("判定结果")
private Integer checkResult = 0;
@Transient
@ApiParam("检测值")
private String checkValue;
}

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

@ -0,0 +1,63 @@
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;
/**
* @Description:
* @Reference:
* @Author: jessica.chen
* @CreateDate: 2019\11\15 10:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_ORDER_RECORD", indexes = {
@Index(columnList = "QC_ORDER_DETAIL_ID"),
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "ORDER_NO")
})
@Api("MES_检验单检验记录")
public class MesQcOrderRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -5245624982023882232L;
@Column(name = "ORDER_NO")
@ApiParam("质检单号")
private String orderNo;
@Column(name = "CHECK_RESULT")
@ApiParam("判定结果")
private Integer checkResult = 0;
@Column(name = "CHECK_VALUE")
@ApiParam("检测值")
private String checkValue;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "CHECK_SEQ")
@ApiParam("检测顺序")
private Integer checkSeq;
@Column(name = "QC_ORDER_DETAIL_ID")
@ApiParam("质检单明细id")
private Long qcOrderDetailId;
}

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

@ -96,6 +96,22 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@ApiParam("组件编号")
private String assyNo;
@Column(name = "JIS_BACKFLUSH_STATUS")
@ApiParam("回冲标识")
private String jisBackflushStatus = "BACKFLUSH";
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "IS_EMPTY")
@ApiParam("是否放空")
private Integer isEmpty;
@Transient
@ApiParam("工单类型")
private Integer woType;
@ -108,6 +124,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@ApiParam("数量")
private long qty;
@Transient
@ApiParam("是否拆解件")
private Integer isDisPart;
public MesQueueJitActualDetail() {
}

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

@ -136,6 +136,28 @@ public class MesQueueOrder extends BaseBean implements Serializable {
@ApiParam("产品颜色")
private String colorName;
@Transient
@ApiParam("零件号")
private String partNo;
@Transient
@ApiParam("零件名称")
private String partNameRdd;
@Transient
@ApiParam("箱数")
private Integer boxQty;
@Transient
@ApiParam("开始时间")
private String startTime;
@Transient
@ApiParam("结束时间")
private String endTime;
public MesQueueOrder(){}
public int getStatusVal() {
return this.status == null ? 0 : this.status;
}
@ -144,4 +166,21 @@ public class MesQueueOrder extends BaseBean implements Serializable {
return this.seq == null ? 0.0d : this.seq;
}
public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty,
Integer queueType,Integer status,String createUser,
String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo) {
this.seq = seq;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.boxQty = boxQty;
this.queueType = queueType;
this.status = status;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.workType = workType;
this.orderNo = orderNo;
}
}

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

@ -124,6 +124,18 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("分组序号")
private String groupSeq;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "IS_EMPTY")
@ApiParam("是否放空")
private Integer isEmpty;
@Column(name = "JIS_BACKFLUSH_STATUS")
@ApiParam("回冲标识")
private String jisBackflushStatus;
@Transient
@ApiParam("Vin")
private String vinCode;
@ -181,10 +193,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
private Integer masterStatus;
@Transient
@ApiParam("产品条码")
private String productSn;
@Transient
@ApiParam("队列类型")
private Integer queueType;

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

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
@Data
public class DismantleRecordModel {
@ApiParam("组织代码")
private String organizeCode;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("工单号")
private String workOrderNo;
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partName;
@ApiParam("缺陷类型")
private String defectType;
@ApiParam("用户")
private String userInfo;
@ApiParam("物料拆解集合")
private List<MesDismantleRecord> dismantleRecordList;
@ApiParam("不良集合")
private List<MesDefect> defectList;
}

20
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description: 条码解绑实体
* @Reference:
@ -12,7 +14,7 @@ import lombok.Data;
* @Modify:
**/
@Data
public class FutrueTaskModel {
public class FutrueTaskModel<T> {
@ApiParam("实现类")
private Object futrueTaskService;
@ -23,5 +25,21 @@ public class FutrueTaskModel {
@ApiParam("过程条码")
private MesProduceSn produceSn;
@ApiParam("组织代码")
private String organizeCode;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("总装批量执行逻辑")
private List<T> requestBeanList;
@ApiParam("总装批量执行逻辑")
private Object specialBusinessType;
}

18
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java
Unescape Escape View File

@ -29,6 +29,9 @@ public class PaintOnLineModel {
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("颜色代码")
private String colorCode;
@ApiParam("颜色")
private String color;
@ -47,9 +50,24 @@ public class PaintOnLineModel {
@ApiParam("圈数")
private Integer rounds;
@ApiParam("小车号")
private String smallCarNo;
@ApiParam("车数")
private Integer smallCarAmount;
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("是否虚拟件")
private Integer isFictive = 2;
@ApiParam("反喷标识")
private String reverseSprayMark;
@ApiParam("备注")
private String memo;
@ApiParam("工单类型")
private String workType;
}

48
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java
Unescape Escape View File

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.mes.model;
import lombok.Data;
/**
* @author Wynne.Lu
* @date 2020/9/16 00:24
* @desc
*/
@Data
public class QcOrderCheckDataDetailModel {
private Integer checkType;
private String checkItem;
private String checkStandard;
private Integer checkCount;
private Integer isConcession;
private Integer isKeyCheckItem;
private Double max;
private Double min;
private String checkValue;
private Integer checkResult;
public QcOrderCheckDataDetailModel(Integer checkType, String checkItem, String checkStandard, Integer checkCount,
Integer isConcession, Integer isKeyCheckItem, Double max, Double min,
String checkValue, Integer checkResult) {
this.checkType = checkType;
this.checkItem = checkItem;
this.checkStandard = checkStandard;
this.checkCount = checkCount;
this.isConcession = isConcession;
this.isKeyCheckItem = isKeyCheckItem;
this.max = max;
this.min = min;
this.checkValue = checkValue;
this.checkResult = checkResult;
}
}

102
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java
Unescape Escape View File

@ -0,0 +1,102 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/3/20 9:02 下午
* @Modify:
*/
@Data
@Api("JIT队列列表Model")
public class QueueJitActualModel {
private Long id;
@ApiParam("vin")
private String vinCode;
@ApiParam("排序号")
private Double seq;
@ApiParam("分组队列编号")
private String queueGroupNo;
@ApiParam("组内编号")
private Integer groupNo;
@ApiParam("JIT排序号")
private String jitSeq;
@ApiParam("队列编号")
private String jisActualNo;
@ApiParam("工单类型")
public Integer workType;
@ApiParam("工单类型")
public String workTypeName;
@ApiParam("客户产线代码")
private String custProdLineCode;
@ApiParam("产品位置代码")
private String produceCtgyCode;
@ApiParam("产品条码")
private String productSn;
@ApiParam("明细状态名称")
private Integer detailStatus;
@ApiParam("明细状态名称")
private String detailStatusName;
@ApiParam("创建人")
private String createUser;
@ApiParam("创建时间")
private String createDatetime;
@ApiParam("产品条码")
private String serialNumber;
@ApiParam("用量")
private Double qty = 0d;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料号")
private String partName;
public QueueJitActualModel() {
}
public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode,
String productSn, Integer detailStatus, String createUser, String createDatetime) {
this.id = id;
this.vinCode = vinCode;
this.jisActualNo = jisActualNo;
this.workType = workType;
this.custProdLineCode = custProdLineCode;
this.produceCtgyCode = produceCtgyCode;
this.productSn = productSn;
this.detailStatus = detailStatus;
this.createUser = createUser;
this.createDatetime = createDatetime;
}
public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String partNo, String partName, String produceCtgyCode, Double qty,
String createUser, String createDatetime) {
this.id = id;
this.vinCode = vinCode;
this.jisActualNo = jisActualNo;
this.partNo = partNo;
this.partName = partName;
this.qty = qty;
this.createUser = createUser;
this.createDatetime = createDatetime;
}
}

40
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java
Unescape Escape View File

@ -1,40 +0,0 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/3/20 9:02 下午
* @Modify:
*/
@Data
public class QueueJitActualModule {
private Long id;
@ApiParam("vin")
private String vinCode;
@ApiParam("排序号")
private Double seq;
@ApiParam("分组队列编号")
private String queueGroupNo;
@ApiParam("组内编号")
private Integer groupNo;
@ApiParam("JIT排序号")
private String jitSeq;
public QueueJitActualModule() {
}
public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) {
this.id = id;
this.vinCode = vinCode;
this.seq = seq;
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
this.jitSeq = jitSeq;
}
}

17
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
Unescape Escape View File

@ -106,6 +106,14 @@ public class QueueOrderModel implements Serializable {
private String jitSeq;
private Integer status;
@ApiParam("回冲标识")
private String jisBackflushStatus;
@ApiParam("队列编号")
private String jisActualNo;
@ApiParam("是否放空")
private Integer isEmpty;
public QueueOrderModel() {
}
@ -350,4 +358,13 @@ public class QueueOrderModel implements Serializable {
this.jitSeq = jitSeq;
this.status = status;
}
// getQueueJitActualDetailByNo
public QueueOrderModel(Long id, String jisActualNo, String serialNumber, String vinCode, String jisBackflushStatus) {
this.id = id;
this.jisActualNo = jisActualNo;
this.serialNumber = serialNumber;
this.vinCode = vinCode;
this.jisBackflushStatus = jisBackflushStatus;
}
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesCheckDataCfg;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\18 10:34
* @Modify:
**/
public interface MesCheckDataCfgRepository extends BaseRepository<MesCheckDataCfg, Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesGenerateQcOrder;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: wangjie
* @CreateDate:2019-09-18-17:13
* @Modify:
**/
@Repository
public interface MesGenerateQcOrderRepository extends BaseRepository<MesGenerateQcOrder, Long> {
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderApprovalStatus;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\18 10:34
* @Modify:
**/
public interface MesQcOrderApprovalStatusRepository extends BaseRepository<MesQcOrderApprovalStatus, Long> {
}

18
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java
Unescape Escape View File

@ -0,0 +1,18 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderRecord;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: yiming.gu
* @CreateDate:2019-05-20
* @Modify:
**/
@Repository
public interface MesQcOrderRecordRepository extends BaseRepository<MesQcOrderRecord, Long> {
}

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;
}

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

@ -109,6 +109,10 @@ public class SwebPurchaseOrder extends BaseBean {
@ApiParam(value = "订单来源")
private Integer orderSource;
@Column(name = "IS_EXT_ADD")
@ApiParam(value = "是否追加")
private Integer isExtAdd;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiParam(value = "预计到货时间 开始时间")

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

@ -55,9 +55,9 @@ public class SwebPurchaseOrderDetails extends BaseBean {
@ApiParam(value = "零件名称")
private String partName;
/*@ApiParam(value = "订单类型", example = "1")
@ApiParam(value = "订单类型", example = "1")
@Column(name = "ORDER_TYPE")
public Integer orderType;*/
public Integer orderType;
@ApiParam("零件类型")
@Column(name = "PART_TYPE")

75
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java
Unescape Escape View File

@ -0,0 +1,75 @@
package cn.estsh.i3plus.pojo.sweb.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.Table;
import javax.persistence.Transient;
/**
* @Description : 库存需求报警
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-09-17
* @Modify:
**/
@Data
@Table(name = "SWEB_REQUIRE_ALARM")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("库存需求报警")
public class SwebRequireAlarm extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料代码")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "VENDOR_CODE")
@ApiParam("供应商代码")
private String vendorCode;
@Column(name = "VENDOR_NAME")
@ApiParam("供应商名称")
private String vendorName;
@Column(name = "START_QTY")
@ApiParam("开班库存")
private Double startQty;
@Column(name = "ALARM_LEVEL")
@ApiParam("报警级别")
private String alarmLevel;
@Column(name = "REASON")
@ApiParam("原因分析")
private String reason;
@Column(name = "TRACK_REMARK")
@ApiParam("跟踪情况")
private String trackRemark;
@Column(name = "COUNT_DATE")
@ApiParam("日期")
private Double countDate;
@Transient
@ApiParam("日期")
private String dateStart;
@Transient
@ApiParam("日期")
private String dateEnd;
}

75
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java
Unescape Escape View File

@ -0,0 +1,75 @@
package cn.estsh.i3plus.pojo.sweb.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.Table;
import javax.persistence.Transient;
/**
* @Description : 供应商安全库存
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-09-17
* @Modify:
**/
@Data
@Table(name = "SWEB_VENDOR_STOCK")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("供应商安全库存")
public class SwebVendorStock extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料代码")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "VENDOR_CODE")
@ApiParam("供应商代码")
private String vendorCode;
@Column(name = "VENDOR_NAME")
@ApiParam("供应商名称")
private String vendorName;
@Column(name = "SAFE_TYPE")
@ApiParam("安全库存计算类型")
private Integer safeType;
@Column(name = "SAFE_VALUE")
@ApiParam("计数值")
private String safeValue;
@Column(name = "QTY")
@ApiParam("库存数量")
private Double qty;
@Column(name = "COUNT_MONTH")
@ApiParam("月份")
private String countMonth;
@Column(name = "COUNT_WEEK")
@ApiParam("周")
private String countWeek;
@Transient
@ApiParam("日期")
private String dateStart;
@Transient
@ApiParam("日期")
private String dateEnd;
}

92
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java
Unescape Escape View File

@ -0,0 +1,92 @@
package cn.estsh.i3plus.pojo.sweb.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.Table;
import javax.persistence.Transient;
/**
* @Description : 供应商供货能力
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-09-16
* @Modify:
**/
@Data
@Table(name = "SWEB_VENDOR_SUPPLIER_CAPCITY")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("供应商供货能力")
public class SwebVendorSupplierCapcity extends BaseBean {
private static final long serialVersionUID = 2327910806789997252L;
@Column(name = "VENDOR_CODE")
@ApiParam("供应商代码")
private String vendorCode;
@Column(name = "VENDOR_NAME")
@ApiParam("供应商名称")
private String vendorName;
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "CURRENT_QTY")
@ApiParam("当前库存")
private Double currentQty;
@Column(name = "PLAN_PRODUCT_QTY")
@ApiParam("计划生产或到货")
private Double planProductQty;
@Column(name = "PLAN_REQUEST_QTY")
@ApiParam("计划需求数量")
private Double planRequestQty;
@Column(name = "END_QTY")
@ApiParam("期末库存")
private Double endQty;
@Column(name = "IS_DANGER")
@ApiParam("是否存在风险")
private Integer isDanger;
@Column(name = "DANGER_SPEC")
@ApiParam("风险描述")
private String dangerSpec;
@Column(name = "STATUS")
@ApiParam("状态")
private String status;
@Column(name = "REMARK")
@ApiParam("备注")
private String remark;
@Column(name = "TRACK_DATE")
@ApiParam("日期")
private String trackDate;
@Transient
@ApiParam("日期")
private String dateStart;
@Transient
@ApiParam("日期")
private String dateEnd;
}

16
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebRequireAlarm;
import org.springframework.stereotype.Repository;
/**
* @Description : 库存需求报警
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-09-17
* @Modify:
**/
@Repository
public interface SwebRequireAlarmRepository extends BaseRepository<SwebRequireAlarm, Long> {
}

16
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorStock;
import org.springframework.stereotype.Repository;
/**
* @Description : 供应商安全库存
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-09-17
* @Modify:
**/
@Repository
public interface SwebVendorStockRepository extends BaseRepository<SwebVendorStock, Long> {
}

16
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorSupplierCapcity;
import org.springframework.stereotype.Repository;
/**
* @Description :供应商供货能力
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-09-17
* @Modify:
**/
@Repository
public interface SwebVendorSupplierCapcityRepository extends BaseRepository<SwebVendorSupplierCapcity, Long> {
}

43
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -203,4 +203,47 @@ public class SwebHqlPack {
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(details, result);
}
public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(capcity.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result);
if (!StringUtil.isEmpty(capcity.getDateStart())) {
DdlPreparedPack.getStringBiggerPack(capcity.getDateStart(), "trackDate", result);
}
if (!StringUtil.isEmpty(capcity.getDateEnd())) {
DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result);
}
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(capcity, result);
}
public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(alarm.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
if (!StringUtil.isEmpty(alarm.getDateStart())) {
DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result);
}
if (!StringUtil.isEmpty(alarm.getDateEnd())) {
DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result);
}
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(alarm, result);
}
public static DdlPackBean getSwebVendorStock(SwebVendorStock stock) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(stock.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result);
// if (!StringUtil.isEmpty(alarm.getDateStart())) {
// DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result);
// }
// if (!StringUtil.isEmpty(alarm.getDateEnd())) {
// DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result);
// }
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(stock, result);
}
}

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java
Unescape Escape View File

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : MES_生产计划主表
@ -86,6 +87,10 @@ public class MesPpMaster extends BaseBean{
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS")
private Integer workOrderPlanStatus;
@Transient
@ApiParam("是否要从拉动计算中扣除")
private boolean needMinutPullQty = false;
public Integer getOrderStatus() {
return orderStatus == null ? 0 : this.orderStatus.intValue();
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java
Unescape Escape View File

@ -88,6 +88,11 @@ public class WmsCSRange extends BaseBean {
@AnnoOutputColumn(hidden = true)
public String areaNo;
@Transient
@ApiParam("存储区")
@AnnoOutputColumn(hidden = true)
public String basZoneNo;
public WmsCSRange(){}
public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
@ -96,8 +101,9 @@ public class WmsCSRange extends BaseBean {
this.partNameRdd = partNameRdd;
}
public WmsCSRange(String zoneNo, String areaNo, String partNo, String partNameRdd) {
public WmsCSRange(String zoneNo, String basZoneNo, String areaNo, String partNo, String partNameRdd) {
this.zoneNo = zoneNo;
this.basZoneNo = basZoneNo;
this.areaNo = areaNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
Unescape Escape View File

@ -242,12 +242,16 @@ public class WmsDocMovementMaster extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
public Integer pickingOrderStatus;
/**
* 备注2
**/
@Column(name = "SECONDARY_REMAKE")
@ApiParam(value = "备注2")
@ApiParam(value = "单据原因")
private String secondaryRemake;
/**备注3**/
@Column(name = "THIRD_REMAKE")
@ApiParam(value = "备注3")
@ApiParam(value = "客户类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue")
private String thirdRemake;

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

@ -265,6 +265,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
@ApiParam(value = "jis料架号")
private String queueGroupNo;
@Transient
@ApiParam(value = "来源存储区/目标存储区")
private Integer srcOrDestZoneno;
public Integer getIsSnapshot() {
return isSnapshot == null ? 0 : isSnapshot.intValue();
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
Unescape Escape View File

@ -401,4 +401,12 @@ public class WmsMoveSn extends BaseBean {
this.srcSnStatus = srcSnStatus;
this.destSnStatus = destSnStatus;;
}
public WmsMoveSn(String sn, String refSrc, String transTypeName, Integer itemStatus) {
this.sn = sn;
this.refSrc = refSrc;
this.transTypeName = transTypeName;
this.itemStatus = itemStatus;
}
}

35
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
Unescape Escape View File

@ -9,7 +9,11 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
@ -154,6 +158,12 @@ public class WmsStockQuan extends BaseBean {
@Transient
private Integer isSnapshot;
@Transient
@ApiParam(value = "应有数量")
private Double theoryQty;
public Integer getIsSnapshot() {
return this.isSnapshot == null ? 0 : this.isSnapshot;
}
@ -229,11 +239,34 @@ public class WmsStockQuan extends BaseBean {
this.freezeQty = freezeQty;
this.consignQty = consignQty;
this.lockQty = lockQty;
this.sumQty = sumQty;
this.prodCfgTypeCode = prodCfgTypeCode;
this.prodCfgTypeName = prodCfgTypeName;
this.scrapQty = scrapQty;
}
public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName,
Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
this.organizeCode = organizeCode;
this.whNo = whNo;
this.zoneNo = zoneNo;
this.unit = unit;
this.partNo = partNo;
this.partNameRdd = partName;
this.qty = qty;
this.failQty = failQty;
this.holdQty = holdQty;
this.qcQty = qcQty;
this.rinQty = rinQty;
this.freezeQty = freezeQty;
this.consignQty = consignQty;
this.lockQty = lockQty;
this.totalQty = totalQty;
this.prodCfgTypeCode = prodCfgTypeCode;
this.prodCfgTypeName = prodCfgTypeName;
this.scrapQty = scrapQty;
}
public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
this.qty = qty;
this.failQty = failQty;

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

@ -520,6 +520,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam("物料库位")
private String partLocateNo;
@Transient
@ApiParam("数量检查")
private Integer checkQyt;
public WmsStockSn() {
}

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java
Unescape Escape View File

@ -72,13 +72,18 @@ public class WmsWorkCenter extends BaseBean {
searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String descLocationCode;
/**
* 分钟
**/
@Column(name = "ADVANCE_PULL_TIMES", columnDefinition = "int default 0")
@Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180")
@ApiParam(value = "提前拉动时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer advancePullTimes;
private Integer preReadyMinute;
@Column(name = "PULL_RANGE_MINUTE", columnDefinition = "int default 180")
@ApiParam(value = "拉动区间时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer pullRangeMinute;
@Column(name = "NEXT_PULL_TIME", columnDefinition = "varchar(50) default '' ")
@ApiParam(value = "下次拉动时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private String nextPullTime;
}

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java
Unescape Escape View File

@ -11,7 +11,8 @@ public class WmsInterfaceEnumUtil {
MES2WMS(30, "MES2WMS", "MES --> WMS"),
WMS2MES(40, "WMS2MES", "WMS --> MES"),
SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"),
WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB");
WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"),
SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB");
private int value;
private String name;

18
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -1203,11 +1203,20 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean);
//实时库存待处理数据
if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && !StringUtil.isEmpty(wmsMoveDetails.getZoneNo())) {
List<String> columnNames = new ArrayList<>();
columnNames.add("srcZoneNo");
columnNames.add("destZoneNo");
DdlPreparedPack.getMultOrPackString(wmsMoveDetails.getZoneNo(), columnNames, null, packBean);
DdlPreparedPack.getNumEqualPack(WmsEnumUtil.MOVE_ORDER_STATUS.BE_HANDLE.getValue(), "itemStatus", packBean);
} else {
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean);
}
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean);
DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", packBean);
DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", packBean);
@ -1352,6 +1361,9 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
}
if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) {
wmsStockSn.setQualityDateTimeStart("");
}

Write Preview
Loading…
Cancel
Save