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

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

Browse Source
yun-zuoyi
陈思洁 5 years ago
parent a3100a71e5 3d5729e28b
commit 82ae09d2a8
16 changed files with 495 additions and 36 deletions
Show Stats Download Patch File Download Diff File

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

@ -7665,4 +7665,41 @@ public class MesEnumUtil {
return tmp;
}
}
/**
* 控制计划审核状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CONTROL_PLAN_AUDIT_TYPE {
WAIT_AUDIT(10, "待审核"),
AUDIT_PASS(20, "审核通过"),
AUDIT_NON_PASS(30, "审核驳回");
private int value;
private String description;
CONTROL_PLAN_AUDIT_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;
}
}
}

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

@ -26,30 +26,39 @@ import java.io.Serializable;
@Table(name = "MES_CONTROL_PLAN")
@Api("中航控制计划主表")
public class MesControlPlan extends BaseBean implements Serializable {
//1. 主表字段：“产线”、“产品”、“客户”、“版本号”、“是否生效”、“状态（编辑中、待审核、已审核）”组成。（主表命名“控制计划”）
private static final long serialVersionUID = 1454433409471781390L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
// @Column(name = "WORK_CELL_CODE")
// @ApiParam("工作单元代码")
// private String workCellCode;
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "product_name")
@ApiParam("产品名称")
private String productName;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_NAME")
@ApiParam("客户名称")
private String custName;
@Column(name = "VERSION")
@ApiParam("版本号")
private String version;
private Integer version;
@Column(name = "AUDIT_TYPE")
@ApiParam("审核状态")
private Integer auditType;
@Column(name = "IS_ENABLE")
@ApiParam("是否启用")
private Integer isEnable;
@Column(name = "EDIT_TYPE")
@ApiParam("编辑状态")
private Integer editType;
}

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

@ -34,18 +34,18 @@ public class MesQualityStandard extends BaseBean implements Serializable {
@ApiParam("控制计划表主键ID")
private Long controlPlanId;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "VERSION")
@ApiParam("版本")
private String version;
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
private Integer version;
//检测类型：10=首检，20=巡检，30=终检，40=发运检
@Column(name = "CHECK_TYPE")
@ApiParam("检测类型")
private Integer CHECK_TYPE;
private Integer checkType;
@Column(name = "CHECK_ITEM_TYPE")
@ApiParam("检测项类型")
@ -87,17 +87,17 @@ public class MesQualityStandard extends BaseBean implements Serializable {
//任务单类型,动态枚举
@Column(name = "CHECK_ORDER_TYPE")
@ApiParam("任务单类型")
private String CHECK_ORDER_TYPE;
private String checkOrderType;
//数据来源：10=手工录入，20=PLC，30=DB
@Column(name = "DATA_SOURCE")
@ApiParam("数据来源")
private String DATA_SOURCE;
private String dataSource;
//检验值类型：10=字符串，20=数值
@Column(name = "CHECK_VALUE_TYPE")
@ApiParam("检验值类型")
private String CHECK_VALUE_TYPE;
private String checkValueType;
@Column(name = "DIFFERENCE_MAX_LIMIT")
@ApiParam("公差上限")
@ -109,10 +109,10 @@ public class MesQualityStandard extends BaseBean implements Serializable {
@Column(name = "IS_KEY_CHECK_ITEM")
@ApiParam("是否关键检测项")
private Integer IS_KEY_CHECK_ITEM;
private Integer isKeyCheckItem;
@Column(name = "CHECK_CFG_NO")
@ApiParam("检测值配置编号")
private String CHECK_CFG_NO;
private String checkCfgNo;
}

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

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description:
* @CreateDate: 2020/9/29
* @Author: simon.song
*/
@Data
public class MesControlPlanModel {
@ApiParam("控制计划主键ID")
private Long id;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("物料编码")
private String partNo;
@ApiParam("物料名称")
private String partName;
@ApiParam("客户代码")
private String custCode;
@ApiParam("客户名称")
private String custName;
@ApiParam("版本号")
private Integer version;
@ApiParam("审核状态")
private Integer auditType;
@ApiParam("是否启用")
private Integer isEnable;
@ApiParam("质量标准数组")
private List<MesQualityStandardModel> standardList;
}

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

