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/MesPcnEnumUtil.java

@@ -4935,4 +4935,68 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STEP_DISPLAY_CLASS {
+        WHITE(10, "white"),
+        LIGHT_BLUE(20, "lightBlue");
+
+        private Integer value;
+        private String description;
+
+        STEP_DISPLAY_CLASS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROMPT_SOUND {
+        SUCCESS(10, "扫描成功"),
+        FAILURE(20, "扫描失败");
+
+        private Integer value;
+        private String description;
+
+        PROMPT_SOUND(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -65,4 +65,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("定时秒数")
     private Integer timer;
+
+    @ApiParam("提示音 1，2，3，4与前端约定")
+    private Integer promptSound;
 }

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesStateMachine;
+
+/**
+ * @Description : 
+ * @Author : simon.song
+ * @CreateDate : 2020-09-01
+ **/
+public interface MesStateMachineRepository extends BaseRepository<MesStateMachine, Long> {
+}

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

@@ -21,4 +21,7 @@ public class WmsSapDbParamModel implements Serializable {
     private String masterStatusName;//单据状态名
     private String detailsTableName;//单据明细表名
     private String snTableName;//单据条码表名
+    private String checkDetailCondition;//可以取消单据明细条件
+    private String checkSnCondition;//可以取消单据条码条件
+
 }

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

@@ -78,12 +78,15 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "跳转后端请求")
     public String actionUrl;
 
+    @ApiParam(value = "作业人员")
+    public String userNo;
+
     public WmsTaskInfoModel() {
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
                             String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
-                            String createDatetime, String srcZoneNo, String createUser, String organizeCode) {
+                            String createDatetime, String srcZoneNo, String createUser, String organizeCode,String userNo) {
         this.orderNo = orderNo;
         this.taskStatus = taskStatus;
         this.opTypeName = opTypeName;
@@ -98,6 +101,7 @@ public class WmsTaskInfoModel implements Serializable {
         this.srcZoneNo = srcZoneNo;
         this.createUser = createUser;
         this.organizeCode = organizeCode;
+        this.userNo = userNo;
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,

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

@@ -225,6 +225,8 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "COST_CENTER")
     @ApiParam(value = "成本中心")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_COST_CENTER", listColumnName = "name", explicitColumnName = "dictionaryValue")
     private String costCenter;
 
     @Column(name = "REMAKE")

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 质检单条码质检不良清单表
+ * @Reference :
+ * @Author : rock.yu
+ * @CreateDate : 2020-09-01 14:37
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_QC_SN_ERROR_LIST")
+@Api("质检单条码质检不良清单表")
+public class WmsQCSNErrorList extends BaseBean {
+
+    private static final long serialVersionUID = 7779401323803118985L;
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    /**
+     * 状态:1=创建,10=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer itemStatus;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String remark;
+
+    @Column(name="PASS_QTY", nullable = false)
+    @ApiParam("合格数量")
+    @ColumnDefault("0")
+    public double passQty;
+
+    @Column(name="REJECT_QTY", nullable = false)
+    @ApiParam("不合格数量")
+    @ColumnDefault("0")
+    public double rejectQty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name = "QC_USER")
+    @ApiParam("检验员")
+    public String qcUser;
+
+    @Column(name = "QC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
+    public String qcTime;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+}