安灯项目优化

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

@@ -39,4 +39,8 @@ public class AndonAlarmCause extends BaseBean {
     @Column(name = "PARENT_AC_CODE")
     @ApiParam(value = "父阶原因代码")
     private String parentAcCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
 }

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

@@ -39,4 +39,8 @@ public class AndonEventCause extends BaseBean {
     @Column(name = "PARENT_EC_CODE")
     @ApiParam(value = "父阶原因代码")
     private String parentEcCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
 }

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

@@ -0,0 +1,46 @@
+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;
+
+/**
+ * @Description : ANDON_事件处理方法
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_EVENT_METHOD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_事件处理方法")
+public class AndonEventMethod extends BaseBean {
+
+    @Column(name = "EM_CODE")
+    @ApiParam(value = "事件方法代码")
+    private String emCode;
+
+    @Column(name = "EM_NAME")
+    @ApiParam(value = "事件方法描述")
+    private String emName;
+
+    @Column(name = "PARENT_EM_CODE")
+    @ApiParam(value = "父阶方法代码")
+    private String parentEmCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+}

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

@@ -0,0 +1,59 @@
+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;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-04-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT")
+@Api("班次信息")
+public class MesShift extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name="SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name="SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name="START_TIME")
+    @ApiParam("开班时间")
+    private String startTime;
+
+    @Column(name="WORK_TIMES")
+    @ApiParam("作业时长")
+    private String workTimes;
+
+    public MesShift() {
+    }
+
+    public MesShift(String workCenterCode,String organizeCode) {
+        this.workCenterCode = workCenterCode;
+        this.organizeCode = organizeCode;
+    }
+}

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

@@ -64,4 +64,11 @@ public class MesWorkCenter extends BaseBean {
     @ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
+
+    public MesWorkCenter(String organizeCode) {
+        this.organizeCode = organizeCode;
+    }
+
+    public MesWorkCenter() {
+    }
 }

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.MesShift;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-19-13:53
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftRepository extends BaseRepository<MesShift, Long> {
+}

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

@@ -7,6 +7,13 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import org.apache.commons.lang3.StringUtils;
 
+import cn.estsh.i3plus.pojo.andon.bean.*;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * @Description : 安灯对象查询封装
  * @Reference :
@@ -58,4 +65,74 @@ public class AndonHqlPack {
         getStringBuilderPack(andonPLC, result);
         return result;
     }
+
+    /**
+     * 按条件查询工作中心
+     * @param mesWorkCenter
+     * @return
+     */
+    public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(mesWorkCenter, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询工作单元（工位）
+     * @param mesWorkCell
+     * @return
+     */
+    public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result);
+        getStringBuilderPack(mesWorkCell, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询设备
+     * @param mesEquipment
+     * @return
+     */
+    public static DdlPackBean packHqlMesEquipment(MesEquipment mesEquipment){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", result);
+        getStringBuilderPack(mesEquipment, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询班次
+     * @param mesShift
+     * @return
+     */
+    public static DdlPackBean packHqlMesShift(MesShift mesShift){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(mesShift.getWorkCenterCode(), "workCenterCode", result);
+        getStringBuilderPack(mesShift, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询ANDON呼叫原因
+     * @param andonAlarmCause
+     * @return
+     */
+    public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+        getStringBuilderPack(andonAlarmCause, result);
+
+        return result;
+    }
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -66,8 +66,11 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @Column(name = "UNIT")
     private String unit;
 
+    /**
+     * 不冗余主表数据
+     */
     @ApiParam(value = "行项目状态", example = "1")
-    @Column(name = "ITEM_STATUS")
+    @Transient
     private Integer itemStatus;
 
     @Column(name = "BOX_QTY")
@@ -131,7 +134,10 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @ApiParam("是否为钢卷料")
     private Integer isSteel;
 
-    @Column(name = "EXPECTED_TIME")
+    /**
+     * 不冗余主表数据
+     */
+    @Transient
     @ApiParam(value = "预计到货日期")
     public String expectedTime;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java

@@ -34,6 +34,14 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @ApiParam("单据明细编号")
     private String orderNo;
 
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
     @Column(name = "PART_NO")
     @ApiParam(value = "零件号")
     private String partNo;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java

@@ -20,6 +20,9 @@ public class SwebLoginUserModel implements Serializable {
     @ApiParam(value = "用户ID")
     private Long id;
 
+    @ApiParam(value = "用户code（供应商编号）")
+    private String code;
+
     @ApiParam(value = "用户名")
     private String userName;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java

@@ -23,6 +23,9 @@ public class SwebPOForPubListEnterModel extends BaseBean {
     @ApiParam(value = "订单类型", example = "1")
     public Integer orderType;
 
+    @ApiParam(value = "订单状态", example = "10")
+    public Integer orderStatus;
+
     @ApiParam(value = "预计到货日期开始日期")
     public String expectedTimeStart;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 待发布订单列表发布输入模型
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-05-13 13:13
+ * @Modify:
+ **/
+@Data
+public class SwebPOUpdatePublishForPublishModel extends BaseBean {
+
+    @ApiParam(value = "拆分请求时间数量列表", example = "1")
+    private List<String> reqTimeList;
+
+    @ApiParam(value = "列表项", example = "1")
+    private SwebPOForPubListResultItemModel item;
+}