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

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

@@ -1967,7 +1967,7 @@ public class MesEnumUtil {
         MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
         MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"),
         BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"),
-        BOARD_PLAN_CAPACITY(520, "BOARD_PLAN_CAPACITY", "计划产能看板导入");
+        BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入");
 
         private int value;
         private String service;

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

@@ -0,0 +1,81 @@
+package cn.estsh.i3plus.pojo.mes.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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_PART_PULL")
+@Api("IF_物料拉动")
+public class IfPartPull extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895596L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("产品物料编码")
+    private String parentPartNo;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("子物料编码")
+    private String itemPartNo;
+
+    @Column(name = "QTY")
+    @ApiParam("拉动数量")
+    private Double qty;
+
+    @Column(name = "ORGANIZTION_CODE")
+    @ApiParam("工厂代码")
+    private String organizationCode;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    @Lob
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}

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

@@ -66,7 +66,7 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable {
 
     @Column(name = "STOP_TIME")
     @ApiParam("停机时间")
-    private Integer stopTime;
+    private Double stopTime;
 
     @Column(name = "ACTUAL_CAPACITY")
     @ApiParam("今日产量")

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

@@ -139,4 +139,8 @@ public class MesPart extends BaseBean implements Serializable {
     @Transient
     @ApiParam("分类名称")
     private String categoryName;
+
+    @Transient
+    @ApiParam("拉动数量")
+    private Double pullQty;
 }

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

@@ -49,7 +49,7 @@ public class BoardModel {
     private Integer monthPlanCapacity;
 
     @ApiParam("停机时间")
-    private Integer stopTime;
+    private double stopTime;
 
     @ApiParam("时段产能")
     private Integer hourCapacity;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfPartPull;
+import cn.estsh.i3plus.pojo.mes.bean.IfRawPartData;
+
+/**
+ * @Description :
+ * @Reference :
+ * @CreateDate : 2020-04-21 09:53
+ * @Modify:
+ **/
+public interface IfPartPullRepository extends BaseRepository<IfPartPull, Long> {
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java

@@ -119,6 +119,12 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "工厂代码")
     private String organizeCode;
 
+    @ApiParam(value = "提交模式")
+    private Integer commitMode;
+
+    @ApiParam(value = "是否允许重置")
+    private Integer isResetAble;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java

@@ -30,8 +30,7 @@ public class WmsFieldInfoModel implements Serializable {
     @ApiParam("处理类型")
     private int handleType;
 
-    public WmsFieldInfoModel (String baseRepository, int handleType, List<WmsFieldInfo> wmsFieldInfoList) {
-        this.baseRepository = baseRepository;
+    public WmsFieldInfoModel ( int handleType, List<WmsFieldInfo> wmsFieldInfoList) {
         this.wmsFieldInfoList = wmsFieldInfoList;
         this.handleType = handleType;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java

@@ -81,6 +81,12 @@ public class WmsActionGroup extends BaseBean {
     @AnnoOutputColumn
     private Integer isAutoCommit;
 
+    // 1=true, 2 = false
+    @Column(name = "IS_RESET_ABLE", columnDefinition = "int default 1", nullable = false)
+    @ApiParam(value = "是否允许重置")
+    @AnnoOutputColumn
+    private Integer isResetAble;
+
     @Lob
     @Column(name = "POSITION", columnDefinition = "TEXT")
     @ApiParam(value = "GOJS位置")
@@ -114,7 +120,11 @@ public class WmsActionGroup extends BaseBean {
         return this.autoInit == null ? 0 : this.autoInit.intValue();
     }
 
-    public int geSubmitStepSeqVal() {
+    public int getSubmitStepSeqVal() {
         return this.submitStepSeq == null ? 0 : this.submitStepSeq.intValue();
     }
+
+    public int getIsResetAbleVal() {
+        return this.isResetAble == null ? 0 : this.isResetAble.intValue();
+    }
 }