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 1/4] =?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 2/4] =?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 3/4] =?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() { From db7b849f3e150106e98e673f1ee99db878cc1282 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 12 Jun 2019 20:38:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E4=B8=BB=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index 48c4aa2..68c98d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -15,7 +15,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description :作业步骤类型信息 + * @Description :作业步骤信息 * @Reference : * @Author : silliter.yuan * @CreateDate : 2018-11-22 9:33 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 7ed02fe..1314953 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 @@ -120,27 +120,27 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") - public String AssignSrcWhNo; + public String assignSrcWhNo; @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") - public String AssignSrcZoneNo; + public String assignSrcZoneNo; @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") - public String AssignDestWhNo; + public String assignDestWhNo; @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") - public String AssignDestZoneNo; + public String assignDestZoneNo; @Column(name = "PLAN_DATE") @ApiParam(value = "计划日期") - private String AssignPlanDate; + private String assignPlanDate; @Column(name = "PLAN_TIME") @ApiParam(value = "计划时间") - private String AssignPlanTime; + private String assignPlanTime; @Transient @ApiParam(value = "发运单号")