JIS

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean {
     @ApiParam("模式名称")
     private String patternName;
 
+    @Lob
     @Column(name = "RULE")
     @ApiParam("规则")
     private String rule;

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

@@ -102,6 +102,7 @@ public class MesEquipmentModel implements Serializable {
 
     }
 
+    //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams
     public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) {
         this.id = id;
         this.equipmentCode = equipmentCode;
@@ -111,6 +112,8 @@ public class MesEquipmentModel implements Serializable {
         this.equipmentCategory = equipmentCategory;
     }
 
+    //根据生产线，工位获取设备集合 findMesEquipmentList
+    //获取设备分页数据-组织模型 queryMesEquipmentByPagerOrg
     public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) {
         this.wcId = wcId;
         this.id = id;
@@ -122,6 +125,7 @@ public class MesEquipmentModel implements Serializable {
         this.areaCode = areaCode;
     }
 
+    //根据条件查询设备所有有效数据-组织模型下拉框及联 queryMesEquipmentList
     public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) {
         this.id = id;
         this.equipmentNameAndworkCellName = equipmentNameAndworkCellName;
@@ -134,13 +138,13 @@ public class MesEquipmentModel implements Serializable {
 
     }
 
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    //获取设备分页数据 queryMesEquipmentByPager
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
         this.status = status;
         this.workCenterCode = workCenterCode;
-        this.workCellCode = workCellCode;
         this.areaCode = areaCode;
         this.equipmentType = equipmentType;
         this.equipmentCategory = equipmentCategory;