@ -0,0 +1,136 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* @Description: 控制计划导入模板
* @CreateDate: 2020/9/29
* @Author: simon.song
*/
@Data
@Api(value="控制计划导入模板",description = "控制计划导入模板")
public class MesControlPlanTemplateModel extends BaseBean {
private static final long serialVersionUID = 6846982556729401884L;
@ApiParam("工作中心代码")
@AnnoOutputColumn
private String workCenterCode;
@ApiParam("物料编码")
@AnnoOutputColumn
private String partNo;
@ApiParam("物料名称")
@AnnoOutputColumn
private String partName;
@ApiParam("客户代码")
@AnnoOutputColumn
private String custCode;
@ApiParam("客户名称")
@AnnoOutputColumn
private String custName;
@ApiParam("控制计划版本号")
@AnnoOutputColumn
private Integer controlPlanVersion;
@ApiParam("是否启用")
@AnnoOutputColumn
private Integer isEnable;
// @Column(name = "IS_ENABLE")
// @ApiParam("是否启用")
// private Integer isEnable;
@ApiParam("工作单元代码")
@AnnoOutputColumn
private String workCellCode;
@ApiParam("质量标准版本")
@AnnoOutputColumn
private Integer qualityStandardVersion;
//检测类型：10=首检，20=巡检，30=终检，40=发运检
@ApiParam("检测类型")
@AnnoOutputColumn
private Integer checkType;
@ApiParam("检测项类型")
@AnnoOutputColumn
private String checkItemType;
@ApiParam("检测项")
@AnnoOutputColumn
private String checkItem;
@ApiParam("检测标准")
@AnnoOutputColumn
private String checkStandard;
@ApiParam("检测指导")
@AnnoOutputColumn
private String checkGuide;
@ApiParam("频率")
@AnnoOutputColumn
private String checkFrequency;
@ApiParam("是否允许让步")
@AnnoOutputColumn
private String isConcession;
@ApiParam("间隔时间")
@AnnoOutputColumn
private String checkInterval;
//个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
@ApiParam("个数标识")
@AnnoOutputColumn
private String numberFlag;
@ApiParam("检测数量")
@AnnoOutputColumn
private Integer qty;
//任务单类型,动态枚举
@ApiParam("任务单类型")
@AnnoOutputColumn
private String checkOrderType;
//数据来源：10=手工录入，20=PLC，30=DB
@ApiParam("数据来源")
@AnnoOutputColumn
private String dataSource;
//检验值类型：10=字符串，20=数值
@ApiParam("检验值类型")
@AnnoOutputColumn
private String checkValueType;
@ApiParam("公差上限")
@AnnoOutputColumn
private BigDecimal differenceMaxLimit;
@ApiParam("公差下限")
@AnnoOutputColumn
private BigDecimal differenceMinLimit;
@ApiParam("是否关键检测项")
@AnnoOutputColumn
private Integer isKeyCheckItem;
@ApiParam("检测值配置编号")
@AnnoOutputColumn
private String checkCfgNo;
}

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

@ -0,0 +1,83 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.math.BigDecimal;
/**
* @Description:
* @CreateDate: 2020/9/29
* @Author: simon.song
*/
@Data
public class MesQualityStandardModel {
@ApiParam("质量标准主键ID")
private Long id;
@ApiParam("控制计划表主键ID")
private Long controlPlanId;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("版本")
private Integer version;
//检测类型：10=首检，20=巡检，30=终检，40=发运检
@ApiParam("检测类型")
private Integer checkType;
@ApiParam("检测项类型")
private String checkItemType;
@ApiParam("检测项")
private String checkItem;
@ApiParam("检测标准")
private String checkStandard;
@ApiParam("检测指导")
private String checkGuide;
@ApiParam("频率")
private String checkFrequency;
@ApiParam("是否允许让步")
private String isConcession;
@ApiParam("间隔时间")
private String checkInterval;
//个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
@ApiParam("个数标识")
private String numberFlag;
@ApiParam("检测数量")
private Integer qty;
//任务单类型,动态枚举
@ApiParam("任务单类型")
private String checkOrderType;
//数据来源：10=手工录入，20=PLC，30=DB
@ApiParam("数据来源")
private String dataSource;
//检验值类型：10=字符串，20=数值
@ApiParam("检验值类型")
private String checkValueType;
@ApiParam("公差上限")
private BigDecimal differenceMaxLimit;
@ApiParam("公差下限")
private BigDecimal differenceMinLimit;
@ApiParam("是否关键检测项")
private Integer isKeyCheckItem;
@ApiParam("检测值配置编号")
private String checkCfgNo;
}

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

@ -3389,4 +3389,27 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean);
return packBean;
}
public static DdlPackBean getControlPlan(MesControlPlan controlPlan) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(controlPlan.getOrganizeCode(), controlPlan.getIsValid());
if (!StringUtils.isEmpty(controlPlan.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCenterCode(), "workCenterCode", packBean);
}
// if (!StringUtils.isEmpty(controlPlan.getWorkCellCode())) {
// DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCellCode(), "workCellCode", packBean);
// }
if (!StringUtils.isEmpty(controlPlan.getPartNo())) {
DdlPreparedPack.getStringEqualPack(controlPlan.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(controlPlan.getCustCode())) {
DdlPreparedPack.getStringEqualPack(controlPlan.getCustCode(), "custCode", packBean);
}
if (!StringUtils.isEmpty(controlPlan.getVersion())) {
DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getVersion(), "version", packBean);
}
if (!StringUtils.isEmpty(controlPlan.getAuditType())) {
DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getAuditType(), "auditType", packBean);
}
return packBean;
}
}

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

