From e42cd80b8bfbb4196807e3834ddde043bf809b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 26 Sep 2019 16:17:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0=E5=BE=85=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 38 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 +-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 ++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0137da0..44b70e6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -377,6 +377,44 @@ public class WmsEnumUtil { } /** + * 条码打印状态 （库存条码打印字段使用） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_STATUS { + PRINTED(1, "已打印"), NOPRINT(2, "未打印"), GENERATE(3, "退料生成条码"); + + private int value; + private String description; + + PRINT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** * 库位类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 43dfd15..37201b2 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 @@ -128,11 +128,11 @@ public class WmsStockSn extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") private Integer snStatus; /** - * 1:已打印；2：未打印 + * 1:已打印；2：未打印；3：退料生成条码 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") private Integer printed; @Column(name = "PDATE") 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 38ae263..b6cafeb 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 @@ -208,6 +208,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + + // 查询计划时间在指定范围的单号，查询这些单号的数据 + if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { + DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); + } + getStringBuilderPack(wmsPOMaster, result); return result; @@ -593,6 +599,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + // 查询计划时间在指定范围的单号，查询这些单号的数据 + if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) { + DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result); + } + getStringBuilderPack(wmsASNMaster, result); return result; @@ -1529,6 +1540,12 @@ public class WmsHqlPack { DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); result.setOrderByStr(wmsStockSn.orderBy()); + if(wmsStockSn.getPrinted()!= null){ + if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){ + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result); + } + } + getStringBuilderPack(wmsStockSn, result); return result; } From 8f7d3b371bdc36d9f494c9f84d17bb1f2204e92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Sep 2019 18:42:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E5=9B=9E=E6=98=BE=E7=BB=99=E5=89=8D=E7=AB=AF=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=AD=A5=E9=AA=A4=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsActionResponseBean.java | 7 ++-- .../pojo/wms/bean/WmsActionGroupDetails.java | 40 ++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index 40edbf5..a5a4d10 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -35,8 +35,11 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("进度") public String percent = "消息提示："; - @ApiParam("当前步骤") - public Integer currentStep; + @ApiParam("当前步骤类型名称") + public String currentStepTypeName; + + @ApiParam("当前步骤名称") + public String currentStepName; @ApiParam("总步数") public int totalStep; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 1cdfb49..e8455c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -84,6 +84,10 @@ public class WmsActionGroupDetails extends BaseBean { private String asName; @Transient + @ApiParam(value = "步骤类型名称") + private String atName; + + @Transient @ApiParam(value = "流程名称") private String agName; @@ -112,11 +116,13 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "是否自动开窗", example = "2") private Integer isAutoOpenWindow; + @Column(name = "SEARCH_KEY") @ApiParam(value = "搜索KEY") - public String searchKey; + private String searchKey; + @Column(name = "GROUP_KEY") @ApiParam(value = "分组KEY") - public String groupKey; + private String groupKey; public int getSeqVal() { return this.seq == null ? 0 : this.seq; @@ -153,4 +159,34 @@ public class WmsActionGroupDetails extends BaseBean { public int getLenCheckVal() { return this.lenCheck == null ? 0 : this.lenCheck; } + + public WmsActionGroupDetails() { + } + + public WmsActionGroupDetails(Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper, + Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId, + String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow, + Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, String groupKey) { + this.agId = agId; + this.seq = seq; + this.okSeq = okSeq; + this.ngSeq = ngSeq; + this.valueType = valueType; + this.toUpper = toUpper; + this.lenCheck = lenCheck; + this.regularCheck = regularCheck; + this.regularCheckFailMsg = regularCheckFailMsg; + this.asId = asId; + this.atId = atId; + this.asName = asName; + this.atName = atName; + this.goToBtnCode = goToBtnCode; + this.goToBtnName = goToBtnName; + this.preShow = preShow; + this.showAmId = showAmId; + this.isCommitAble = isCommitAble; + this.isAutoOpenWindow = isAutoOpenWindow; + this.searchKey = searchKey; + this.groupKey = groupKey; + } } From 1d281da5314cdb84f80dfd2e18c79c7b7e26d6b3 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 26 Sep 2019 20:34:57 +0800 Subject: [PATCH 3/4] add order spread to aps --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java | 2 +- .../i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml | 2 +- 7 files changed, 26 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index b11e5dc..cf27632 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import io.swagger.annotations.Api; @@ -21,7 +22,7 @@ import java.util.List; **/ @Data @Api("订单基类") -public class BaseOrder extends BaseAPS { +public class BaseOrder extends BaseCode { @Column(name="COUNT") @ApiParam(value ="数量") private Double count; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index aee742f..817df4a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.lang.reflect.Method; +import java.sql.JDBCType; /** * @Description :字段信息 @@ -75,6 +76,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="主键标识") private Boolean mainKey; + @Column(name="JDBC_TYPE") + @ApiParam(value ="数据库类型") + private JDBCType jdbcType; + @JsonIgnore private transient Class clazz; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 701ac20..54d7fc4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,4 +38,7 @@ public class Inventory extends BaseOrder { @ApiParam(value ="多余量") private Double excessCount; + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index 7fe588b..b1676d8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -43,4 +45,8 @@ public class PurchaseOrder extends BaseOrder { @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") private Double excessCount; + + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index ee332b9..f5a85dd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -40,4 +42,8 @@ public class SalesOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") private String calcLeadTime; + + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java index e2dba7e..49e3a5f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java @@ -243,7 +243,7 @@ public class BeanRelationUtil { * 将指定包下的类加载到内存中 * @param packName */ - private static List> loadClass(String packName) { + public static List> loadClass(String packName) { List> clses = new ArrayList<>(); ClassLoader loader = Thread.currentThread().getContextClassLoader(); String strFile = packName.replaceAll("\\.", "/"); diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml index 9f0d45d..624a636 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file From cd8a5df9912699b16f584add423085d5f3057f8c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Sep 2019 21:06:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?VDA=20=E7=94=9F=E4=BA=A7=E5=BF=AB=E9=80=9F?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=BB=84=E4=BB=B6=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0137da0..29d6961 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -560,7 +560,9 @@ public class WmsEnumUtil { ASN(200, "ASN", "ASN"), PO(210, "PO", "PO"), QC(220, "QC", "QC"), - AMPR(230, "AMPR", "AMPR"); + AMPR(230, "AMPR", "AMPR"), + FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"), + VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"); private int value;