diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 14d440e..4699854 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -869,8 +869,9 @@ public class WmsEnumUtil {
WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
OTHER_IN(730, "OTHER_IN", "其它入库"),
OTHER_OUT(740, "OTHER_OUT", "其它出库"),
- COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
- SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
+ COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"),
+ SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"),
+ COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR
private int value;
private String code;
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index ac387fd..bf96e57 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
index bed31e1..c42d71d 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
@@ -67,6 +67,7 @@ public class MesDefect extends BaseBean implements Serializable {
@Transient
@ApiParam("缺陷类型子集")
private List mesDefectList;
+
public MesDefect() {
}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
index 6c1beda..5eeff9e 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
@@ -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 {
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java
index 78d3caa..fc4f33b 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java
@@ -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;
}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
index bb60da6..bfd78e2 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
@@ -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 {
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java
index 180b0df..f6e32ce 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java
@@ -51,5 +51,5 @@ public class MesProdScatterCfgBom extends BaseBean implements Serializable {
@Column(name = "IS_KEY_PART")
@ApiParam("是否关键件")
- private Integer isKeyPart ;
+ private Integer isKeyPart;
}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
index 5e3440d..6262a8a 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
@@ -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 {
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
index c8dcab7..ea2e7e7 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
@@ -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 {
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
index a266608..61d8c82 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
@@ -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 {
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java
index 13874ae..df66c61 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java
@@ -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;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java
index 83a9451..f88ae24 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java
@@ -35,6 +35,7 @@ public class DefectModel {
@ApiParam("缺陷类型子集")
private List mesDefectList;
+
public DefectModel() {
}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java
index 1487bb8..7bad5fc 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java
@@ -48,6 +48,7 @@ public class MesProdBindRecordModel {
private String serialNumber;
@ApiParam("关联批次")
private String lotNo;
+
public MesProdBindRecordModel() {
}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
index e641bcf..1a7965e 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
@@ -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;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java
index 231b12c..6a85e20 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java
@@ -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;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java
index ab30bd7..0ef0670 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java
@@ -19,11 +19,11 @@ public class StepResult {
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) {
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java
index f87ff43..95eb821 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java
@@ -11,5 +11,5 @@ import org.springframework.stereotype.Repository;
* @Date : 2020/1/8 0008 - 18:43
*/
@Repository
-public interface MesMonitorTaskRepository extends BaseRepository {
+public interface MesMonitorTaskRepository extends BaseRepository {
}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
index 4120d0e..3db9a90 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
@@ -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
*/
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
index beb90ed..0f28b91 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
@@ -26,10 +26,10 @@ import java.io.Serializable;
@Index(columnList = "PACKAGE_NO"),
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PART_NO"),
- @Index(columnList = "PACKAGE_NO2")
-}/*, uniqueConstraints = {
- @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
-}*/)
+ @Index(columnList = "PACKAGE_NO2"),
+ @Index(columnList = "ORGANIZE_CODE,PACKAGE_NO,SERIAL_NUMBER"),
+ @Index(columnList = "PACKAGE_NO,SERIAL_NUMBER")
+})
@Api("包装规格明细")
public class MesPackageDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 6980459490465566975L;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
index c0b3162..b71d6ac 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@@ -26,6 +26,7 @@ import java.math.BigDecimal;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_SN", indexes = {
+ @Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO"),
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java
index dd7a8eb..0561548 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java
@@ -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;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java
index 96f3c6a..37058a9 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java
@@ -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 {
}