From f57dd8e999f46d8e602785664433ae98280e4322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 20 Sep 2019 09:38:40 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81=E3=80=81?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E4=B8=89=E5=BC=A0=E8=A1=A8=E5=BF=AB?= =?UTF-8?q?=E7=85=A7=E6=97=B6=E9=97=B4=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index d16a300..9fb8432 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -177,6 +177,11 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + + @Transient + @ApiParam(value = "快照时间") + private String snapshotTime; + /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 921d32d..783f5d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -148,6 +148,10 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("获取数量大于0") private Integer qtyIdentity; + @Transient + @ApiParam(value = "快照时间") + private String snapshotTime; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index aab7504..a43c74b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -188,6 +188,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + @Transient + @ApiParam(value = "快照时间") + private String snapshotTime; + public WmsMoveSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index cc09433..542f9f4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -152,6 +152,9 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "移动单条码集合") private List wmsMoveSnList; + @Transient + @ApiParam(value = "快照时间") + private String snapshotTime; public String getAreaNo() { return areaNo; 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 6b721bd..db9b615 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 @@ -239,6 +239,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "目标数量") public Double destQty; + @Transient + @ApiParam(value = "快照时间") + private String snapshotTime; + public WmsStockSn(){} public WmsStockSn(String partNo){ From f6e9dd03b441bf2746e4d79b88f711c5ef91e6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 20 Sep 2019 10:10:03 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=BF=AB=E7=85=A7job?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=90=E4=BB=BB=E5=8A=A11011=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/IWmsCheckPointRepository.java | 18 ++++++++++++++++++ .../repository/IWmsMoveDetailsSnapshotRepository.java | 18 ++++++++++++++++++ .../repository/IWmsMoveMasterSnapshotRepository.java | 18 ++++++++++++++++++ .../wms/repository/IWmsMoveSnSnapshotRepository.java | 18 ++++++++++++++++++ .../repository/IWmsStockQuanSnapshotRepository.java | 17 +++++++++++++++++ .../wms/repository/IWmsStockSnSnapshotRepository.java | 18 ++++++++++++++++++ 6 files changed, 107 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java new file mode 100644 index 0000000..1ce42ce --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsCheckPoint; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockQuanSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 快照表 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsCheckPointRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java new file mode 100644 index 0000000..6cad3c1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveDetailsSnapshot; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveMasterSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 快照表 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsMoveDetailsSnapshotRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java new file mode 100644 index 0000000..dc4a0ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveMasterSnapshot; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockSnSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 快照表 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsMoveMasterSnapshotRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java new file mode 100644 index 0000000..8e6dc83 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveDetailsSnapshot; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveSnSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 快照表 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsMoveSnSnapshotRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java new file mode 100644 index 0000000..13b4bfe --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockQuanSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 库存信息快照 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsStockQuanSnapshotRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java new file mode 100644 index 0000000..4aacb33 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsCheckPoint; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockSnSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 快照表 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsStockSnSnapshotRepository extends BaseRepository { +} From 9b82b0be2a6d5c334a90e147d1f80ec645704fdf Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 20 Sep 2019 11:47:34 +0800 Subject: [PATCH 3/8] =?UTF-8?q?mes=E7=8F=AD=E7=BB=84=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 3 --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 308024e..13a3217 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -14,8 +13,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.Arrays; -import java.util.List; /** * @Description: diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index f6995fd..0ee655a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -363,6 +363,24 @@ public class MesHqlPack { } /** + * MES班组信息查询条件封装 + * @param shiftGroup + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { + + DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); + if (StringUtils.isNotEmpty(shiftGroup.getGroupCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); + } + if (StringUtils.isNotEmpty(shiftGroup.getGroupName())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); + } + return packBean; + } + + /** * MES班次休息信息查询条件封装 * * @param shiftRest From 53dd9cface0e506ff7e76b4382bb862599e57c27 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Fri, 20 Sep 2019 15:22:20 +0800 Subject: [PATCH 4/8] =?UTF-8?q?add=20=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BFp?= =?UTF-8?q?ojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsPartRouting.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 13 +++++---- ...pository.java => WmsRoutingRuleRepository.java} | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 32 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 7 deletions(-) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{WmsRoutingRoleRepository.java => WmsRoutingRuleRepository.java} (86%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java index 0be04b6..5adc7d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java @@ -37,7 +37,7 @@ public class WmsPartRouting extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路编号") - private String areaNo; + private String routingCode; public WmsPartRouting(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index d013c16..9d5414b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -51,13 +51,13 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10") private Integer ruleType; - @Column(name = "ZONE_NO_SRC") + @Column(name = "SRC_ZONE_NO") @ApiParam(value = "源存储区") - private String zoneNoSrc; + private String srcZoneNo; - @Column(name = "ZONE_NO_TARGET") + @Column(name = "DEST_ZONE_NO") @ApiParam(value = "目标存储区" , example = "2") - private String zoneNoTarget; + private String destZoneNo; @Column(name = "OP_TYPE_CODE") @ApiParam(value = "作业类型" , example = "2") @@ -79,7 +79,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "延迟时间单位(M:分钟，D:天)") private String delayUnit; - + @Column(name = "ROUTING_CODE") + @ApiParam(value = "线路代码") + private String routingCode; + public WmsRoutingRule(){} } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java similarity index 86% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java index f081961..5a8967f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsRoutingRoleRepository extends BaseRepository { +public interface WmsRoutingRuleRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index ced5ed7..38ae263 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2359,4 +2359,36 @@ public class WmsHqlPack { return result; } + + + + /** + * 业务：库存查询封装 + * + * @param wmsStockQuan + * @return + */ + public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) { + DdlPackBean result = new DdlPackBean(); + + + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); + + getStringBuilderPack(wmsRouting, result); + + return result; + } + + public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) { + DdlPackBean result = new DdlPackBean(); + + + DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result); +// DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); + + getStringBuilderPack(wmsRoutingRule, result); + + return result; + } } From 2d911c425768c060fb0e326addab1fd92e4d2f1e Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 20 Sep 2019 15:40:33 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 1505f7f..cc0ebe0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -363,8 +363,6 @@ public class AndonEnumUtil { } - - /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 */ From 9f0f6da4c7f27fc111ac932e1685910b47908b4b Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 20 Sep 2019 18:59:04 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E9=A2=91=E6=AC=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 27925ec..e03b224 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -333,6 +333,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "周发生次数") private int weekendsTime; + @Transient + @ApiParam(value = "事件统计报表该事件描述的总次数") + private int acCodeTime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; @@ -380,7 +384,9 @@ public class AndonManageQueue extends BaseBean { * @param confirmTime * @param resetTime */ - public AndonManageQueue(String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){ + public AndonManageQueue(String acCode, String acNameRdd, String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){ + this.acCode = acCode; + this.acNameRdd = acNameRdd; this.workCenterCode = workCenterCode; this.workCenterNameRdd = workCenterNameRdd; this.workCellCode = workCellCode; From adf699f6188573b34099c7e1d4583c00f13177e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 20 Sep 2019 19:01:55 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BF=AB=E7=85=A7=E4=B8=B4=E6=97=B6=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 7 +++++++ .../estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java | 3 ++- 6 files changed, 38 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 9fb8432..21a3c0b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -182,6 +182,14 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "快照时间") private String snapshotTime; + @Transient + private Integer isSnapshot; + + public Integer getIsSnapshot() { + return isSnapshot == null ? 0 : isSnapshot.intValue(); + } + + /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 783f5d4..8c3b8a2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -152,11 +152,18 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "快照时间") private String snapshotTime; + @Transient + private Integer isSnapshot; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") // public Integer lockVersion; + public Integer getIsSnapshot() { + return isSnapshot == null ? 0 : isSnapshot.intValue(); + } + public WmsMoveMaster(){}; public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index a43c74b..d743cbe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -192,6 +192,13 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "快照时间") private String snapshotTime; + @Transient + private Integer isSnapshot; + + public Integer getIsSnapshot() { + return isSnapshot == null ? 0 : isSnapshot.intValue(); + } + public WmsMoveSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 542f9f4..ffa452e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -156,6 +156,13 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "快照时间") private String snapshotTime; + @Transient + private Integer isSnapshot; + + public Integer getIsSnapshot() { + return this.isSnapshot == null ? 0 : this.isSnapshot; + } + public String getAreaNo() { return areaNo; } 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 db9b615..53adc22 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 @@ -243,12 +243,19 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "快照时间") private String snapshotTime; + @Transient + private Integer isSnapshot; + public WmsStockSn(){} public WmsStockSn(String partNo){ this.partNo = partNo; } + public Integer getIsSnapshot() { + return isSnapshot == null ? 0 : isSnapshot.intValue(); + } + public Integer getSnType() { return snType == null ? 0 : snType.intValue();} public Double getQty() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index dddfab4..f7e6aac 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -218,7 +218,7 @@ public class WmsStockQuanSnapshot extends BaseBean { public WmsStockQuanSnapshot(String whNo, String zoneNo, String unit, String partNo, String partName, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, - Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty,String snapshotTime) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -235,6 +235,7 @@ public class WmsStockQuanSnapshot extends BaseBean { this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; + this.snapshotTime =snapshotTime; } public WmsStockQuanSnapshot(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { From a9e369e71697259d8c4f79066f35950d2bb6115e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 20 Sep 2019 19:15:03 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E8=BD=AC=E6=8D=A2=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++++ 1 file changed, 4 insertions(+) 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 406b93f..0137da0 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 @@ -830,6 +830,10 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } } /**