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

yun-zuoyi
simon.song 4 years ago
commit 3917408421

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -67,6 +67,7 @@ public class MesDefect extends BaseBean implements Serializable {
@Transient
@ApiParam("缺陷类型子集")
private List<MesDefect> mesDefectList;
public MesDefect() {
}

@ -25,7 +25,7 @@ import java.io.Serializable;
@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
}
}
)
@Api("包装规格")
public class MesPackage extends BaseBean implements Serializable {

@ -48,23 +48,23 @@ public class MesPcnSysUserOffline extends BaseBean implements Serializable {
@ApiParam(value = "登陆名称", access = "登陆名称")
private String loginName;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型(枚举,待定)" , example ="-1")
@Column(name = "USER_TYPE")
@ApiParam(value = "账号类型(枚举,待定)", example = "-1")
private Integer userType;
@Lob
@Column(name="LOGIN_INFO")
@ApiParam(value ="登陆信息" , access ="登陆信息")
@Column(name = "LOGIN_INFO")
@ApiParam(value = "登陆信息", access = "登陆信息")
private String loginInfo;
@Lob
@Column(name="MENU_LIST")
@ApiParam(value ="菜单" , access ="菜单")
@Column(name = "MENU_LIST")
@ApiParam(value = "菜单", access = "菜单")
private String menuList;
@Lob
@Column(name="MODULE_LIST")
@ApiParam(value ="模块" , access ="模块")
@Column(name = "MODULE_LIST")
@ApiParam(value = "模块", access = "模块")
private String moduleList;
}

@ -27,7 +27,7 @@ import java.io.Serializable;
@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
}
}
)
@Api("生产主计划")
public class MesPlanOrder extends BaseBean implements Serializable {

@ -51,5 +51,5 @@ public class MesProdScatterCfgBom extends BaseBean implements Serializable {
@Column(name = "IS_KEY_PART")
@ApiParam("是否关键件")
private Integer isKeyPart ;
private Integer isKeyPart;
}

@ -28,7 +28,7 @@ import java.io.Serializable;
@Index(columnList = "CREATE_DATE_TIME")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"})
}
}
)
@Api("产品条码表")
public class MesProduceSn extends BaseBean implements Serializable {

@ -27,7 +27,7 @@ import java.io.Serializable;
@Index(columnList = "CUST_FLAG_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
}
}
)
@Api("生产队列主表")
public class MesQueueOrder extends BaseBean implements Serializable {

@ -27,7 +27,7 @@ import java.io.Serializable;
@Index(columnList = "ORDER_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
}
}
)
@Api("生产队列明细")
public class MesQueueOrderDetail extends BaseBean implements Serializable {

@ -54,7 +54,7 @@ public class MesShift extends BaseBean implements Serializable {
@ApiParam("作业时长")
private Double workTimes;
@Column(name="SHIFT_SEQ")
@Column(name = "SHIFT_SEQ")
@ApiParam("班次顺序")
private Integer shiftSeq;

@ -35,6 +35,7 @@ public class DefectModel {
@ApiParam("缺陷类型子集")
private List<DefectModel> mesDefectList;
public DefectModel() {
}

@ -48,6 +48,7 @@ public class MesProdBindRecordModel {
private String serialNumber;
@ApiParam("关联批次")
private String lotNo;
public MesProdBindRecordModel() {
}

@ -67,6 +67,7 @@ public class QueueOrderModel implements Serializable {
this.snStatus = snStatus;
this.workType = workType;
}
public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType) {
this.id = id;

@ -113,9 +113,13 @@ public class RequestModel {
return orderNoList;
}
public void setActionRequestBean(ActionRequestBean actionRequestBean) { this.actionRequestBean = actionRequestBean; }
public void setActionRequestBean(ActionRequestBean actionRequestBean) {
this.actionRequestBean = actionRequestBean;
}
public ActionRequestBean getActionRequestBean() { return actionRequestBean; }
public ActionRequestBean getActionRequestBean() {
return actionRequestBean;
}
public Double getCurrentSeq() {
return currentSeq == null ? 0.0d : currentSeq;

@ -19,11 +19,11 @@ public class StepResult<T> {
private String msg;
public static StepResult getSuccessComplete() {
return new StepResult(true,"");
return new StepResult(true, "");
}
public static StepResult getNonComplete() {
return new StepResult(false,"");
return new StepResult(false, "");
}
public static StepResult getSuccessComplete(String msg) {

@ -11,5 +11,5 @@ import org.springframework.stereotype.Repository;
* @Date : 2020/1/8 0008 - 18:43
*/
@Repository
public interface MesMonitorTaskRepository extends BaseRepository<MesMonitorTask,Long> {
public interface MesMonitorTaskRepository extends BaseRepository<MesMonitorTask, Long> {
}

@ -72,7 +72,7 @@ public class MesHqlPack {
* @param mesLabelTemplate
* @return
*/
public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) {
public static DdlPackBean getLabelTemplate(MesLabelTemplate mesLabelTemplate) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
return packBean;
@ -286,6 +286,7 @@ public class MesHqlPack {
/**
*
*
* @param mesProduceSn
* @return
*/
@ -325,6 +326,7 @@ public class MesHqlPack {
/**
*
*
* @param mesPackage
* @return
*/
@ -387,9 +389,9 @@ public class MesHqlPack {
}
/**
*
*
* @param typeCfg
* @return
*/

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -70,6 +70,10 @@ public class MesRawPartSn extends BaseBean implements Serializable {
@ApiParam("供应商代码")
private String supplierCode;
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail;
import org.springframework.stereotype.Repository;
/**
@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail;
* @CreateDate: 2019/10/19 10:33
* @Description:
**/
@Repository
public interface MesPackageDetailRepository extends BaseRepository<MesPackageDetail, Long> {
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

@ -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-TEST-SNAPSHOT
sonar.projectVersion=1.0-DEV-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./

Loading…
Cancel
Save