Merge remote-tracking branch 'origin/test' into test

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

@@ -3747,7 +3747,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATION_REQUEST_BEAN_CMD {
         JUMP_STATE(10, "JUMP_STATE", "跳过状态点"),
-        FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点");
+        FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点"),
+        FORCE_JUMP_PROCESS(30, "FORCE_JUMP_PROCESS", "通过DOSCAN强制跳过工序");
 
         private int value;
         private String code;

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

@@ -9216,9 +9216,9 @@ public class WmsEnumUtil {
         TWENTY_SECONDS("0/20 * * * * ?", "TWENTY_SECONDS", "二十秒一次"),
         EVERY_DAY("0 0 0 * * ?", "EVERY_DAY", "每天零点"),
         EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"),
-        NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点");
-
-
+        NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点"),
+        NINE("0 0 9 * * ?", "NINE", "早上九点"),
+        NINTEEN("0 0 21 * * ?", "NINTEEN", "晚上九点");
         private String value;
         private String code;
         private String description;

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

@@ -91,6 +91,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步序号")
     private Integer stepSeq;
 
+    @ApiParam("强制跳过工序")
+    private Boolean forceJumpProcess = false;
+
     @ApiParam("强制执行工步代码")
     private String forceSpecStepCode;
 

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

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.wms.bean.mesdata;
+
+
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description 发运物料校验基础数据（源于MES同步）
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2021/3/22 11:32
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "wms_send_part_check")
+@Api("发运物料校验数据")
+public class WmsSendPartCheck extends BaseBean {
+    private static final long serialVersionUID = 5370578735799188359L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "IS_CHECK")
+    @ApiParam("是否校验")
+    public Integer isCheck;
+
+}

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.wms.bean.mesdata;
+
+
+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.*;
+
+/**
+ * @Description 发运条码校验基础数据（源于MES同步）
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2021/3/22 11:32
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "wms_send_sn_check")
+@Api("发运条码绑定关系校验数据")
+public class WmsSendSnCheck extends BaseBean {
+    private static final long serialVersionUID = 2140873585281055846L;
+
+    @Column(name = "SN")
+    @ApiParam("产品条码")
+    public String sn;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendPartCheckRepository.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository.mesdata;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import cn.estsh.i3plus.pojo.wms.bean.mesdata.WmsSendPartCheck;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+/**
+* @Description : 库存条码dao层
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-17 15:53
+* @Modify:
+**/
+public interface WmsSendPartCheckRepository extends BaseRepository<WmsSendPartCheck, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendSnCheckRepository.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository.mesdata;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import cn.estsh.i3plus.pojo.wms.bean.mesdata.WmsSendSnCheck;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+/**
+* @Description : 库存条码dao层
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-17 15:53
+* @Modify:
+**/
+public interface WmsSendSnCheckRepository extends BaseRepository<WmsSendSnCheck, Long> {
+}