From 804fd915278e1f1882ddb492a3244c09df5d5808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Mon, 17 Jun 2019 15:15:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=20=E5=AE=8C=E5=96=84=20SAP=20-=20WMS=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 f79829d..c945e71 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,6 +28,11 @@ public class MappingItem { */ public String destName; /** + * 该字段在目标表是不是主键 + * 1=主键 + */ + public Integer destPk; + /** * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确 * 可以使用的表达式： #date, #time, #guid, #Q.warehouse(#zone) */ @@ -39,6 +44,7 @@ public class MappingItem { + this.srcName + ", destBeanName:" + this.destBeanName + ", destName" + this.destName + ", defaultValue:" - + this.defaultValue; + + this.defaultValue + ", destPk:" + + this.destPk; } } From 45cd34f067dd0f4114848ca85eaa9283a39ee2de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Mon, 17 Jun 2019 17:19:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1.=20SAP=20-=20WMS=20=E6=8E=A5=E5=8F=A3=20P?= =?UTF-8?q?OJO=20=E7=B1=BB=E4=B8=AD=E5=A2=9E=E5=8A=A0=20groupName=20?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index d12ebd1..7f56b8d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -89,4 +89,11 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Column(name = "DEST_COLUMN_MAPPING", length = 5000) public String destColumnMapping; + + /** + * 接口分组名称 + * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS + */ + @Column(name = "GROUP_NAME") + public String groupName; } From d3431028d71799c8d68a4cfe6a17cd51f98a11ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 17 Jun 2019 18:06:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?StockQuan=E8=A1=A8=E6=96=B0=E5=A2=9EScrapQt?= =?UTF-8?q?y=E5=AD=97=E6=AE=B5=EF=BC=9ANC,=E7=9B=98=E7=82=B9=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=EF=BC=8C=E5=87=BA=E5=85=A5=E7=A7=BB=E5=BA=93=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6+=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E9=80=BB=E8=BE=91=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 12 +++++++++++- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 +++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index fb9a9df..d56b315 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -102,6 +102,11 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "锁定数量", example = "0") private Double lockQty; + @Column(name = "SCRAP_QTY") + @ColumnDefault("0") + @ApiParam(value = "报废数量", example = "0") + private Double scrapQty; + public Double getQty() { return this.qty == null ? 0 : this.qty; } @@ -134,10 +139,14 @@ public class WmsStockQuan extends BaseBean { return this.lockQty == null ? 0 : this.lockQty; } + public Double getScrapQty() { + return this.scrapQty == null ? 0 : this.scrapQty; + } + public WmsStockQuan() { } - public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) { + public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; this.holdQty = holdQty; @@ -146,5 +155,6 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; + this.scrapQty = scrapQty; } } 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 eeb9fba..9129da2 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 @@ -1687,6 +1687,18 @@ public class WmsHqlPack { getStringBuilderPack(wmsLineLocatePart, result); return result; } + /** + * 任务数据来源 分页查询 + * + * @param wmsTaskSrc + * @return + */ + public static DdlPackBean packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) { + DdlPackBean result = new DdlPackBean(); - + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result); + getStringBuilderPack(wmsTaskSrc, result); + return result; + } } From 1eda68e151d3004020cdee01e1afc0270ef9a05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 17 Jun 2019 20:19:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?sap=E6=8E=A5=E5=8F=A3=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java | 81 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/SapBase.java | 71 +++++++++++++++++++ 2 files changed, 152 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java new file mode 100644 index 0000000..e02ee39 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java @@ -0,0 +1,81 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : ASN + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-17 10:50 + * @Modify: + **/ +@Data +@Api(value = "ASN计划", description = "ASN计划") +public class SapAsn extends SapBase { + + @ApiParam(value = "ASN号") + @AnnoOutputColumn + private String zasnno; + + @ApiParam(value = "供应商代码") + @AnnoOutputColumn + private String lifnr; + + @ApiParam(value = "ASN item") + @AnnoOutputColumn + private Double zrnum; + + @ApiParam(value = "物料编码") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "数量") + @AnnoOutputColumn + private Double zcnNum; + + @ApiParam(value = "计量单位") + @AnnoOutputColumn + private String unit; + + @ApiParam(value = "特殊采购标识") + @AnnoOutputColumn + private String pstyp; + + @ApiParam(value = "计划交货日期") + @AnnoOutputColumn + private String zdate; + + @ApiParam(value = "计划交货时间") + @AnnoOutputColumn + private String zcjsj; + + @ApiParam(value = "工厂代码") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "收货库存地点") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "凭证标识") + @AnnoOutputColumn + private String zdoc; + + @ApiParam(value = "状态", example = "U") + @AnnoOutputColumn + private String zstasI; + + @ApiParam(value = "条码信息") + @AnnoOutputColumn + private String ztxm; + + @ApiParam(value = "道口") + @AnnoOutputColumn + private String zdk; + + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java new file mode 100644 index 0000000..1a9ecfe --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.UUID; + +/** + * @Description : sap接口基础公共字段 + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-17 16:21 + * @Modify: + **/ +@Data +public class SapBase { + + @ApiParam(value = "处理人", example = "-1") + private String actusr = "导入"; + + @ApiParam(value = "SID", example = "-1") + private String sid = UUID.randomUUID().toString() + UUID.randomUUID().toString(); + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiParam(value = "接收数据日期", example = "-1") + private String recymd; + + @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "接收数据时间", example = "-1") + private String rechms; + + @ApiParam(value = "同步标志", example = "-1") + private String synflg = "Y"; + + @ApiParam(value = "同步日期", example = "-1") + private String synymd; + + @ApiParam(value = "同步时间", example = "-1") + private String synhms; + + @ApiParam(value = "处理标志", example = "-1") + private String actflg = "Y"; + + @ApiParam(value = "处理日期", example = "-1") + private String actymd; + + @ApiParam(value = "处理时间", example = "-1") + private String acthms; + + @ApiParam(value = "状态标志", example = "-1") + private String staflg; + + @ApiParam(value = "顺序号", example = "-1") + private Integer seq; + + @ApiParam(value = "GUID", example = "-1") + private String guid; + + public String getSynymdTime() { + SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD"); + return format.format(new Date()); + } + + public String getSynhmsTime() { + SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss"); + return format.format(new Date()); + } +} From 9f56d34572814f2bf576c4726b3d895a14264cc2 Mon Sep 17 00:00:00 2001 From: jiajack Date: Mon, 17 Jun 2019 20:56:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=9A=84ID=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java index f99297c..a5621fc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java @@ -104,6 +104,11 @@ public class WmsActionLogDetails extends BaseBean { @ApiParam(value = "回显组件方法ID", example = "1") private Long showAmId; + @Column(name = "AGD_ID") + @ApiParam(value = "流程明细编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long agdId; + public Long getAsId() { if (asId != null) { return asId.longValue();