From 10c276fb161333108271e6ff3d5f3b4c933f5a0e Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 12 Jun 2019 12:24:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/iface/IResultSetCall.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java new file mode 100644 index 0000000..d15f322 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.base.iface; + +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + * @Description : 实现此接口，对数据集进行自定义封装 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-06-11 16:12 + * @Modify: + **/ +public interface IResultSetCall { + + /** + * 数据集默认方法 + * @param rs 数据集 + * @return 泛型对象 + * @throws SQLException + */ + T invoke(ResultSet rs) throws SQLException; +} From 2adff745fb7966546ee3a5e62090097b7da81d62 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 12 Jun 2019 16:26:49 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E3=80=80=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 550edcf..102685a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -55,7 +55,7 @@ public class BlockFormEnumUtil { public static int codeOfValue(String code) { int tmp = 1; for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code.toLowerCase())) { + if (values()[i].code.toLowerCase().equals(code.toLowerCase())) { tmp = values()[i].value; } } From 4261207e54f53c6844777c8b43cbfbdd39d56f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 12 Jun 2019 18:00:21 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=88=E6=94=B6=E8=B4=A7=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=8E=82+=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E5=8F=AF=E4=BB=A5=E4=B8=BA=E7=A9=BA+=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=EF=BC=9A=E6=9C=AA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E9=9C=80=E8=A6=81=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= 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 c8db411..d6c0f64 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 @@ -1222,13 +1222,13 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); - - getStringBuilderPack(wmsActionModule, result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result; } From 052652dd3666e3fc5609f32063fb96c7692f09d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 12 Jun 2019 18:10:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=88=E6=94=B6=E8=B4=A7=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=8E=82+=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E5=8F=AF=E4=BB=A5=E4=B8=BA=E7=A9=BA+=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=EF=BC=9A=E6=9C=AA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E9=9C=80=E8=A6=81=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d6c0f64..61a71fb 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 @@ -1221,7 +1221,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsActionModule(WmsActionModule wmsActionModule) { DdlPackBean result = new DdlPackBean(); - //查询参数封装 + // 查询参数封装 DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); From cbb658e08863bfda13823072e6dd0d0b491d70c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 12 Jun 2019 18:39:08 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=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/WmsPoSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 4dc9db4..e90728d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -115,4 +115,8 @@ public class WmsPoSn extends BaseBean { @Transient @ApiParam(value = "条码") public String sn; + + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; } 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 78e805f..faccba1 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 @@ -196,6 +196,10 @@ public class WmsStockSn extends BaseBean { @Transient public String labelNo; + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; + public WmsStockSn(){} public WmsStockSn(String partNo){ From 37eb33bcad367710e0b0a7d27cc7115b1b08628b Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Wed, 12 Jun 2019 19:12:14 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E5=BA=93=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E4=BB=A5=E5=8F=8AWmsHqlpack=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0sql=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsLineLocatePart.java | 76 ++++++++++++++++++++++ .../repository/WmsLineLocatePartRepository.java | 14 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 ++++++ 3 files changed, 110 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLineLocatePartRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java new file mode 100644 index 0000000..738622a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + + +/** + * @Description :边线库物料关系 + * @Reference : + * @Author : yerik.shi + * @CreateDate : 2019-06-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LINE_LOCATE_PART") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="线边库物料信息",description = "线边库物料信息") +public class WmsLineLocatePart extends BaseBean { + + @Column(name="LOCATE_NO") + @ApiParam(value ="库位代码") + private String locateNo; + + @Column(name="PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + public Double getPullQty() { + return pullQty == null ? 0D : this.pullQty.doubleValue(); + } + + public Double getMax() { + return max== null ? 0D : this.max.doubleValue(); + } + + public Double getMin() { + return min== null ? 0D : this.min.doubleValue(); + } + + public Integer getIsGeneratePicklist() { + return isGeneratePicklist== null ? 0: this.isGeneratePicklist.intValue(); + } + + @Column(name = "PULL_QTY") + @ApiParam(value = "拉动数量") + private Double pullQty; + + @Column(name = "Max") + @ApiParam(value = "最大值") + private Double max; + + @Column(name = "Min") + @ApiParam(value = "最小值") + private Double min; + + @Column(name = "IS_GENERATE_PICKLIST") + @ApiParam(value = "是否生成领料单") + private Integer isGeneratePicklist; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLineLocatePartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLineLocatePartRepository.java new file mode 100644 index 0000000..24c1c60 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLineLocatePartRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsLineLocatePart; + +/** + * @Description : 线边库物料表 + * @Reference : + * @Author : yerik.shi + * @CreateDate : 2019-06-12 + * @Modify: + **/ +public interface WmsLineLocatePartRepository 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 c8db411..72226ab 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 @@ -1669,4 +1669,24 @@ public class WmsHqlPack { return result; } + + + /** + * 线边库物料信息 分页查询 + * + * @param wmsLineLocatePart + * @return + */ + public static DdlPackBean packHqlWmsLineLocatePart(WmsLineLocatePart wmsLineLocatePart) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getPartNameRdd(), "partNameRdd", result); + getStringBuilderPack(wmsLineLocatePart, result); + return result; + } + + } From 65efb44ddeaf8663b5c6f4dccd606d5f65b55c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Wed, 12 Jun 2019 20:13:32 +0800 Subject: [PATCH 7/7] =?UTF-8?q?1.=20=E6=8A=8A=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA=20Object?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java index 036f65e..993e59a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java @@ -28,9 +28,9 @@ public class MappingItem { */ public String destName; /** - * 当来源数据中无此字段时的默认值 + * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确 */ - public String defaultValue; + public Object defaultValue; @Override public String toString() {