diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 580e5f6..97ea123 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -46,4 +46,119 @@ public class MesEnumUtil { return tmp; } } + + /** + * MesPlanOrder实体对应的status值 计划状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PALN_ORDER_STATUS{ + + CREATE(10,"创建"), + DE_COMPOSE_ING(20,"分解中"), + DE_COMPOSE_ED(30,"分解完成"), + CLOSE(40,"关闭"); + + private int value; + private String description; + + PALN_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的workOrderStatus值 工单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_STATUS{ + + CREATE(10,"创建"), + LANDED(20,"下达"), + OPEN(30,"开启"), + PAUSE(40,"暂停"), + CANCEL(50,"撤销"), + CLOSE(60,"关闭"); + + private int value; + private String description; + + WORK_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的workOrderType值 工单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_TYPE{ + + STANDARD_ORDER(10,"标准工单"), + BTS_ORDER(20,"BTS工单"), + ATTEMPT_ORDER(30,"试制工单"); + + private int value; + private String description; + + WORK_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index ea7eaa6..fcd1b33 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -94,9 +94,24 @@ public class SwebHqlPack { return buildHql(vendorRel, result); } - /*public static String getPurchaseOrderDetailsWhereHql(SwebPurchaseOrderDetails swebPurchaseOrderDetails) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(swebPurchaseOrderDetails.getOrderNo(), "orderNo", result); - return buildHql(swebPurchaseOrderDetails, result); - }*/ + public static DdlPackBean getPurchaseOrderDetailsPublishListQtyWhereHql(SwebPurchaseOrderDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); + DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); + DdlPreparedPack.getStringEqualPack(details.getExpectedTime(), "expectedTime", result); + return buildHql(details, result); + } + + public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); + DdlPreparedPack.getStringEqualPack(details.getExpectedTime(), "expectedTime", result); + return buildHql(details, result); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index b06b867..342b258 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -42,7 +42,10 @@ public class EngineRulePersistence extends BaseBean { // 规则的描述,包含规则的用法,参数说明等 @Column(name = "RULE_REMARK", length = 2000) private String ruleRemark; - // 加载好的规则引擎对象 + // 加载好的规则引擎对象(有状态) @Transient private transient Object kieSession; + // 加载好的规则引擎对象(无状态) + @Transient + private transient Object statelessKieSession; } 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 7426624..f3b29c2 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 @@ -1330,9 +1330,9 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringLikerPack(wmsPoSn.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsPoSn.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); + HqlPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsPoSn, result);