From ec7fbd6b722035945d754db4dd9acce14141a722 Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Thu, 18 Apr 2019 11:23:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=97=A0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E4=BC=9A=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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; } From 4d9b1efb694e78ac81fb6279f648b1e596c72849 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 18 Apr 2019 14:15:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?MES=20=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 115 +++++++++++++++++++++ 1 file changed, 115 insertions(+) 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; + } + } } From 6f3fefe3b4ea29c7e01dfd820f21be9a7e0b0da7 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Thu, 18 Apr 2019 15:50:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) 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); + } } From d9a523473dbf27b7d21306b397a6fb8c2f493621 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 18 Apr 2019 17:15:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?PO=E6=95=A3=E4=BB=B6=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BB=A5=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?= =?UTF-8?q?+=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=8A=A0=E4=B8=8A=E2=80=9CRANDOM=E2=80=9D?= =?UTF-8?q?=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 4f895d0..a1803cd 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 @@ -1332,9 +1332,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);