【任务2223】

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java

@@ -59,4 +59,8 @@ public class AndonAlarmType extends BaseBean implements Serializable {
     @ApiParam("安灯类型名称")
     private String description;
 
+    @Transient
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_AREA_ALARM_TYPE")
+@EqualsAndHashCode(callSuper = true)
+@Api("区域安灯类型")
+public class AndonAreaAlarmType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6551224785612729594L;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam("安灯类型代码")
+    private String alarmCode;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAreaAlarmType;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-30 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAreaAlarmTypeRepository extends BaseRepository<AndonAreaAlarmType, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -1090,4 +1090,11 @@ public class AndonHqlPack {
         DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean);
         return packBean;
     }
+
+    public static DdlPackBean getAndonAreaAlarmType(AndonAreaAlarmType areaAlarmType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(areaAlarmType, organizeCode);
+        DdlPreparedPack.getStringLikerPack(areaAlarmType.getAreaCode(), "areaCode", packBean);
+        DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean);
+        return packBean;
+    }
 }

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

@@ -30,6 +30,9 @@ public class InjectionProductionControlModel {
     @ApiParam("已打包数量")
     private String packageQty;
 
+    @ApiParam("未打包数量")
+    private String unPackageQty;
+
     @ApiParam("包装编号")
     private String packageNo;