From 031d57e0816f7695719136c670abb7b17b3c82a8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 9 Jan 2020 09:30:06 +0800 Subject: [PATCH 1/3] JIS --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 09b331d..6635e25 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; + @Lob @Column(name = "RULE") @ApiParam("规则") private String rule; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index c838c4d..19d1a22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -102,6 +102,7 @@ public class MesEquipmentModel implements Serializable { } + //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) { this.id = id; this.equipmentCode = equipmentCode; @@ -111,6 +112,8 @@ public class MesEquipmentModel implements Serializable { this.equipmentCategory = equipmentCategory; } + //根据生产线，工位获取设备集合 findMesEquipmentList + //获取设备分页数据-组织模型 queryMesEquipmentByPagerOrg public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) { this.wcId = wcId; this.id = id; @@ -122,6 +125,7 @@ public class MesEquipmentModel implements Serializable { this.areaCode = areaCode; } + //根据条件查询设备所有有效数据-组织模型下拉框及联 queryMesEquipmentList public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) { this.id = id; this.equipmentNameAndworkCellName = equipmentNameAndworkCellName; @@ -134,13 +138,13 @@ public class MesEquipmentModel implements Serializable { } - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + //获取设备分页数据 queryMesEquipmentByPager + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; this.status = status; this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; this.areaCode = areaCode; this.equipmentType = equipmentType; this.equipmentCategory = equipmentCategory; From fa576d7a6d0cb4fb2c72dc79d179739e2b9b5e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 9 Jan 2020 09:56:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=906847=20=E5=BC=80=E5=8F=91=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=BC=82=E5=B8=B8=E7=9A=84=E9=A2=84=E8=AD=A6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E3=80=82=E5=AD=98=E5=9C=A8=E5=A4=84=E7=90=86=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=B1=95=E7=A4=BA=E3=80=82=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=89=8D=E6=89=80=E6=9C=89=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=9D=87=E9=9C=80=E5=A4=84=E7=90=86=E5=AE=8C=E6=88=90=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 a4405ea..ec13c1e 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 @@ -159,7 +159,7 @@ public class WmsMoveMaster extends BaseBean { @Transient @ApiParam("总行数") - private Integer itemQty; + private Long itemQty; // @Version // @Column(name = "LOCK_VERSION") @@ -225,10 +225,10 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } - public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){ + public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){ this.itemQty = itemQty; this.transTypeCode = transTypeCode; - this.itemStatus = itemStatus; + this.orderStatus = orderStatus; } public Double getTransQty() { From 4e0f40042a55701dbb42a3ea782c8671baad6f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 9 Jan 2020 11:49:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/dynamic/WmsSearchElementFunction.java | 11 +++++++++-- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index 43cbb23..dd1b7b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -25,8 +25,8 @@ import javax.persistence.Table; @Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { @Index(columnList = "FUNCTION_ID"), @Index(columnList = "SEARCH_ELEMENT_ID"), - @Index(columnList = "IS_SHARE"), - @Index(columnList = "USER_CODE") + @Index(columnList = "USER_CODE"), + @Index(columnList = "SEARCH_NAME") }) @DynamicInsert @DynamicUpdate @@ -56,7 +56,14 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "用户编号") private String userCode; + /** + * 1-共享，2-不共享 + */ @Column(name = "IS_SHARE") @ApiParam(value = "是否共享") private Integer isShare; + + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; } 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 65c25de..cdf4f66 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 @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; @@ -2727,4 +2729,19 @@ public class WmsHqlPack { getStringBuilderPack(wmsFieldInfo, result); return result; } + + /** + * WMS搜索记录查询条件 + * + * @param searchElementFunction + * @return + */ + public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result); + DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result); + DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result); + getStringBuilderPack(searchElementFunction, result); + return result; + } }