@ -0,0 +1,65 @@
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;
/**
* @Description : 供应商报警单
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-09-27
* @Modify:
**/
@Data
@Table(name = "SWEB_VENDOR_ALARM")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("供应商报警单")
public class SwebVendorAlarm 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 = "ALARM_CONTENT")
@ApiParam("报警内容")
private String alarmContent;
@Column(name = "ALARM_LEVEL")
@ApiParam("报警级别")
private Integer alarmLevel;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "ORDER_NO")
@ApiParam("订单号")
private String orderNo;
@Column(name = "PART_SPEC")
@ApiParam("物料描述")
private String partSpec;
}

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

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorAlarm;
import org.springframework.stereotype.Repository;
@Repository
public interface SwebVendorAlarmRepository extends BaseRepository<SwebVendorAlarm, Long> {
}

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

@ -204,9 +204,13 @@ public class SwebHqlPack {
return buildHql(details, result);
}
public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity) {
public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List<String> vendorCodes) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(capcity.getVendorCode(), "vendorCode", result);
if (vendorCodes.size() == 1) {
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
} else if (vendorCodes.size() > 1){
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
}
DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result);
if (!StringUtil.isEmpty(capcity.getDateStart())) {
@ -219,9 +223,13 @@ public class SwebHqlPack {
return buildHql(capcity, result);
}
public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm) {
public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List<String> vendorCodes) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(alarm.getVendorCode(), "vendorCode", result);
if (vendorCodes.size() == 1) {
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
} else if (vendorCodes.size() > 1){
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
}
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
if (!StringUtil.isEmpty(alarm.getDateStart())) {
DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result);
@ -233,17 +241,28 @@ public class SwebHqlPack {
return buildHql(alarm, result);
}
public static DdlPackBean getSwebVendorStock(SwebVendorStock stock) {
public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List<String> vendorCodes) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(stock.getVendorCode(), "vendorCode", result);
if (vendorCodes.size() == 1) {
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
} else if (vendorCodes.size() > 1){
DdlPreparedPack.getInPackList(vendorCodes, "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);
}
public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List<String> vendorCodes) {
DdlPackBean result = new DdlPackBean();
if (vendorCodes.size() == 1) {
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
} else if (vendorCodes.size() > 1){
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
}
DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(alarm, result);
}
}

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

@ -112,7 +112,7 @@ public class WmsCSOrderDetails extends BaseBean {
@ApiParam(value = "供应商编码")
public String vendorNo;
@Column(name = "LOT_NO", nullable = false)
@Column(name = "LOT_NO")
@ColumnDefault("")
@ApiParam("收货批次")
public String lotNo = "";

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

@ -344,6 +344,9 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "子位置号")
private String itemSeqNo;
@ApiParam(value = "最早需求时间")
private String firstTime;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
}

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

@ -348,4 +348,13 @@ public class WmsPart extends BaseBean {
this.qty = cqty;
this.createDatetime = createDateTime;
}
public WmsPart(String partNo, String partName, String inLocateNo, String stockUnit, Double snp, String partSpec) {
this.partNo = partNo;
this.partName = partName;
this.inLocateNo = inLocateNo;
this.stockUnit = stockUnit;
this.snp = snp;
this.partSpec = partSpec;
}
}

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

@ -52,4 +52,8 @@ public class WmsPrintingQueue extends BaseBean{
@Column(name="PRINT_STATUS")
@ApiParam("打印状态")
private Integer printStatus;
@Column(name="VENDOR_NO")
@ApiParam("供应商编码")
private String vendorNo;
}

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

@ -126,6 +126,10 @@ public class WmsQCMaster extends BaseBean {
@ApiParam(value = "零件名称")
public String partNameRdd;
@Transient
@ApiParam(value = "收货数量")
public Double qty;
public int getOrderStatusVal() {
return this.orderStatus == null ? 0 : this.orderStatus;
}
@ -152,4 +156,16 @@ public class WmsQCMaster extends BaseBean {
this.partNameRdd = partNameRdd;
this.createDatetime = createDatetime;
}
public WmsQCMaster(String orderNo, Double qty, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) {
this.orderNo = orderNo;
this.qty = qty;
this.vendorNo = vendorNo;
this.VendorDesc = VendorDesc;
this.refType = refType;
this.refSrc = refSrc;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.createDatetime = createDatetime;
}
}

2
sonar-project.properties
Unescape Escape View File

@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
# defaults to project key
sonar.projectName=i3plus-pojo
# defaults to 'not provided'
sonar.projectVersion=1.0-DEV-SNAPSHOT
sonar.projectVersion=1.0-TEST-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./

Write Preview
Loading…
Cancel
Save