From db6522fba3976e622dc9f07dda94ff5c8bde00b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 17 Jan 2020 17:18:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java index 442e993..99b223f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java @@ -74,4 +74,14 @@ public class WmsSearchElement extends BaseBean { * 搜索组连接符 */ private String groupConnector; + + /** + * 开始时间字符串 + */ + private String startDateTimeStr; + + /** + * 结束时间字符串 + */ + private String endDateTimeStr; } From cf203390b8729e1cfbb5941005c4322674dd7937 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 19 Jan 2020 11:54:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=AE=B5=E7=BC=96=E8=BE=91=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 91456a6..ca8b7f2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -61,14 +61,17 @@ public class Material extends BaseAPS { @Column(name="PURCHASE_LEAD_TIME") @ApiParam(value ="采购提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String purchaseLeadTime; @Column(name="MANUF_LEAD_TIME") @ApiParam(value ="制造提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String manufLeadTime; @Column(name="SHIPMENT_LEAD_TIME") @ApiParam(value ="配送提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String shipmentLeadTime; @Column(name="UNIT_PURCHASE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index e9c592a..11cedff 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -61,10 +61,12 @@ public class OperInput extends BaseAPS { @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxSpaceTime; @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; public Operation getOperation() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 0568af5..b6923c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -46,27 +46,32 @@ public class OperResource extends BaseAPS { @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - @FieldAnnotation(notEmpty = true) + @FieldAnnotation(notEmpty = true, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String postTime; @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPrevSdTime; @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPostSdTime; @Column(name="PRIORITY") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index d115131..274574b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -77,10 +77,12 @@ public class Operation extends BaseAPS { @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxSpaceTime; @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; public ProductRouting getProductRouting() { From 415ae5a45bbced07c572e9ea26b8a88afea961b1 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 19 Jan 2020 15:55:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=907457=201.=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E4=B8=A4=E6=AD=A5?= =?UTF-8?q?=E5=8F=91=E8=BF=90=EF=BC=8C=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=90=8E=EF=BC=8C=E5=9C=A8=E5=81=9A=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E6=AD=A5=E5=8F=91=E8=BF=90=E5=87=BA=E5=BA=93=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=89=AB=E6=8F=8F=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=9A=84=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index f3856c7..dbd5e1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -184,6 +184,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "标签") private String tag; + @Transient + @ApiParam("物料编号组") + public String[] partNos; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } 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 189877c..8c32ae6 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 @@ -1906,6 +1906,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result);