From cfa465817f3c3e8a2e4b77bdfa6c7f56709233ba Mon Sep 17 00:00:00 2001 From: gcj Date: Thu, 26 Dec 2019 09:43:31 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=E3=80=91?= 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 bb2b334..6aa16d4 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 @@ -2427,7 +2427,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result); // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); From 019cb91a4c285704eeb197f4ae1197202429107d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 26 Dec 2019 09:51:41 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1329?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 111 +++++++-------------- .../i3plus/pojo/mes/bean/MesButtonStatus.java | 18 +--- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 +++++ 3 files changed, 61 insertions(+), 91 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 2a2e426..9c4d8f6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,41 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * JIS发运模式类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_PATTERN_TYPE { + ONE(10, "一套发运"), + TRUE(20, "多套发运"), + FALSE(30, "单产品多套发运"); + + private int value; + private String description; + + MES_JIS_PATTERN_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } /** * 是否解析 @@ -2386,82 +2421,6 @@ public class MesEnumUtil { } /** - * mes按钮状态配置 判断符号 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_BUTTON_STATUS_JUDGE_FLAG { - - EQUAL("=", "等于"), - NOT_EQUAL("!=", "不等于"), - GREATER_THAN(">", "大于"), - NOT_LESS_THAN(">=", "大于大于"), - LESS_THAN("<", "小于"), - NOT_GREATER_THAN("<=", "小于等于"); - - private String value; - private String description; - - MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * mes按钮状态配置 逻辑符号 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_BUTTON_STATUS_LOGIC_FLAG { - - AND("&&", "逻辑与"), - OR("||", "逻辑或"); - - private String value; - private String description; - - MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** * MesWorkOrder实体对应的approvalStatus值 审批状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java index 5c7d7ae..1b7c85c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java @@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean { @ApiParam("实体类名称") private String ClassName; - @Column(name = "STATUS_FIELD") - @ApiParam("状态字段") - private String statusField; - - @Column(name = "JUDGE_FLAG") - @ApiParam("判断符合") - private String judgeFlag; - - @Column(name = "STATUS_VALUE") - @ApiParam("状态值") - private String statusValue; - - @Column(name = "LOGIC_FLAG") - @ApiParam("逻辑符合") - private String logicFlag; + @Column(name = "APPEND_HQL") + @ApiParam("拼接HQL") + private String appendHql; @Column(name = "STATUS_DESC") @ApiParam("描述") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index b9eb3ec..8d904cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2097,4 +2097,27 @@ public class MesHqlPack { } return packBean; } + + /** + * JIS发运模式 + * @param jisPattern + * @param organizeCode + * @return + */ + public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); + if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { + DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getTopNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getPatternType())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); + } + return packBean; + } } From fb8b07b2274ec745f1a67abb11cabb03ca582ad2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 26 Dec 2019 10:01:03 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1329?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 +--------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 8d904cf..22f0c48 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2098,26 +2098,5 @@ public class MesHqlPack { return packBean; } - /** - * JIS发运模式 - * @param jisPattern - * @param organizeCode - * @return - */ - public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); - if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { - DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); - } - if (!StringUtils.isEmpty(jisPattern.getTopNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); - } - if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); - } - if (!StringUtils.isEmpty(jisPattern.getPatternType())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); - } - return packBean; - } + } From 5ea55135dc7d211e12e3893a0784e59b39d54a4f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Dec 2019 10:12:29 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E3=80=906714=20FIFO=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E9=9C=80=E8=A6=81=E6=9C=89=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8A=A0=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E9=80=9A=E7=94=A8=E5=8F=98=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=BB=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E7=9A=84FIFO=E4=BF=A1=E6=81=AF=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 892693a..422cf79 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 @@ -278,6 +278,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("是否寄售 1-是 2-否") private Integer consignation; + @Transient + @ApiParam(value = "是否最早批次") + public String isFifo; + public WmsStockSn() { } From 629e2f82706ac469c96ea9e676336767b3b72c01 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 26 Dec 2019 11:11:24 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=96=E4=BF=9D=E5=AD=98=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/model/GanttPager.java | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java new file mode 100644 index 0000000..3da5e29 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 甘特图分页查询参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-22 + * @Modify: + **/ +@Data +@Api("甘特图分页查询参数") +public class GanttPager extends Pager { + public static class SortData { + // 排序对象 + private String field; + // 排序类型，1为升序，0为降序 + private Boolean ascending; + + public String getField() { + return field; + } + + public void setField(String field) { + this.field = field; + } + + public Boolean getAscending() { + return ascending; + } + + public void setAscending(Boolean ascending) { + this.ascending = ascending; + } + } + private String filter; + private List sorts; +} From b5d50af25077c49dd93dfed78c142530c71975a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 26 Dec 2019 11:34:49 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E3=80=90KT-1284=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java index c37935e..4a71d08 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java @@ -8,10 +8,7 @@ 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; -import javax.persistence.UniqueConstraint; +import javax.persistence.*; /** * @Description : 附件表 @@ -58,4 +55,8 @@ public class WmsFile extends BaseBean{ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") private String refType; + + @Transient + @ApiParam("预览前缀") + public String previewPrefix; } \ No newline at end of file From 32c9bbbe85628523153788ef42aaba537dfa012e Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 26 Dec 2019 11:39:33 +0800 Subject: [PATCH 07/11] =?UTF-8?q?task=20`1308`=204=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 2 ++ .../mes/repositorymongo/MesProductDataRepository.java | 15 +++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java new file mode 100644 index 0000000..e4d90a6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +public @interface UseMongoDb { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 2b2d84a..602bb21 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,6 +34,7 @@ import javax.persistence.Transient; @Index(columnList = "OBJECT_CODE"), @Index(columnList = "MODIFY_DATE_TIME") }) +//@UseMongoDb @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java new file mode 100644 index 0000000..2f615de --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java @@ -0,0 +1,15 @@ +//package cn.estsh.i3plus.pojo.mes.repositorymongo; +// +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; +//import cn.estsh.i3plus.pojo.mes.bean.MesProductData; +//import org.springframework.stereotype.Repository; +// +///** +// * @Author: Wynne.Lu +// * @CreateDate: 2019/12/25 1:30 下午 +// * @Description: +// **/ +//@Repository +//public interface MesProductDataRepository extends BaseMongoRepository { +//} From 1f8885779f840c204858b35892b3a6aa958e3f45 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Dec 2019 12:50:53 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E3=80=906714=20FIFO=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E9=9C=80=E8=A6=81=E6=9C=89=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8A=A0=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E9=80=9A=E7=94=A8=E5=8F=98=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=BB=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E7=9A=84FIFO=E4=BF=A1=E6=81=AF=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 3ac14cc..813538d 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 @@ -208,7 +208,11 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam("优先级") - private String priority; + private Integer priority; + + @Transient + @ApiParam("优先级描述") + private String priorityStr; public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -272,8 +276,10 @@ public class WmsDocMovementDetails extends BaseBean { this.destLocateNo = destLocateNo; } - public WmsDocMovementDetails (String partNo) { + public WmsDocMovementDetails (String partNo,Integer priority,String orderNo) { this.partNo = partNo; + this.priority = priority; + this.orderNo = orderNo; } public WmsDocMovementDetails (String partNo,String orderNo) { From 7f69df95df33854d25d829f0eec8f2921359bced Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 26 Dec 2019 13:53:17 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E3=80=90=E5=AD=98=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9=E2=80=9C?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E6=9D=A1=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E2=80=9D=E3=80=91=E3=80=90bug7060=09?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 14c0486..c08e1eb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -181,6 +181,23 @@ public class WmsCSFactTrans extends BaseBean { this.srcZoneNo = srcZoneNo; this.srcWhNo = srcWhNo; } + + public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo,String vendorNo) { + this.orderNo = orderNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.factQty = factQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.srcZoneNo = srcZoneNo; + this.srcWhNo = srcWhNo; + this.vendorNo= vendorNo; + } public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) { this.partNo=partNo; this.partNameRdd = partNameRdd; From d34ba5e11428438779b334af054004844d80b117 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 26 Dec 2019 16:20:56 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E3=80=90=20=E7=BB=8F=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=85=AD=E5=90=88=E4=B8=80=E5=85=81=E8=AE=B8=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=88=96=E7=9B=AE=E6=A0=87=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=9D=A5=E6=BA=90=E6=8B=86=E5=88=86=E6=88=90?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=9A=84=E5=8D=95=E6=8D=AE=20=E3=80=91bug706?= =?UTF-8?q?8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 --- 1 file changed, 3 deletions(-) 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 813538d..6d25a62 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 @@ -210,9 +210,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("优先级") private Integer priority; - @Transient - @ApiParam("优先级描述") - private String priorityStr; public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; From 032bd61b878d974e643a5cc653792b8f99a4c23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Dec 2019 16:32:59 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AD=89=E4=BB=BD=E6=8B=86=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD+=20=E5=BF=AB=E9=80=9F=E7=A7=BB=E5=BA=93=E5=86=99?= =?UTF-8?q?=E5=85=A5=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E=E7=BB=86=E7=9A=84?= =?UTF-8?q?=E8=A1=8C=E5=8F=B7=E5=86=99=E5=85=A5=E8=A7=84=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=EF=BC=8C=E4=BC=98=E5=8C=96=E6=80=A7=E8=83=BD+=20?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F=E4=BA=A4=E6=98=93=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=9A=E6=9C=89=E6=9D=A1=E7=A0=81=E5=B0=B1=E6=89=A3=E5=87=8F?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=B2=E5=A4=84=E7=90=86=E6=95=B0=E9=87=8F?= =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E5=AE=8C=E6=AF=95=E6=89=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E5=A4=84=E7=90=86=E5=B9=B6=E4=BC=A0=E7=BB=99?= =?UTF-8?q?MOVE=5FTO=5FERP=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8F+=20?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98=E6=98=8E=E7=BB=86=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=88=97=E2=80=9C=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E6=95=B0=E9=87=8F=E2=80=9D=EF=BC=88=E5=BE=85=E8=BF=87?= =?UTF-8?q?=E8=B4=A6=E7=9A=84=E6=95=B0=E9=87=8F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 11 ++++++++--- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 ++++++++++++---------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 8e6d27e..f1bf9a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -62,6 +62,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "处理数量", example = "0") public Double transQty; + @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)") + @ApiParam(value = "已处理数量", example = "0") + public Double handledQty; + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } 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 811158c..837cbf2 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 @@ -124,14 +124,18 @@ public class WmsStockQuan extends BaseBean { private String prodCfgTypeName; @Transient - @ApiParam(value = "箱数", example = "-1") + @ApiParam(value = "箱数") private Integer boxQty; @Transient - @ApiParam(value = "零件数", example = "-1") + @ApiParam(value = "零件数") private Double partQty; @Transient + @ApiParam(value = "处理中数量") + private Double transQty; + + @Transient @ApiParam(value = "ERP库存地") private String areaNo; @@ -211,7 +215,7 @@ public class WmsStockQuan extends BaseBean { public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, - Double consignQty, Double lockQty,Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -281,5 +285,6 @@ public class WmsStockQuan extends BaseBean { this.consignQty = consignQty; this.lockQty = lockQty; this.scrapQty = scrapQty; + this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + 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 bb2b334..73bfda6 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 @@ -229,13 +229,13 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result); - if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){ + if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { ArrayList numList = new ArrayList<>(); numList.add(0); numList.add(wmsPOMaster.getPriorRC()); numList.add(null); DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result); - }else{ + } else { DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); } @@ -923,8 +923,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); - DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result); - DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(), "qualityDate", result); if (wmsStockSn.getSnStatus() == null) { DdlPreparedPack.getInPackArray(new Integer[]{ WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), @@ -1613,7 +1613,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE}, + new String[]{"sn", "createDatetime"}, result); return result; } @@ -2007,8 +2009,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); - DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringNotNullPack("locateNo", result); result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''"); @@ -2618,15 +2620,15 @@ public class WmsHqlPack { * @param wmsPullTaskMaster * @return */ - public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) { + public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster, String statusList) { DdlPackBean result = new DdlPackBean(); List stringList = null; List integerList = null; //List integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList()); - if(StringUtils.isNotBlank(statusList)){ + if (StringUtils.isNotBlank(statusList)) { stringList = Arrays.asList(statusList.split(",")); integerList = new ArrayList<>(); - for(String sl : stringList){ + for (String sl : stringList) { integerList.add(Integer.valueOf(sl)); } }