Jenkins自动合并

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

@@ -1268,12 +1268,56 @@ public class WmsEnumUtil {
 	 * 盘点主表 单据类型
 	 */
 	@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+	public enum CS_STRATEGY_TYPE {
+		PART_COVERAGE(110, "物料分类覆盖"),
+		TOUCH(120, "动碰"),
+		ZORE_STOCK(130, "零库存");
+
+		private int value;
+		private String description;
+
+		CS_STRATEGY_TYPE(int value, String description) {
+			this.value = value;
+			this.description = description;
+		}
+
+		public int getValue() {
+			return value;
+		}
+
+		public String getDescription() {
+			return description;
+		}
+
+		public static String valueOf(int val) {
+			String tmp = null;
+			for (int i = 0; i < values().length; i++) {
+				if (values()[i].value == val) {
+					tmp = values()[i].description;
+				}
+			}
+			return tmp;
+		}
+
+		public static String valueOfDescription(int val) {
+			return valueOf(val);
+		}
+	}
+
+    /**
+     * 盘点主表 单据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CS_ORDER_TYPE {
         DAY_INVENTORY(10, "日常盘点"),
         MONTH_INVENTORY(20, "月度盘点"),
         SEASON_INVENTORY(30, "季度盘点"),
         YEAR_INVENTORY(40, "年度盘点"),
-        AJUST_INVENTORY(50, "库存调整盘点");
+        AJUST_INVENTORY(50, "库存调整盘点"),
+        PART_COVERAGE(110, "物料分类覆盖"),
+        TOUCH(120, "动碰"),
+        ZORE_STOCK(130, "零库存");
+
         private int value;
         private String description;
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -598,7 +598,7 @@ public class DdlPreparedPack {
      */
     public static void getNotInPackList(List<?> data, String columnName, DdlPackBean packBean) {
         if (data != null && data.size() > 0) {
-            packBean.addColumnQuery(columnName, " and model." + columnName + "not in (:m_" + columnName + ")", data);
+            packBean.addColumnQuery(columnName, " and model." + columnName + " not in (:m_" + columnName + ")", data);
         }
     }
 

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

@@ -52,4 +52,12 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @Column(name = "SEQ")
     @ApiParam("序号")
     private Integer seq;
+
+    @Column(name = "WORK_CELL_IP")
+    @ApiParam("工作单元IP")
+    private String workCellIp;
+
+    @Column(name = "WORK_CELL_PORT")
+    @ApiParam("工作单元端口")
+    private String workCellPort;
 }

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

@@ -57,6 +57,14 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("序号")
     private Integer seq;
 
+    @Column(name = "WORK_CELL_IP")
+    @ApiParam("工作单元IP")
+    private String workCellIp;
+
+    @Column(name = "WORK_CELL_PORT")
+    @ApiParam("工作单元端口")
+    private String workCellPort;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesEquipment> childTreeList;

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/21 17:20
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("工位监控观察者对象")
+public class PcsObserverStatusModel {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("运行状况")
+    private Boolean runningStatus;
+}

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 批量修改修改条码打印数量
+ * @author puxiao.liao
+ */
+@Data
+public class WmsPoSnPrintModel implements Serializable {
+
+    private static final long serialVersionUID = 5306382160072353831L;
+
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("打印条码")
+    private List<WmsStockSn> wmsStockSnList;
+}

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

@@ -103,6 +103,9 @@ public class WmsCSOrderMaster extends BaseBean {
     @Column(name = "is_obvious")
     private Integer isObvious;
 
+    @ApiParam(value = "允许盘入的库位")
+    @Column(name = "ALLOW_LOCATES")
+    private String allowLocates;
     public Integer getIsInventoryVal() {
         return this.isInventory == null ? 0 :this.isInventory.intValue();
     }

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

@@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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;
+
+/**
+ * @Description :盘点策略表
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-02-17 10:13 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_CS_STRATEGY", indexes = {
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "盘点策略表", description = "盘点策略表")
+public class WmsCsStrategy extends BaseBean  implements Serializable {
+
+	private static final long serialVersionUID = -1692487594678973549L;
+
+	@Column(name = "STRATEGY_NAME")
+	@ApiParam(value = "策略名称")
+	private String strategyName;
+
+	@Column(name = "part_type")
+	@ApiParam(value = "物料分类")
+	private String partType;
+
+	@Column(name = "STRATEGY_TYPE")
+	@ApiParam(value = "策略分类", example = "0")
+	@AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class, refForeignKey = "value", value = "description")
+	private Integer strategyType;
+
+	@Column(name = "CYCLE_RULE")
+	@ApiParam(value = "循环规则")
+	private String cycleRule;
+
+	@Column(name = "START_DATE")
+	@ApiParam(value = "开始日期", example = "0")
+	private String startDate;
+
+	@Column(name = "END_DATE")
+	@ApiParam(value = "结束日期", example = "0")
+	private String endDate;
+
+	@Column(name = "NUM_MAX")
+	@ApiParam(value = "明细数量上限")
+	private Integer numMax;
+
+	@Column(name = "COVERAGE_RATE")
+	@ApiParam(value = "抽盘覆盖率")
+	private Double coverageRate;
+
+	@Column(name = "ZONE_NOS")
+	@ApiParam(value = "存储区")
+	private String zoneNos;
+
+	@Column(name = "LOCATES")
+	@ApiParam(value = "盘点库位")
+	private String locates;
+
+	@Column(name = "last_run_time")
+	@ApiParam(value = "上次运行时间")
+	private String lastRunTime;
+
+	@Column(name = "next_run_time")
+	@ApiParam(value = "下次运行时间")
+	private String nextRunTime;
+
+	@Column(name = "REMAKE")
+	@ApiParam(value = "备注")
+	private String remake;
+}

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

@@ -290,6 +290,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("是否同批次条码")
     private Integer isSameBatch;
 
+    @Transient
+    @ApiParam("父层级packcode对应的可回用零件号")
+    private String parentReturnPart;
+
     public WmsStockSn() {
     }
 

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCsStrategy;
+
+/**
+* @Description : 盘点策略表
+* @Reference :
+* @Author :QianHuaSheng
+* @CreateDate : 2018-11-17 15:53
+* @Modify:
+**/
+public interface WmsCsStrategyRepository extends BaseRepository<WmsCsStrategy, Long> {
+}