工步返回内容修改

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

@@ -0,0 +1,91 @@
+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.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_RAW_PART_DATA")
+@Api("原料上线数据")
+public class IfRawPartData  extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895596L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "PART_TYPE")
+    @ApiParam("原料类型")
+    private String partType;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("原料条码")
+    private String serialNumber;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "SRC_LOT_NO")
+    @ApiParam("收货批次")
+    private String srcLotNo;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+
+    @Column(name = "ORGANIZATION_CODE")
+    @ApiParam("工厂代码")
+    private String organizationCode;
+}

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.StepResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -88,4 +89,8 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @Transient
     @ApiParam("前端显示颜色")
     private String color;
+
+    @Transient
+    @ApiParam("状态执行情况")
+    private StepResult stepResult;
 }

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

@@ -18,12 +18,20 @@ public class StepResult<T> {
 
     private String msg;
 
+    private boolean needStop;
+
     private StationRequestBean stationRequestBean;
 
     public static StepResult getNonComplete() {
         return new StepResult(false, "");
     }
 
+    public static StepResult getNonCompleteStop() {
+        StepResult result = new StepResult(false, "");
+        result.setNeedStop(true);
+        return result;
+    }
+
     public static StepResult getNonComplete(StationRequestBean requestBean) {
         return new StepResult(false, "");
     }
@@ -36,6 +44,12 @@ public class StepResult<T> {
         return new StepResult(false, reqBean);
     }
 
+    public static <T> StepResult getNonCompleteReqBeanStop(StationRequestBean reqBean) {
+        StepResult stepResult = new StepResult(false, reqBean);
+        stepResult.setNeedStop(true);
+        return stepResult;
+    }
+
     public static <T> StepResult getNonCompleteData(T data) {
         return new StepResult(false, data, "");
     }
@@ -44,6 +58,12 @@ public class StepResult<T> {
         return new StepResult(false, msg);
     }
 
+    public static StepResult getNonCompleteStop(String msg) {
+        StepResult stepResult = new StepResult(false, msg);
+        stepResult.setNeedStop(true);
+        return stepResult;
+    }
+
     public static StepResult getSuccessComplete(String msg) {
         return new StepResult(true, msg);
     }