yun-zuoyi
luweihao 5 years ago
commit 01a694be70

@ -27,6 +27,9 @@ public class CommonEnumUtil {
MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"),
SWEB(7, 8800, 19, "i3sweb", "供应商服务"),
PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"),
PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"),
FORM(20, 8900, 16, "block-form", "智能表单"),
REPORT(21, 8910, 17, "block-report", "智能报表"),
WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"),
@ -35,7 +38,7 @@ public class CommonEnumUtil {
HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
LAC(26, 8600, 13, "lac", "连接适配器"),
ANDON(27, 8500, 14, "andon", "安灯"),
APS(28, 8410, 15, "APS", "高级计划与排程"),
APS(28, 8400, 15, "APS", "高级计划与排程"),
CENTER(99, 8000, 1, "icloud-server", "注册中心"),
SURFACE(98, 0, 0, "i3surface", "对外服务"),
CLOUD(97, 0, 0, "i3cloud", "微服务"),

@ -736,6 +736,16 @@ public class WmsEnumUtil {
return tmp;
}
public static String codeOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -4865,4 +4875,49 @@ public class WmsEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GROUP_COMMIT_MODE {
JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交");
private int value;
private int code;
private String description;
GROUP_COMMIT_MODE(int value, int code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public int getCode() {
return code;
}
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 String valueOfDescription(int val) {
return valueOf(val);
}
}
}

@ -18,63 +18,8 @@ public class QcCheckStandardModel {
private Long id;
@ApiParam("物料编码")
private String partNo;
@ApiParam("列头")
private String title;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("检测类型")
private Integer checkType;
@ApiParam("检测项")
private String checkItem;
@ApiParam("检测标准")
private String checkStandard;
@ApiParam("检测指导")
private String checkGuide;
@ApiParam("频率")
private String checkFrequency;
@ApiParam("物料名称")
private String partName;
@ApiParam("检测结果")
private String checkResult;
@ApiParam("检测值")
private String checkValue;
@ApiParam("检测项类型")
private String checkItemType;
@ApiParam("检测项类型名称")
private String checkItemTypeName;
private List<MesQcCheckStandard> childQcList;
public QcCheckStandardModel() {
}
public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard
, String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) {
this.id = id;
this.partNo = partNo;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.checkType = checkType;
this.checkItem = checkItem;
this.checkStandard = checkStandard;
this.checkGuide = checkGuide;
this.checkFrequency = checkFrequency;
this.partName = partName;
this.checkItemType = checkItemType;
this.checkItemTypeName = checkItemTypeName;
}
private List<MesQcCheckStandard> resultList;
}

@ -98,6 +98,19 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "动作类型")
private String actionType;
@ApiParam(value = "是否绑定关键件名称")
private String isBindKeyName;
@ApiParam(value = "动作类型名称")
private String actionTypeName;
@ApiParam("产品条码零件名称")
private String partName;
@ApiParam("原材料零件名称")
private String itemPartName;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;
}

@ -32,8 +32,8 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam("关联单号")
public String refSrc;
@ApiParam(value = "关联单据业务类型")
private String busiTypeDesc;
@ApiParam(value = "关联单据业务类型代码")
private String busiTypeCode;
@ApiParam(value = "计划日期")
private String zdate;
@ -59,18 +59,21 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam(value = "创建人")
public String createUser;
@ApiParam(value = "关联单据类型")
public String refType;
public WmsTaskInfoModel() {
}
public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo,
String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
String createDatetime, String srcZoneNo, String createUser) {
this.orderNo = orderNo;
this.taskStatus = taskStatus;
this.opTypeName = opTypeName;
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
this.busiTypeDesc = busiTypeDesc;
this.busiTypeCode = busiTypeCode;
this.zdate = zdate;
this.ztime = ztime;
this.custNo = custNo;

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-ptl-pcn</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
</dependencies>
</project>

@ -0,0 +1,71 @@
package cn.estsh.i3plus.pojo.ptl.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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 : wei.peng
* @CreateDate : 20-1-10 5:16
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="PTL_PCN_TEST_USER")
@Api(value="PTL PCN 测试用户",description = "测试用户")
public class PpTestUser extends BaseBean {
private static final long serialVersionUID = -8985367251249816850L;
@Column(name="USER_INFO_ID")
@ApiParam(value ="人员ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userInfoId;
@Column(name="LANGUAGE_CODE")
@ApiParam(value ="用户语言")
private String languageCode;
@Column(name="USER_NAME_RDD")
@ApiParam(value ="用户名称" , access ="账号名称")
private String userName;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="登陆名称" , access ="登陆名称")
private String userLoginName;
@Column(name="USER_EMP_NO")
@ApiParam(value ="工号")
private String userEmpNo;
@Column(name="USER_LOGIN_PASSWORD")
@ApiParam(value ="登陆密码")
private String userLoginPassword;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型(枚举,待定)" , example ="-1")
private Integer userType;
@Column(name="USER_EMAIL")
@ApiParam(value ="邮箱" , access ="邮箱")
private String userEmail;
@Column(name="USER_PHONE")
@ApiParam(value ="手机号" , access ="手机号")
private String userPhone;
}

