Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -1871,7 +1871,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * pcn 动作类型
+     * MesProdBindRecord 动作类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_TYPE {

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java

@@ -16,8 +16,6 @@ public class StringUtil {
 		return false;
 	}
 
-
-
 	/**
 	 * 获取对象所有属性名
 	 * @param clazz
@@ -47,14 +45,6 @@ public class StringUtil {
 		for(int i = 0;i < superFields.length; i++){
 			fieldNames.add(superFields[i].getName());
 		}
-//		fieldNames.add("id");
-//		fieldNames.add("organizeCode");
-//		fieldNames.add("isValid");
-//		fieldNames.add("isDeleted");
-//		fieldNames.add("createUser");
-//		fieldNames.add("createDatetime");
-//		fieldNames.add("modifyUser");
-//		fieldNames.add("modifyDatetime");
 		return fieldNames;
 	}
 
@@ -75,18 +65,4 @@ public class StringUtil {
 			return null;
 		}
 	}
-
-	/**
-	 * 拼接对象所有属性名
-	 * @return
-	 */
-	public static String getFieldNames(String[] fieldNames) {
-		StringBuffer stringBuffer = new StringBuffer();
-		for (String fieldName : fieldNames) {
-			stringBuffer.append(fieldName).append(",");
-		}
-		int stringBufferLength = stringBuffer.length();
-		stringBuffer.delete(stringBufferLength - 1, stringBufferLength);
-		return stringBuffer.toString();
-	}
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -138,6 +138,23 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("下线结束时间")
     private String outWorkCenterTimeEnd;
 
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
+
+    @Transient
+    @ApiParam("条码状态名称")
+    private String snStatusName;
+
+    @Transient
+    @ApiParam("质量状态名称")
+    private String qcStatusName;
+
+    @Transient
+    @ApiParam("条码类型名称")
+    private String snTypeName;
+
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java

@@ -138,6 +138,22 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("下线结束时间")
     private String outWorkCenterTimeEnd;
 
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
+
+    @Transient
+    @ApiParam("条码状态名称")
+    private String snStatusName;
+
+    @Transient
+    @ApiParam("质量状态名称")
+    private String qcStatusName;
+
+    @Transient
+    @ApiParam("条码类型名称")
+    private String snTypeName;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java

@@ -74,6 +74,12 @@ public class ProdBindRecordModel implements Serializable {
     @ApiParam(value = "动作类型")
     private String actionType;
 
+    @ApiParam(value = "是否绑定关键件名称")
+    private String isBindKeyName;
+
+    @ApiParam(value = "动作类型名称")
+    private String actionTypeName;
+
     public ProdBindRecordModel() {
 
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java

@@ -82,11 +82,17 @@ public class QcCheckDataModel {
     @ApiParam("物料名称")
     private String partName;
 
+    @ApiParam(value = "修改人")
+    private String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    private String modifyDatetime;
+
     public QcCheckDataModel() {
 
     }
 
-    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partName) {
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partName, String modifyUser, String modifyDatetime) {
         this.id = id;
         this.organizeCode = organizeCode;
         this.createUser = createUser;
@@ -112,5 +118,7 @@ public class QcCheckDataModel {
         this.squadLeader = squadLeader;
         this.workCellName = workCellName;
         this.partName = partName;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
     }
 }