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

Merge branch 'dev' into test

Browse Source
yun-zuoyi
王杰 6 years ago
parent 57253ea87b b15c3f4ae7
commit 1a7164c474
30 changed files with 806 additions and 45 deletions
Show Stats Download Patch File Download Diff File

7
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
Unescape Escape View File

@ -30,6 +30,7 @@ import java.util.List;
public class Resource extends BaseCode {
@Column(name="BOTTLENECK")
@ApiParam(value ="是否瓶颈资源")
@FieldAnnotation(defaultValue = "false")
private Boolean bottleneck;
@Column(name="TYPE")
@ -60,11 +61,11 @@ public class Resource extends BaseCode {
private Double maxProduceBatch;
@Column(name="TIME_TAIL_ADJUST")
@ApiParam(value ="时间尾数调整")
@ApiParam(value ="时间尾数圆整")
private String timeTailAdjust;
@Column(name="TIME_ADJUST")
@ApiParam(value ="时间调整")
@ApiParam(value ="时间圆整")
private String timeAdjust;
@Column(name="MAX_PREV_SD_TIME")
@ -80,7 +81,7 @@ public class Resource extends BaseCode {
private String maxPostSdTime;
@Column(name="ROUND_TYPE")
@ApiParam(value ="时间与时间尾数圆整类型")
@ApiParam(value ="圆整类型")
@FieldAnnotation(defaultValue = "ROUNDING")
private ApsEnumUtil.TIME_ROUND_TYPE roundType;

28
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java
Unescape Escape View File

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :流水号，补充生产订单和采购订单时自动生成编码
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_SERIAL_NUMBER")
@Api("取消计划规则")
public class SerialNumber extends BaseAPS {
@Column(name="NUMBER")
@ApiParam(value ="流水号")
private Integer number;
}

49
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
Unescape Escape View File

@ -359,30 +359,31 @@ public class BeanRelation {
*
* @param bean
*/
public static void delete(BaseBean bean) {
if (bean == null) {
return;
}
BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
List<Enum<?>> ownerSigns = beanInfo.getOwnerHolders();
for (Enum<?> holder : ownerSigns) {
List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
for (BaseBean relaBean : relaBeans) {
//MemoryManager.delete(relaBean);
}
}
List<Enum<?>> normalSigns = beanInfo.getNormalSigns();
for (Enum<?> holder : normalSigns) {
Enum<?> reverseHolder = beanInfo.getReverseHolder(holder);
List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
for (BaseBean relaBean : relaBeans) {
if (reverseHolder != null) {
remove(relaBean, reverseHolder, bean);
}
}
}
}
// public static void delete(BaseBean bean) {
// if (bean == null) {
// return;
// }
// BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
// List<Enum<?>> ownerSigns = beanInfo.getOwnerHolders();
// for (Enum<?> holder : ownerSigns) {
// Class<? extends BaseBean> relaCls = beanInfo.getRelationInfo(holder).getBeanInfo().getBeanClass();
// List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
// for (BaseBean relaBean : relaBeans) {
// //MemoryManager.delete(relaBean);
// }
// }
//
// List<Enum<?>> normalSigns = beanInfo.getNormalSigns();
// for (Enum<?> holder : normalSigns) {
// Enum<?> reverseHolder = beanInfo.getReverseHolder(holder);
// List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
// for (BaseBean relaBean : relaBeans) {
// if (reverseHolder != null) {
// remove(relaBean, reverseHolder, bean);
// }
// }
// }
// }
/**
* 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。

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

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.SerialNumber;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ISerialNumberRepository extends CrudRepository<SerialNumber, Long> {
}

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

@ -13,6 +13,43 @@ import org.apache.commons.lang3.StringUtils;
public class MesPcnEnumUtil {
/**
* 接口同步状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IF_SYNC_STATUS {
NO_SYNC(10, "未同步"),
ALREADY_SYNC(20, "已同步"),
FAIL_SYNC(30, "同步失败");
private int value;
private String description;
IF_SYNC_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;
}
}
/**
* 条码类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

99
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java
Unescape Escape View File

@ -0,0 +1,99 @@
package cn.estsh.i3plus.pojo.mes.pcn.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 java.math.BigDecimal;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\14 19:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_DISMENTLE_RECORD")
@Api("物料拆解表")
public class IfDismantleRecord extends BaseBean {
@Column(name = "DISMANTLE_ID")
@ApiParam("拆解编号")
private String dismantleId;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "PARENT_PART_NO")
@ApiParam("产品物料编码")
private String parentPartNo;
@Column(name = "PARENT_PART_NAME")
@ApiParam("产品物料名称")
private String parentPartName;
@Column(name = "SN")
@ApiParam("产品条码")
private String sn;
@Column(name = "QTY")
@ApiParam("产品数量")
private Integer qty;
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")
private BigDecimal dismantleQty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子物料编码")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("子物料名称")
private String itemPartName;
@Column(name = "OK_QTY")
@ApiParam("合格数")
private BigDecimal okQty;
@Column(name = "MISS_QTY")
@ApiParam("缺失数")
private BigDecimal missQty;
@Column(name = "SCRAP_QTY")
@ApiParam("报废数")
private BigDecimal scrapQty;
@Column(name = "LOT_NO")
@ApiParam("批次")
private String lotNo;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

94
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java
Unescape Escape View File

@ -0,0 +1,94 @@
package cn.estsh.i3plus.pojo.mes.pcn.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: joke.wang
* @CreateDate: 2019\11\15 10:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PACKAGE_DETAIL")
@Api("包装明细表")
public class IfPackageDetail extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PACKAGE_NO")
@ApiParam("包装条码")
private String packageNo;
@Column(name = "LOT_NO")
@ApiParam("包装批次")
private String lotNo;
@Column(name = "QTY")
@ApiParam("数量")
private String qty;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编号2")
private String packageNo2;
@Column(name = "PACKAGE_NO3")
@ApiParam("包装编号3")
private String packageNo3;
@Column(name = "PACKAGE_NO4")
@ApiParam("包装编号4")
private String packageNo4;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private String actionDateTime;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

86
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java
Unescape Escape View File

@ -0,0 +1,86 @@
package cn.estsh.i3plus.pojo.mes.pcn.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: joke.wang
* @CreateDate: 2019\11\15 10:12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PRODUCT_OFF_LINE")
@Api("生产报工表")
public class IfProductOffLine extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "PACKAGE_NO")
@ApiParam("包装条码")
private String packageNo;
@Column(name = "QTY")
@ApiParam("数量")
private String qty;
@Column(name = "UNIT")
@ApiParam("单位")
private String unit;
@Column(name = "LOT_NO")
@ApiParam("生产批次")
private String lotNo;
@Column(name = "FIX_LOT_NO")
@ApiParam("特殊批次")
private String fixLotNo;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private String actionDateTime;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

38
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java
Unescape Escape View File

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.mes.pcn.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: joke.wang
* @CreateDate: 2019\11\13 11:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION_IF")
@Api("动作接口配置")
public class MesActionIf extends BaseBean {
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

9
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java
Unescape Escape View File

@ -12,6 +12,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.math.BigDecimal;
/**
* @Description:
@ -59,7 +60,7 @@ public class MesDismantleRecord extends BaseBean {
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")
private Integer dismantleQty;
private BigDecimal dismantleQty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子物料编码")
@ -71,15 +72,15 @@ public class MesDismantleRecord extends BaseBean {
@Column(name = "OK_QTY")
@ApiParam("合格数")
private Integer okQty;
private BigDecimal okQty;
@Column(name = "MISS_QTY")
@ApiParam("缺失数")
private Integer missQty;
private BigDecimal missQty;
@Column(name = "SCRAP_QTY")
@ApiParam("报废数")
private Integer scrapQty;
private BigDecimal scrapQty;
@Column(name = "MEMO")
@ApiParam("备注")

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

@ -55,6 +55,10 @@ public class MesPackage extends BaseBean {
@ApiParam("批号")
private String lotNo;
@Column(name = "FIX_LOT_NO")
@ApiParam("特殊批号")
private String fixLotNo;
@Column(name = "PACK_SPEC")
@ApiParam("包装规格")
private String packSpec;

2
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java
Unescape Escape View File

@ -32,7 +32,7 @@ public class MesPackageTravel extends BaseBean {
private String packageNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "OP_TYPE")

3
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java
Unescape Escape View File

@ -34,6 +34,9 @@ public class ProdPackageModel {
@ApiParam("班次")
private String shiftCode;
@ApiParam("班次名称")
private String shiftName;
@ApiParam("物料号")
private String partNo;

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

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

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.IfPackageDetail;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\15 17:47
* @Modify:
**/
public interface IfPackageDetailRepository extends BaseRepository<IfPackageDetail, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.IfProductOffLine;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\15 17:48
* @Modify:
**/
public interface IfProductOffLineRepository extends BaseRepository<IfProductOffLine, Long> {
}

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

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

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

@ -0,0 +1,99 @@
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.Table;
import java.math.BigDecimal;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\14 19:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_DISMENTLE_RECORD")
@Api("物料拆解表")
public class IfDismantleRecord extends BaseBean {
@Column(name = "DISMANTLE_ID")
@ApiParam("拆解编号")
private String dismantleId;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "PARENT_PART_NO")
@ApiParam("产品物料编码")
private String parentPartNo;
@Column(name = "PARENT_PART_NAME")
@ApiParam("产品物料名称")
private String parentPartName;
@Column(name = "SN")
@ApiParam("产品条码")
private String sn;
@Column(name = "QTY")
@ApiParam("产品数量")
private Integer qty;
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")
private BigDecimal dismantleQty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子物料编码")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("子物料名称")
private String itemPartName;
@Column(name = "OK_QTY")
@ApiParam("合格数")
private BigDecimal okQty;
@Column(name = "MISS_QTY")
@ApiParam("缺失数")
private BigDecimal missQty;
@Column(name = "SCRAP_QTY")
@ApiParam("报废数")
private BigDecimal scrapQty;
@Column(name = "LOT_NO")
@ApiParam("批次")
private String lotNo;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

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

@ -0,0 +1,94 @@
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.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\15 10:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PACKAGE_DETAIL")
@Api("包装明细表")
public class IfPackageDetail extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PACKAGE_NO")
@ApiParam("包装条码")
private String packageNo;
@Column(name = "LOT_NO")
@ApiParam("包装批次")
private String lotNo;
@Column(name = "QTY")
@ApiParam("数量")
private String qty;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编号2")
private String packageNo2;
@Column(name = "PACKAGE_NO3")
@ApiParam("包装编号3")
private String packageNo3;
@Column(name = "PACKAGE_NO4")
@ApiParam("包装编号4")
private String packageNo4;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private String actionDateTime;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

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

@ -0,0 +1,86 @@
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.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\15 10:12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PRODUCT_OFF_LINE")
@Api("生产报工表")
public class IfProductOffLine extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "PACKAGE_NO")
@ApiParam("包装条码")
private String packageNo;
@Column(name = "QTY")
@ApiParam("数量")
private String qty;
@Column(name = "UNIT")
@ApiParam("单位")
private String unit;
@Column(name = "LOT_NO")
@ApiParam("生产批次")
private String lotNo;
@Column(name = "FIX_LOT_NO")
@ApiParam("特殊批次")
private String fixLotNo;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private String actionDateTime;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
/**
* @Description :设备通知对象配置
@ -37,10 +34,12 @@ public class MesEquNotifyObjectCfg extends BaseBean {
@ApiParam("对象名称")
private String notifyObjectName;
@Lob
@Column(name="NOTIFY_OBJECT_VALUE")
@ApiParam("对象值")
private String notifyObjectValue;
@Lob
@Column(name="NOTIFY_OBJECT_VALUE_RDD")
@ApiParam("对象值")
private String notifyObjectValueRdd;

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

@ -55,6 +55,10 @@ public class MesPackage extends BaseBean {
@ApiParam("批号")
private String lotNo;
@Column(name = "FIX_LOT_NO")
@ApiParam("特殊批号")
private String fixLotNo;
@Column(name = "PACK_SPEC")
@ApiParam("包装规格")
private String packSpec;

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

@ -32,7 +32,7 @@ public class MesPackageTravel extends BaseBean {
private String packageNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "OP_TYPE")

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

@ -818,6 +818,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(customerPart.getCustomerPartNo())) {
DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean);
}
if (!StringUtils.isEmpty(customerPart.getCustomerPartName())) {
DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartName(), "customerPartName", packBean);
}
return packBean;
}

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

@ -190,6 +190,10 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam(value = "车号")
private String carNo;
@Column(name = "CONSIGNATION")
@ApiParam("是否寄售 1-是 2-否")
private Integer consignation;
public Integer getIsSnapshot() {
return isSnapshot == null ? 0 : isSnapshot.intValue();
}

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

@ -196,6 +196,10 @@ public class WmsMoveSn extends BaseBean {
@Transient
private Integer isSnapshot;
@Column(name = "CONSIGNATION")
@ApiParam("是否寄售 1-是 2-否")
private Integer consignation;
public Integer getIsSnapshot() {
return isSnapshot == null ? 0 : isSnapshot.intValue();
}

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

@ -67,6 +67,11 @@ public class WmsPoSn extends BaseBean {
@Column(name="SN_STATUS")
@ApiParam(value = "状态", example = "10")
public Integer snStatus;
/**
* 质量:10-合格 20-不合格 30-隔离 40-报废
*/
@ApiParam(value = "质量状态", example = "10")
public Integer qcStatus;
@Column(name="PACKAGE")
@ApiParam("包装名称")

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

@ -61,14 +61,6 @@ public class WmsRoutingRule extends BaseBean {
@ApiParam(value = "目标存储区" , example = "2")
private String destZoneNo;
@Column(name = "OP_TYPE_CODE")
@ApiParam(value = "作业类型" , example = "2")
private String opTypeCode;
@Column(name = "TRANS_TYPE_CODE")
@ApiParam(value = "交易类型" , example = "1")
private String transTypeCode;
@Column(name = "DEST_OP_TYPE_CODE")
@ApiParam(value = "目标作业类型" , example = "2")
private String destOpTypeCode;
@ -77,6 +69,14 @@ public class WmsRoutingRule extends BaseBean {
@ApiParam(value = "目标交易类型" , example = "1")
private String destTransTypeCode;
@Column(name = "SRC_OP_TYPE_CODE")
@ApiParam(value = "源作业类型" , example = "2")
private String srcOpTypeCode;
@Column(name = "SRC_TRANS_TYPE_CODE")
@ApiParam(value = "源交易类型" , example = "1")
private String srcTransTypeCode;
@Column(name = "DEST_SN_STATUS")
@ApiParam(value = "目标条码状态" , example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")

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

@ -274,6 +274,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam("批次校验规则")
private String lotCheckRule;
@Column(name = "CONSIGNATION")
@ApiParam("是否寄售 1-是 2-否")
private Integer consignation;
public WmsStockSn() {
}

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

@ -1510,7 +1510,9 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result);
DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result);

Write Preview
Loading…
Cancel
Save