工位程序编写

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :工步
@@ -46,4 +47,13 @@ public class MesStep extends BaseBean {
     @Column(name = "STEP_OBJECT")
     @ApiParam("工步对象")
     private String stepObject;
+
+    @Transient
+    @ApiParam("工步执行完毕")
+    private boolean isComplete;
+
+    @Transient
+    @ApiParam("工步是否跳过")
+    private boolean isJump;
+
 }

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

@@ -16,12 +16,18 @@ import java.io.Serializable;
 @Data
 public class StationRequestBean implements Serializable {
 
+    @ApiParam("扫描信息")
+    private String scanInfo;
+
     @ApiParam("产品条码")
     private String serialNumber;
 
     @ApiParam("物料号")
     private String partNo;
 
+    @ApiParam("组织代码")
+    private String organizeCode;
+
     @ApiParam("工作中心代码")
     private String workCenterCode;
 

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

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStep;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : 工位结果bean
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-24
+ * @Modify:
+ **/
+@Data
+public class StationResultBean implements Serializable {
+
+    /**
+     * 根据客户端所需数据结构，约定不同数据类型
+     */
+    @ApiParam("数据类型")
+    private String flagType;
+
+    @ApiParam("是否错误信息")
+    private boolean fail;
+
+    @ApiParam("执行结果信息")
+    private String message;
+
+    @ApiParam("工步展示信息")
+    private String stepHtml;
+
+    @ApiParam("工步清单")
+    private List<MesStep>  stepList;
+}