@ -0,0 +1,14 @@
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-1-10 5:19
* @Modify:
**/
package cn.estsh.i3plus.pojo.ptl.pcn;
/**
* Bean cn.estsh.i3plus.pojo.ptl.pcn.bean
* Bean Pp
* Bean ID ()
*/

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.ptl.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.pcn.bean.PpTestUser;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-1-10 5:18
* @Modify:
**/
public interface PpTestUserRepository extends BaseRepository<PpTestUser, Long> {
}

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-ptl</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
</dependencies>
</project>

@ -0,0 +1,73 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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 : wei.peng
* @CreateDate : 20-1-10 5:16
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="PTL_TEST_USER")
@Api(value="PTL 测试用户",description = "测试用户")
public class PtlTestUser extends BaseBean {
private static final long serialVersionUID = -130240511327784335L;
@Column(name="USER_INFO_ID")
@ApiParam(value ="人员ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userInfoId;
@Column(name="LANGUAGE_CODE")
@ApiParam(value ="用户语言")
private String languageCode;
@Column(name="USER_NAME_RDD")
@ApiParam(value ="用户名称" , access ="账号名称")
private String userName;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="登陆名称" , access ="登陆名称")
private String userLoginName;
@Column(name="USER_EMP_NO")
@ApiParam(value ="工号")
private String userEmpNo;
@Column(name="USER_LOGIN_PASSWORD")
@ApiParam(value ="登陆密码")
private String userLoginPassword;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型(枚举,待定)" , example ="-1")
private Integer userType;
@Column(name="USER_EMAIL")
@ApiParam(value ="邮箱" , access ="邮箱")
private String userEmail;
@Column(name="USER_PHONE")
@ApiParam(value ="手机号" , access ="手机号")
private String userPhone;
}

@ -0,0 +1,14 @@
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-1-10 5:19
* @Modify:
**/
package cn.estsh.i3plus.pojo.ptl;
/**
* Bean cn.estsh.i3plus.pojo.ptl.bean
* Bean Ptl
* Bean ID ()
*/

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlTestUser;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-1-10 5:18
* @Modify:
**/
public interface PtlTestUserRepository extends BaseRepository<PtlTestUser, Long> {
}

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -69,15 +70,14 @@ public class WmsActionGroup extends BaseBean {
@AnnoOutputColumn
private Integer autoInit;
// 1=true, 2 = false
@Column(name = "IS_COMMIT_REF_MOVE", nullable = false)
@ApiParam(value = "是否连带提交创建状态移动单", example = "2")
@AnnoOutputColumn
private Integer isCommitRefMove;
@Column(name = "COMMIT_MODE", nullable = false)
@ApiParam(value = "提交移动单模式")
@AnnoOutputColumn(refClass = WmsEnumUtil.GROUP_COMMIT_MODE.class)
private Integer commitMode;
// 1=true, 2 = false
@Column(name = "IS_AUTO_COMMIT", nullable = false)
@ApiParam(value = "是否自动提交", example = "1")
@ApiParam(value = "是否自动提交")
@AnnoOutputColumn
private Integer isAutoCommit;
@ -102,8 +102,8 @@ public class WmsActionGroup extends BaseBean {
return this.endAmId == null ? 0 : this.endAmId.longValue();
}
public int getIsCommitRefMoveVal() {
return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
public int getCommitModeVal() {
return this.commitMode == null ? 0 : this.commitMode.intValue();
}
public int getIsAutoCommitVal() {

@ -125,6 +125,10 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam("关联单号")
public String refSrc;
@Column(name = "GROUP_NO")
@ApiParam("分组号")
public String groupNo;
@ApiParam(value = "待出库数量", example = "0")
@Transient
private Long waitingCounts;

@ -224,6 +224,7 @@ public class WmsPart extends BaseBean {
@Column(name="verb_num")
@ApiParam(value = "单次拆包数")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double verbNum;
@Column(name = "IS_PROD_LOT")

@ -132,13 +132,9 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam("目的库存地代码")
public String destAreaNo;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
public Integer busiType;
@Column(name = "BUSI_TYPE_DESC")
@ApiParam("业务类型描述")
public String busiTypeDesc;
@Column(name = "BUSI_TYPE_CODE")
@ApiParam("业务类型代码")
public String busiTypeCode;
@Column(name = "TRANS_TYPE_CODE_RDD")
@ApiParam("交易类型")

@ -32,6 +32,8 @@
<module>modules/i3plus-pojo-sweb</module>
<module>modules/i3plus-pojo-andon</module>
<module>modules/i3plus-pojo-lac</module>
<module>modules/i3plus-pojo-ptl</module>
<module>modules/i3plus-pojo-ptl-pcn</module>
</modules>
<dependencies>

Loading…
Cancel
Save