From 20999fd63a7cd5c5c06365ac5dadfbcb41f38873 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 25 Nov 2020 19:55:14 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8D=E8=89=AF?= =?UTF-8?q?=E5=93=81=E5=A4=84=E7=90=86=E6=9F=A5=E8=AF=A2=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/repository/MesDefectLocationRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java new file mode 100644 index 0000000..19fe9e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectLocation; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate:2020-11-25 19:51:00 + * @Modify: + **/ +@Repository +public interface MesDefectLocationRepository extends BaseRepository { +} From c1e3b01524537370d6db1345390e896bee40ad14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Nov 2020 14:55:39 +0800 Subject: [PATCH 2/8] BUG#12504 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 4639099..00f26d8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -250,6 +250,9 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "延迟次数") private Long sumDelayCount; + @ApiParam(value = "延迟到货百分比") + private String delayPercent; + @ApiParam("计划交货时间") private String planPlanDateTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index d2bd144..b719cdd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -36,7 +36,7 @@ public class WmsVendorDelayMasterModel extends BaseBean { private Long sumDelayCount; @ApiParam(value = "延迟到货百分比") - private Double delayPercent; + private String delayPercent; @ApiParam(value = "查询开始时间") private String startDateTime; @@ -85,4 +85,5 @@ public class WmsVendorDelayMasterModel extends BaseBean { public WmsVendorDelayMasterModel() { } + } From 787629581f4211ce7f1297e40330cf1cf17c719d Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 26 Nov 2020 15:11:03 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E6=96=B9=E5=90=91=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0SWEB2SAP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 6e210ce..34dbb05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -11,6 +11,7 @@ public class WmsInterfaceEnumUtil { MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), + SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"), WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"), SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"); @@ -61,6 +62,7 @@ public class WmsInterfaceEnumUtil { /** * -1 不在范围内 + * * @param desc * @return */ From 802d5d2320f186003bf52c3439d7cd3f18633205 Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 26 Nov 2020 15:11:55 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=A8-=E4=B8=BB=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 73c18c8..329db54 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -122,4 +123,8 @@ public class SwebPurchaseOrder extends BaseBean { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 结束时间") private String expectedTimeEnd; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } From eb14a581b98ed104d6cf824eb42291a180ba14b8 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 26 Nov 2020 17:32:35 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=9D=A4=E6=B3=B0=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 6037326..cbe1519 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -78,7 +78,7 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "SNP_QTY") @ColumnDefault("0") - @ApiParam(value = "默认包装规格", example = "0") + @ApiParam(value = "包装数量", example = "0") private Double snpQty; @Column(name = "PRINT_QTY") From 0bcb0093839651595d58c7abaee4fe55e4454cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 26 Nov 2020 17:51:36 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=902977=2011=202.5.5=20=E6=95=B4?= =?UTF-8?q?=E5=BD=A2=E4=B8=9A=E5=8A=A1=EF=BC=8C=E5=8D=95=E4=BB=B6=E7=BF=BB?= =?UTF-8?q?=E5=8C=85=E4=B8=8E=E6=95=B4=E7=AE=B1=E8=BF=87=E7=AB=99=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java new file mode 100644 index 0000000..896870a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfPackage; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfPackageRepository extends BaseRepository { +} From 7aa7738a591f33f08cc7205f09e85c16def36947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Nov 2020 19:55:20 +0800 Subject: [PATCH 7/8] BUG#12600 --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java index 1cad321..2b7f8b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java @@ -62,6 +62,14 @@ public class WmsPickingWindowTime extends BaseBean { private String shiftEndTime; @Transient + @ApiParam("今日结束时间") + private String todayEndTime; + + @Transient + @ApiParam("次日开始时间") + private String nextDayStartTime; + + @Transient @ApiParam("源存储区代码") public String srcZoneNo; From 46cc056a432504d6c027701cd7ebc03ceadcbb67 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 27 Nov 2020 15:03:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java | 5 +++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java index 56e1cb7..1cf909c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java @@ -3,9 +3,7 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -31,6 +29,9 @@ public class DynTableRow implements Serializable { // 行Size private Integer cellSize = 0; + //时间 + private String createDatetime; + // 行数据 private Map cellMap = new HashMap<>(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index cb532b0..88f58f3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -385,6 +385,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "实际发运时间") private String actualPlanTime; + @Transient + @ApiParam(value = "目的库位名称") + public String destLocateName; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -715,4 +719,12 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } + public WmsDocMovementDetails(String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo, String locateName) { + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.destLocateName = locateName; + } + }