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
钮海涛 6 years ago
parent bd834a24cb 759f9ee819
commit f85dd4cbe5
10 changed files with 336 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -1134,4 +1134,51 @@ public class CommonEnumUtil {
// 数据未删除的静态常量
public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
/**
* 日志记录方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOG_DETAIL_SHOW_TYPE {
DEBUG(1, "DEBUG"),
OVER_TIME(2, "记录超时服务"),
ALL_METHOD(3, "所有服务"),
ALL_METHOD_PARAMETER(4, "所有服务和入参");
private int value;
private String description;
private LOG_DETAIL_SHOW_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

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

@ -12,6 +12,121 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* Mes 客户订单来源
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CUST_ORDER_SOURCE {
MES("MES", "来源于MES"),
SAP("SAP", "来源于SAP");
private String value;
private String description;
CUST_ORDER_SOURCE(String value, String description) {
this.value = value;
this.description = description;
}
public String 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.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesCustOrder 订单类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CUST_ORDER_TYPE {
STANDARD(10, "标准");
private int value;
private String description;
CUST_ORDER_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;
}
}
/**
* MesCustOrder实体对应的status值 状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CUST_ORDER_STATUS {
CREATE(10, "CREATED", "创建"),
DEAL(20, "DEAL", "已处理"),
CLOSE(30, "CLOSE", "关闭");
private int value;
private String code;
private String description;
CUST_ORDER_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
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;
}
}
/**
* MesProductEncodeCfg 匹配类型
*/
@ -737,7 +852,8 @@ public class MesEnumUtil {
MES_PLAN_ORDER(10, "生产计划"),
MES_EQUIPMENT(20, "设备台账"),
MES_EQU_TASK_STANDARD(30, "设备作业要求");
MES_EQU_TASK_STANDARD(30, "设备作业要求"),
MES_CUST_ORDER(40, "客户订单");
private int value;
private String description;
@ -2595,7 +2711,9 @@ public class MesEnumUtil {
PCN_PULL(60, "PCN_PULL"),
PCN_PUSH(70, "PCN_PUSH"),
FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
REWORK_REPAIR(90, "REWORK_REPAIR");
REWORK_REPAIR(90, "REWORK_REPAIR"),
PCN_LOGIN(100, "PCN_LOGIN"),
PCN_MENU(110, "PCN_MENU");
private int value;
private String description;

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

@ -625,7 +625,9 @@ public class WmsEnumUtil {
VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"),
VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"),
VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
VDA_QC(290, "VDA_QC", "VDA质检");
VDA_QC(290, "VDA_QC", "VDA质检"),
VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"),
VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并");
private int value;
@ -804,7 +806,10 @@ public class WmsEnumUtil {
VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"),
VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"),
VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
VDA_SN_("VDA_SN_MERGE", "VDA条码合并");
VDA_SN_("VDA_SN_MERGE", "VDA条码合并"),
VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询");
private String value;
private String description;

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

@ -85,6 +85,10 @@ public class MesDismantleRecord extends BaseBean {
@ApiParam("备注")
private String memo;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Transient
private String serialNumber;
}

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

@ -10,10 +10,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.*;
import java.util.List;
/**
@ -49,13 +46,13 @@ public class MesPcnSysUserOffline extends BaseBean {
@ApiParam(value = "登陆名称", access = "登陆名称")
private String loginName;
@Column(name = "ORGANIZE_ID")
@ApiParam(value = "部门ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
private Integer userType;
@Column(name = "ORGANIZE_NAME")
@ApiParam(value = "部门名称", access = "部门名称")
private String organizeName;
@Lob
@Column(name="MENU_LIST")
@ApiParam(value ="菜单" , access ="菜单")
private String menuList;
}

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

@ -46,11 +46,13 @@ public class MesProdBindRecordModel {
private String modifyDatetime;
@ApiParam("产品条码")
private String serialNumber;
@ApiParam("关联批次")
private String lotNo;
public MesProdBindRecordModel() {
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) {
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
@ -64,9 +66,10 @@ public class MesProdBindRecordModel {
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
this.dismantleQty = dismantleQty;
this.lotNo = lotNo;
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName) {
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String lotNo) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
@ -80,9 +83,10 @@ public class MesProdBindRecordModel {
this.kpSn = kpSn;
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
this.lotNo = lotNo;
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) {
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
@ -101,9 +105,10 @@ public class MesProdBindRecordModel {
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.serialNumber = serialNumber;
this.lotNo = lotNo;
}
public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber) {
public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) {
this.itemPartNo = itemPartNo;
this.qty = qty;
this.isValid = isValid;
@ -115,5 +120,6 @@ public class MesProdBindRecordModel {
this.kpSn = kpSn;
this.parentPartNo = parentPartNo;
this.serialNumber = serialNumber;
this.lotNo = lotNo;
}
}

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

@ -0,0 +1,83 @@
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 javax.persistence.Transient;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\6 11:45
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUST_ORDER")
@Api("客户信息")
public class MesCustOrder extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam("订单号")
private String orderNo;
@Column(name = "ORDER_TYPE")
@ApiParam("订单类型")
private Integer orderType;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "QTY")
@ApiParam("数量")
private Integer qty;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "ORDER_DATE")
@ApiParam("订单日期")
private String orderDate;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_ORDER_NO")
@ApiParam("客户订单号")
private String custOrderNo;
@Column(name = "SOURCE")
@ApiParam("计划来源")
private String source;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
@ApiParam(value = "订单日期查询用，查询开始日期", example = "2019-01-31 23:59:59")
public String orderTimeStart;
@Transient
@ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59")
public String orderTimeEnd;
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustOrderRepository.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.MesCustOrder;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\6 13:47
* @Modify:
**/
public interface MesCustOrderRepository extends BaseRepository<MesCustOrder, Long> {
}

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

@ -1706,4 +1706,37 @@ public class MesHqlPack {
}
return packBean;
}
/**
* 客户订单
* @param mesCustOrder
* @param organizeCode
* @return
*/
public static DdlPackBean getMesCustOrder(MesCustOrder mesCustOrder, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustOrder, organizeCode);
if (!StringUtils.isEmpty(mesCustOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesCustOrder.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesCustOrder.getCustCode())) {
DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustCode(), "custCode", packBean);
}
if (!StringUtils.isEmpty(mesCustOrder.getCustOrderNo())) {
DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustOrderNo(), "custOrderNo", packBean);
}
if (!StringUtils.isEmpty(mesCustOrder.getCreateUser())) {
DdlPreparedPack.getStringLikerPack(mesCustOrder.getCreateUser(), "createUser", packBean);
}
if (mesCustOrder.getOrderType() != null) {
DdlPreparedPack.getNumEqualPack(mesCustOrder.getOrderType(), "orderType", packBean);
}
if (mesCustOrder.getStatus() != null) {
DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean);
}
DdlPreparedPack.timeBuilder(
mesCustOrder.getOrderTimeStart(),
mesCustOrder.getOrderTimeEnd(),
"orderDate", packBean, true);
return packBean;
}
}

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

@ -224,7 +224,6 @@ public class WmsMoveSn extends BaseBean {
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
}
public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
@ -233,6 +232,16 @@ public class WmsMoveSn extends BaseBean {
this.refSrc = refSrc;
}
public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double qty) {
this.partNo = partNo;
this.srcLocateNo = srcLocateNo;
this.destLocateNo = destLocateNo;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.busiTypeCode = busiTypeCode;
this.qty = qty;
}
public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd,
String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus,
Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn,

Write Preview
Loading…
Cancel
Save