From 2b84f939501d14a645ebd246e5d2e2ad1733d8e8 Mon Sep 17 00:00:00 2001 From: joke Date: Fri, 21 Feb 2020 14:32:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BB=BB=E5=8A=A1:=201424=20DT=E9=80=9A?= =?UTF-8?q?=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java index 87af76c..d6740f7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ b/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; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 1140404..2f0533a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/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 childTreeList; From 53a2152ff1d7f498400e806c63058f53efdf2023 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 21 Feb 2020 17:20:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=207531=20=E5=9C=A8=E7=BD=91?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=95=B0=E9=87=8F=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=BA=93=E4=BD=8D=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E5=BA=93=E5=8C=BA=E6=9C=89=E5=80=BC=EF=BC=8C=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8A=B6=E6=80=81=E4=B8=BA=E5=BE=85=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E3=80=82=E6=AD=A4=E9=83=A8=E5=88=86=E6=9D=A1=E7=A0=81=E4=B8=BA?= =?UTF-8?q?=E6=97=A5=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E7=A0=81=E3=80=82=20=E3=80=91bug7531?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsPoSnPrintModel.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java new file mode 100644 index 0000000..c198e17 --- /dev/null +++ b/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 wmsStockSnList; +} From 91b43823c95dc4e0a285140fe94a54fbeb957bcc Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 21 Feb 2020 17:34:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=20=E6=97=A5=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=94=9F=E6=88=90=E7=9A=84=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=9C=A8=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E8=A1=A5=E6=89=93=EF=BC=8C=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E3=80=91=E3=80=90bug7514=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 46 ++++++++++- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 2 +- .../i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 3 + .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 89 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 + .../wms/repository/WmsCsStrategyRepository.java | 14 ++++ 6 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCsStrategyRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index c8c1bab..0d3696a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1264,6 +1264,46 @@ 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); + } + } + /** * 盘点主表 单据类型 */ @@ -1273,7 +1313,11 @@ public class WmsEnumUtil { 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; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 47b50bd..3009cfa 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/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); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 8a6afd1..fe8ebc7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/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(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java new file mode 100644 index 0000000..24bf56a --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index e95da2c..6bfcd97 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/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() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCsStrategyRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCsStrategyRepository.java new file mode 100644 index 0000000..19a07e7 --- /dev/null +++ b/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 { +} From 5fd51f6b1d477ba15b6b5c7cf0bdbd7d7ddc8998 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 21 Feb 2020 18:03:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?task=20=20=20=E4=BB=BB=E5=8A=A1=E9=87=8D?= =?UTF-8?q?=E8=AF=95=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 2 +- .../pojo/mes/model/PcsObserverStatusModel.java | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 956a931..68de7f5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -155,7 +155,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; + public transient Integer lockVersion; /********************** 冗余字段 *********************************/ @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java new file mode 100644 index 0000000..ef483a5 --- /dev/null +++ b/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; +} From 1b727f17213abb7d964b9d6b9c100ddf0849c8e3 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 21 Feb 2020 18:04:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?task=20=20=20=E4=BB=BB=E5=8A=A1=E9=87=8D?= =?UTF-8?q?=E8=AF=95=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 68de7f5..956a931 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -155,7 +155,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; + public Integer lockVersion; /********************** 冗余字段 *********************************/ @Transient