From 7452d49930617e1d216a4890ec039b6cd9cc17b4 Mon Sep 17 00:00:00 2001 From: 1111 Date: Fri, 22 Nov 2019 15:03:03 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=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/dto/WmsPartQtyDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java index 75685c5..55f83db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java @@ -12,7 +12,7 @@ public class WmsPartQtyDto { @ApiParam(value = "物料名称") private String partName; @ApiParam(value = "物料编码") - private String partNO; + private String partNo; @ApiParam(value = "应收数量") private String qty; @ApiParam(value = "实收数量") From 5bc9b9b0828337bf60ca54088e7e0cb32076a49d Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 22 Nov 2019 16:16:21 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1193?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java | 2 +- .../cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 10 +++++++++- 7 files changed, 21 insertions(+), 6 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 cd3143f..0508600 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 @@ -21,7 +21,8 @@ public class MesEnumUtil { DEFECT("DEFECT", "缺陷"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), - REPAIR("REPAIR", "处理措施"); + REPAIR("REPAIR", "处理措施"), + SCRAP("SCRAP", "报废原因"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java index afecb21..f93a37f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java @@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private String qty; + private Integer qty; @Column(name = "PACKAGE_NO2") @ApiParam("包装编号2") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java index a53a8b5..82c0944 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.math.BigDecimal; /** * @Description: @@ -42,7 +43,7 @@ public class IfProductOffLine extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private String qty; + private BigDecimal qty; @Column(name = "UNIT") @ApiParam("单位") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 71f7100..27ef471 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private String qty; + private Integer qty; @Column(name = "PACKAGE_NO2") @ApiParam("包装编号2") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 2309dbe..b46da7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.math.BigDecimal; /** * @Description: @@ -42,7 +43,7 @@ public class IfProductOffLine extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private String qty; + private BigDecimal qty; @Column(name = "UNIT") @ApiParam("单位") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index 12280a7..12ae9a6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -52,4 +52,8 @@ public class MesPartObject extends BaseBean { @Transient @ApiParam("字段总数") private Integer fieldNum; + + @Transient + @ApiParam("数据组号") + private String groupNo; } 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 1f62898..3555f12 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 @@ -45,9 +45,17 @@ public class MesProductData extends BaseBean { private String workCellName; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; From 4146126284aa8c185f9f79b2456cefe10e4c1db0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 22 Nov 2019 16:41:10 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1202?= =?UTF-8?q?=EF=BC=8C=E6=9D=A1=E7=A0=81=E8=A1=A5=E6=89=93=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/model/SnPrintDataModel.java | 2 +- .../i3plus/pojo/mes/pcn/model/SnPrintModel.java | 2 +- .../pojo/mes/pcn/model/SnPrintValueModel.java | 72 ---------------------- .../pojo/mes/pcn/model/StepPrintSnModel.java | 3 + 4 files changed, 5 insertions(+), 74 deletions(-) delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java index 7a2c56b..831a997 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java @@ -19,7 +19,7 @@ import java.util.List; public class SnPrintDataModel { @ApiParam("打印数据") - private List valueList; + private List valueList; @ApiParam("打印模板及参数") private MesLabelTemplate labelTemplate; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java index 5f65795..0f1d4a6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java @@ -13,7 +13,7 @@ import lombok.Data; **/ @Data @Api("打印信息汇总") -public class SnPrintModel extends SnPrintValueModel { +public class SnPrintModel extends StepPrintSnModel { @ApiParam("过程条码") private SnPrintDataModel serialPrintDataModel; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java deleted file mode 100644 index d3e47e4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: 打印信息 - * @Reference: - * @Author: wangjie - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息") -public class SnPrintValueModel extends MesProduceSn { - @ApiParam("打印描述") - private String printDesc; - - @ApiParam("条码") - private String barCode; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("批次号") - private String batchNo; - - @ApiParam("箱数量") - private String boxQty; - - @ApiParam("订单号") - private String orderNo; - - @ApiParam("生产日期") - private String productionTime; - - @ApiParam("包装编码") - private String packageNo; - - @ApiParam("包装规格") - private String packageSpec; - - @ApiParam("供应商") - private String supplier; - - @ApiParam("客户名称") - private String customerName; - - @ApiParam("客户零件号") - private String customerPartNo; - - @ApiParam("客户物料名称") - private String customerPartName; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("单位") - private String unit; - - @ApiParam("特殊批号") - private String fixLotNo; - - @ApiParam("生产工单号") - private String workOrderNo; - - @ApiParam("生产线代码") - private String workCenterCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index 53b974e..c128bbb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -72,4 +72,7 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("生产线代码") private String workCenterCode; + @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + } From 5f3f973c3e2c7a82e5313cc5571b85c33b242091 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 22 Nov 2019 17:13:33 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/ExportProject.java | 3 +- .../estsh/i3plus/pojo/aps/bean/ImportProject.java | 2 +- .../i3plus/pojo/aps/bean/OvertimeCalendar.java | 5 + .../estsh/i3plus/pojo/aps/common/DateDuration.java | 104 ++++++++------------- .../cn/estsh/i3plus/pojo/aps/model/APSPager.java | 9 ++ .../estsh/i3plus/pojo/aps/model/ReportPager.java | 25 +++++ .../src/main/resources/relations/ExportProject.xml | 2 +- .../src/main/resources/relations/ImportProject.xml | 2 +- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 56 ++++++++++- 9 files changed, 135 insertions(+), 73 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index 1a44c20..b8563c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -35,8 +35,7 @@ public class ExportProject extends BaseAPS { @Column(name="LINK_ID") @ApiParam(value ="数据连接对象") - @FieldAnnotation(property = false) - @JsonIgnore + @FieldAnnotation(relation = "Link", notEmpty = true) private Long linkId; public DataLink getLink() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 3c78c4c..7d8f02d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -34,7 +34,7 @@ public class ImportProject extends BaseAPS { @Column(name="LINK_ID") @ApiParam(value ="数据连接对象") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Link", notEmpty = true) private Long linkId; public DataLink getLink() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java index b16377c..0281199 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java @@ -1,5 +1,6 @@ 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.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; @@ -27,17 +28,21 @@ import java.util.Date; public class OvertimeCalendar extends BaseAPS { @Column(name="RES_CODES") @ApiParam(value ="资源代码") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) private String resCodes; @Column(name="START") @ApiParam(value ="开始时间") + @FieldAnnotation(notEmpty = true) private Date start; @Column(name="END") @ApiParam(value ="结束时间") + @FieldAnnotation(notEmpty = true) private Date end; @Column(name="TYPE") @ApiParam(value ="类型") + @FieldAnnotation(defaultValue = "ENABLE") private ApsEnumUtil.CALENDAR_TYPE type; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index 2760736..2fa0ef7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -52,7 +52,7 @@ public class DateDuration { * 是否为有效时间区间，若用户指定了时间区间，但解析错误，其时间区间为0 * @return */ - public boolean Valid() { + public boolean valid() { return this.bValid; } @@ -124,7 +124,7 @@ public class DateDuration { return strExtraString.toString(); } - public void Divide(double val) { + public void divide(double val) { if (val < PRECISION) { return; } @@ -165,7 +165,7 @@ public class DateDuration { return; } - if (!ValueValid()) { + if (!valueValid()) { this.time = 0; this.rate = 0.0f; this.bValid = false; @@ -173,42 +173,35 @@ public class DateDuration { } ArrayList lst = new ArrayList(); - Decompound(lst); + decompound(lst); boolean oFlg = lst.size() == 1; for (EV_STRING evs : lst) { - if (evs.type == EV_STRING_TYPE.EVS_GOOD) - { - AbstractMap.SimpleEntry extraTime = TransTime_Each(evs.value); - if (extraTime.getKey() || !oFlg) - { + if (evs.type == EV_STRING_TYPE.EVS_GOOD) { + AbstractMap.SimpleEntry extraTime = transTimeEach(evs.value); + if (extraTime.getKey() || !oFlg) { this.time += extraTime.getValue(); - } - else - { + } else { this.time += extraTime.getValue() * 1; } } - else - { - AbstractMap.SimpleEntry extraPer = TransRate_Each(evs.value); - if (extraPer.getKey()) - { + else { + AbstractMap.SimpleEntry extraPer = transRateEach(evs.value); + if (extraPer.getKey()) { this.rate = extraPer.getValue(); } } } - if (this.time < 0) - { + if (this.time < 0) { this.time = 0; this.rate = 0.0f; this.bValid = false; } } - private boolean ValueValid() { + private boolean valueValid() { for (char ch : this.value.toCharArray()) { if (ch <= 'z' && ch >= 'a') { ch -= 32; @@ -232,61 +225,46 @@ public class DateDuration { || ch == 'M' || ch == 'S' || ch == '+'||ch == '-'||ch == 'P'); } - private void Decompound(ArrayList lst) { + private void decompound(ArrayList lst) { int len = this.value.length(); int iStr = 0; EV_STRING evs = new EV_STRING(); evs.type = EV_STRING_TYPE.EVS_GOOD; - while(iStr < len) - { + while(iStr < len) { char ch = this.value.charAt(iStr); - if (ch == '+') - { + if (ch == '+') { lst.add(evs.clone()); evs.value = ""; evs.type = EV_STRING_TYPE.EVS_GOOD; iStr++; continue; - } - else if (ch == '-') - { + } else if (ch == '-') { int iPre = iStr; - if (iPre != 0) - { + if (iPre != 0) { iPre--; char cp = this.value.charAt(iPre); if (!(cp == 'D' || cp == 'H' - || cp == 'M' || cp == 'S')) - { + || cp == 'M' || cp == 'S')) { evs.value = evs.value + 'S'; } } - } - else if (ch == 'P') - { + } else if (ch == 'P') { int iTempIndex = 0; StringBuffer temp1 = new StringBuffer(); StringBuffer temp2 = new StringBuffer(); int iTemp = evs.value.length() - 1; - for (;iTemp >= 0;iTemp--) - { + for (;iTemp >= 0;iTemp--) { char cTemp = evs.value.charAt(iTemp); if (cTemp == 'D' || cTemp == 'H' - || cTemp == 'M' || cTemp == 'S') - { + || cTemp == 'M' || cTemp == 'S') { iTempIndex++; - } - if (iTempIndex >= 2) - { + } if (iTempIndex >= 2) { temp1.insert(0,cTemp); - } - else - { + } else { temp2.insert(0,cTemp); } } - if (!temp1.toString().isEmpty()) - { + if (!temp1.toString().isEmpty()) { EV_STRING evs1 = new EV_STRING(); evs1.type = EV_STRING_TYPE.EVS_GOOD; evs1.value = temp1.toString(); @@ -296,12 +274,10 @@ public class DateDuration { evs.type = EV_STRING_TYPE.EVS_HAVE_P; evs.value = evs.value + ch; iStr++; - if (iStr != len) - { + if (iStr != len) { char cp = this.value.charAt(iStr); if (cp == 'D' || cp == 'H' - || cp == 'M' || cp == 'S') - { + || cp == 'M' || cp == 'S') { evs.value = evs.value + cp; iStr++; } @@ -315,13 +291,12 @@ public class DateDuration { evs.value = evs.value + ch; iStr++; } - if (!evs.value.isEmpty()) - { + if (!evs.value.isEmpty()) { lst.add(evs); } } - private AbstractMap.SimpleEntry TransTime_Each(String extraValue) { + private AbstractMap.SimpleEntry transTimeEach(String extraValue) { if (extraValue.isEmpty()) return new AbstractMap.SimpleEntry(false, 0); @@ -330,16 +305,13 @@ public class DateDuration { boolean flg = false; for (int i = 0; i < extraValue.length(); i++) { char ch = extraValue.charAt(i); - int rate = TimeUnit(ch); - if (rate > 0) - { + int rate = timeUnit(ch); + if (rate > 0) { double iC = Double.parseDouble(temp.toString()); extraTime += (int)(iC*rate); temp.setLength(0); flg = true; - } - else - { + } else { temp.append(ch); } } @@ -347,7 +319,7 @@ public class DateDuration { extraTime += Double.parseDouble(temp.toString()); return new AbstractMap.SimpleEntry(flg, extraTime); } - private AbstractMap.SimpleEntry TransRate_Each(String extraValue) { + private AbstractMap.SimpleEntry transRateEach(String extraValue) { if (extraValue.isEmpty()) return new AbstractMap.SimpleEntry(false, 0.0); @@ -356,8 +328,7 @@ public class DateDuration { boolean flg = false; for (int i = 0; i < extraValue.length(); i++) { char ch = extraValue.charAt(i); - switch(ch) - { + switch(ch) { case 'D': extraPer = flg ? (1 / Double.parseDouble(temp.toString())) * 86400 : Double.parseDouble(temp.toString()) * 86400; return new AbstractMap.SimpleEntry(true, extraPer); case 'H': extraPer = flg ? (1 / Double.parseDouble(temp.toString())) * 3600: Double.parseDouble(temp.toString()) * 3600; return new AbstractMap.SimpleEntry(true, extraPer); case 'M': extraPer = flg ? (1 / Double.parseDouble(temp.toString())) * 60 : Double.parseDouble(temp.toString()) * 60; return new AbstractMap.SimpleEntry(true, extraPer); @@ -366,12 +337,11 @@ public class DateDuration { default : temp.append(ch); } } - return new AbstractMap.SimpleEntry(true, extraPer); + return new AbstractMap.SimpleEntry<>(true, extraPer); } - private int TimeUnit(char ch) { - switch(ch) - { + private int timeUnit(char ch) { + switch(ch) { case 'D': return 86400; case 'H': return 3600; case 'M': return 60; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java index 97f2c22..51f1ba0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java @@ -1,11 +1,20 @@ 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 APSPager extends Pager { public static class SortData { // 排序对象 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java new file mode 100644 index 0000000..aa9b938 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 报表分页查询参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-22 + * @Modify: + **/ +@Data +@Api("报表分页查询参数") +public class ReportPager extends Pager { + private String filter; // 物料筛选条件 + private Date begin; // 统计开始时间 + private Date end; // 统计结束时间 + private ApsEnumUtil.MATERIAL_REPORT_TYPE type; + private ApsEnumUtil.REPORT_TIME_SPAN span; // 统计时间间隔 +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml index 443516d..778bd55 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml @@ -1,6 +1,6 @@ - + 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 624a636..6906c5f 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml @@ -1,6 +1,6 @@ - + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 5528aeb..1f6c237 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -80,6 +80,61 @@ public class ApsEnumUtil { } /** + * 物料报表统计类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MATERIAL_REPORT_TYPE { + PRODUCE("PRODUCE", "生产"), + PURCHASE("PURCHASE", "采购"), + INVENTORY("INVENTORY", "库存"); + + private String value; + private String description; + + MATERIAL_REPORT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 报表时间间隔 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REPORT_TIME_SPAN { + ONE_HOUR("ONE_HOUR", "1小时"), + EIGHT_HOUR("EIGHT_HOUR", "8小时"), + TWELVE_HOUR("TWELVE_HOUR", "12小时"), + ONE_DAY("ONE_DAY", "一天"), + ONE_WEEK("ONE_WEEK", "一周"), + ONE_MONTH("ONE_MONTH", "一月"); + + private String value; + private String description; + + REPORT_TIME_SPAN(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 备料类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -618,7 +673,6 @@ public class ApsEnumUtil { MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"), WORK_LET("WORK_LET", "工作最晚结束时刻"), WORK_EST("WORK_EST", "工作最早开始时刻"), - INVENTORY_RELA("INVENTORY_RELA", "订单物品库存量相对值"), FIRST_WORK_BEGIN("FIRST_WORK_BEGIN", "订单首工作上次开始时刻"), HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"), WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"), From 327e4dcd64cb0120883d3b11d769d458680369a9 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 22 Nov 2019 17:37:06 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=EF=BC=9A27?= =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=A2=9E=E5=8A=A0=E4=BA=A7=E7=BA=BF=E3=80=81?= =?UTF-8?q?=E7=8F=AD=E9=95=BF=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index 684bc7e..9ef9467 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java @@ -34,4 +34,12 @@ public class MesShiftGroup extends BaseBean { @Column(name = "GROUP_NAME") @ApiParam("班组名称") private String groupName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SQUAD_LEADER") + @ApiParam("班长") + private String squadLeader; } From 8a806815a58e85ef29acc296f585efaaae05487b Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 22 Nov 2019 17:38:50 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1193q?= =?UTF-8?q?ty=E6=95=B0=E9=87=8F=E7=B1=BB=E5=9E=8B=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BADouble=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java | 3 +-- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 3 +-- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java index 19bbed9..9118124 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java @@ -55,7 +55,7 @@ public class IfDismantleRecord extends BaseBean { @Column(name = "QTY") @ApiParam("产品数量") - private Integer qty; + private Double qty; @Column(name = "DISMANTLE_QTY") @ApiParam("拆解数") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java index f93a37f..cf17f2d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java @@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private Integer qty; + private Double qty; @Column(name = "PACKAGE_NO2") @ApiParam("包装编号2") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java index 82c0944..23e442e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import java.math.BigDecimal; /** * @Description: @@ -43,7 +42,7 @@ public class IfProductOffLine extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private BigDecimal qty; + private Double qty; @Column(name = "UNIT") @ApiParam("单位") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index 5b9c854..18b83aa 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -56,7 +56,7 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "QTY") @ApiParam("产品数量") - private Integer qty; + private Double qty; @Column(name = "DISMANTLE_QTY") @ApiParam("拆解数") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 59ebe07..e84cc53 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -55,7 +55,7 @@ public class IfDismantleRecord extends BaseBean { @Column(name = "QTY") @ApiParam("产品数量") - private Integer qty; + private Double qty; @Column(name = "DISMANTLE_QTY") @ApiParam("拆解数") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 27ef471..8e4e221 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private Integer qty; + private Double qty; @Column(name = "PACKAGE_NO2") @ApiParam("包装编号2") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index b46da7f..686f3de 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import java.math.BigDecimal; /** * @Description: @@ -43,7 +42,7 @@ public class IfProductOffLine extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private BigDecimal qty; + private Double qty; @Column(name = "UNIT") @ApiParam("单位") From e754cb9053347c2f589bf494c1e5f4ef6bcf4a24 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 22 Nov 2019 17:39:43 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=EF=BC=9A27?= =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=A2=9E=E5=8A=A0=E4=BA=A7=E7=BA=BF=E3=80=81?= =?UTF-8?q?=E7=8F=AD=E9=95=BF=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java index f9af171..9af574d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java @@ -34,4 +34,12 @@ public class MesShiftGroup extends BaseBean { @Column(name = "GROUP_NAME") @ApiParam("班组名称") private String groupName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SQUAD_LEADER") + @ApiParam("班长") + private String squadLeader; } From 0e9f13ff82bc07cfcb88bbcfb97a338d852e2077 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 22 Nov 2019 17:40:57 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6582=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E5=8E=9F=E5=9B=A0=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 6 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java | 46 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/model/MesDefectModel.java | 4 ++ 3 files changed, 56 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java index fa5a461..f1bd5b8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -43,10 +43,16 @@ public class MesDefect extends BaseBean { private String defectType; @Transient + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @Transient @ApiParam("缺陷位置") private String defectLocation; @Transient @ApiParam("缺陷类型子集") private List mesDefectList; + + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java new file mode 100644 index 0000000..d7e20a0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: joke.wang + * @CreateDate: 2019\11\22 16:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TYPE_CFG") +@Api("类型信息表") +public class MesTypeCfg extends BaseBean { + + @Column(name = "TYPE_CODE") + @ApiParam("类型代码") + private String typeCode; + + @Column(name = "TYPE_NAME") + @ApiParam("类型名称") + private String typeName; + + @Column(name = "BUSINESS_TYPE_CODE") + @ApiParam("业务类型代码") + private String businessTypeCode; + + @Column(name = "BUSINESS_TYPE_NAME") + @ApiParam("业务类型名称") + private String businessTypeName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java index b9acba1..57ba538 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java @@ -26,6 +26,10 @@ public class MesDefectModel { private String defectType; @Transient + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @Transient @ApiParam("缺陷分类子集") private List mesDefectList; } From 7893bcd77e2cc9a204a5db5e4bb1bbe3ae025833 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 22 Nov 2019 17:45:40 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=20=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 35 ++++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index e373af9..ef26b09 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -73,26 +73,21 @@ public class CoreHqlPack { /** * 资源查询 - * @param localeResource + * @param resource * @return */ - public static String packHqlSysLocaleResource(SysLocaleResource localeResource){ - StringBuffer result = new StringBuffer(); - - //查询日期 -// HqlPack.timeBuilder(sysLocaleResource.getCreateDateTimeStart(),sysLocaleResource.getCreateDateTimeEnd(), -// "createDateTime", result, false); - //数字类型封装 - HqlPack.getNumEqualPack(localeResource.getResourceType(),"resourceType",result); - //字符串类型封装 - HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result); - //字符串类型封装 - HqlPack.getStringLikerPack(localeResource.getResourceKey(),"resourceKey",result); + public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); - // 添加默认排序 - HqlPack.getOrderDefault(localeResource); + if(resource != null){ + DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); + DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); + DdlPreparedPack.getStringEqualPack(resource.getResourceKey(),"resourceKey",result); + DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result); + } - return result.toString(); + return result; } /** @@ -265,6 +260,14 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); result.setOrderByStr(menu.orderBy()); + }else { + menu = new SysMenu(); + } + + if(!StringUtils.isNotBlank(menu.getOrderByParam())){ + menu.setOrderByParam("menuSort"); + menu.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + result.setOrderByStr(menu.orderBy()); } return result; From 47ccfcc9e3afe151d98286e5766159d5a4531ecd Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 22 Nov 2019 20:43:14 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E3=80=90EU=E6=88=90=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=BF=90-=E6=A3=80=E6=9F=A5=E6=95=B0=E9=87=8F=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=91=E3=80=90bug1177=E3=80=91=20=E3=80=90EU?= =?UTF-8?q?=E6=88=90=E5=93=81=E5=8F=91=E8=BF=90-=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=AF=E5=90=A6=E6=93=8D=E4=BD=9C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=BB=84=E4=BB=B6=E3=80=91=E3=80=90bug1176=E3=80=91?= =?UTF-8?q?=20=E3=80=90EU=E6=88=90=E5=93=81=E5=8F=91=E8=BF=90-=E6=88=90?= =?UTF-8?q?=E5=93=81=E5=8F=91=E8=BF=90FIFO=E6=8E=A8=E8=8D=90=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=91=E3=80=90bug1174=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 4 ---- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java | 15 ++++++++++++--- 4 files changed, 18 insertions(+), 9 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 094cb2d..7bafaf6 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 @@ -643,8 +643,8 @@ public class WmsEnumUtil { KT_DEFINITE(430,"KT_DEFINITE", "KT合格"), VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"), - KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"); - + KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"), + FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"); private int value; private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index bf98ee4..f2a841b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -60,8 +60,4 @@ public class BasCustomer extends BaseBean { @Column(name = "CUST_FAX") @ApiParam(value = "传真") private String custFax; - - @Column(name = "SHIPP_QTY") - @ApiParam(value = "发运数量控制") - private Integer shippQty; } 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 5705251..8ea05e4 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 @@ -151,6 +151,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "计划日期") private String assignPlanDate; + @Column(name = "FLAG_NO") + @ApiParam(value = "客户发往地编号") + private String flagNo; + @Column(name = "PLAN_TIME") @ApiParam(value = "计划时间") private String assignPlanTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java index a401b2e..d08c68d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java @@ -29,20 +29,29 @@ import javax.persistence.Table; public class WmsShippingFlag extends BaseBean { private static final long serialVersionUID = 8034283413609254479L; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; + @Column(name = "FLAG_NO") - @ApiParam(value = "编号") + @ApiParam(value = "客户发往地编号") private String flagNo; @Column(name = "FLAG_NAME") - @ApiParam(value = "简称") + @ApiParam(value = "客户发往地名称") private String flagName; + @Column(name = "SHIPP_QTY") + @ApiParam(value = "发运数量控制") + private Integer shippQty; + @Column(name = "FLAG_DESC") @ApiParam(value = "全称") private String flagDesc; @Column(name = "FLAG_ADDR") - @ApiParam(value = "地址") + @ApiParam(value = "客户发往地址") private String flagAddr; @Column(name = "FLAG_OWNER") From 902ef5b177d1e991fffdc8fdd26fa4d53b574da1 Mon Sep 17 00:00:00 2001 From: jokelone Date: Sat, 23 Nov 2019 08:37:57 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6577=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java index f1bd5b8..c91d9c7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -53,6 +53,14 @@ public class MesDefect extends BaseBean { @Transient @ApiParam("缺陷类型子集") private List mesDefectList; + public MesDefect() { + } + public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) { + this.defectCode = defectCode; + this.defectName = defectName; + this.defectType = defectType; + this.defectTypeName = defectTypeName; + } } From acbbbf8e32e108ed0f75ce59d600e02ed61be710 Mon Sep 17 00:00:00 2001 From: 1111 Date: Sat, 23 Nov 2019 14:20:31 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=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/WmsPackageSpec.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index 3bef737..4b4a129 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -29,7 +29,6 @@ import javax.persistence.Transient; @Api("包装规格") public class WmsPackageSpec extends BaseBean { private static final long serialVersionUID = 4849044986767609445L; - @Column(name = "SPEC_CODE",unique = true) @ApiParam(value = "包装规格代码") private String specCode; From 8447ef39c9b62e1b0d41d2a494713a99db06a091 Mon Sep 17 00:00:00 2001 From: 1111 Date: Sat, 23 Nov 2019 14:42:14 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java index 55f83db..4bd50f1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java @@ -14,9 +14,22 @@ public class WmsPartQtyDto { @ApiParam(value = "物料编码") private String partNo; @ApiParam(value = "应收数量") - private String qty; + private Double qty; @ApiParam(value = "实收数量") - private String rcQty; + private Double rcQty; @ApiParam(value = "待收数量") - private String dueQty; + private Double dueQty; + + + public Double getQty() { + return qty == null? 0.0:qty; + } + + public Double getRcQty() { + return rcQty == null? 0.0:qty; + } + + public Double getDueQty() { + return dueQty == null? 0.0:qty; + } } From 8d15084b2023320d304ed733f8d3372b868b2dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 23 Nov 2019 17:52:05 +0800 Subject: [PATCH 14/15] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B45=E4=B8=AA?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=9A=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 773ae39..538c578 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 @@ -66,25 +66,29 @@ public class WmsStockSn extends BaseBean { private String partNameRdd; @Column(name = "LOT_NO", nullable = false) - @ApiParam("收货日期（批次编码）") + @ApiParam("收货批次") public String lotNo = ""; @Column(name = "DATE_CODE", nullable = false) - @ApiParam(value = "生产日期") + @ApiParam(value = "供应商批次") public String dateCode = ""; + @Column(name = "FIX_LOT_NO", nullable = false) + @ApiParam(value = "特殊批次") + private String fixLotNo = ""; + + @Column(name = "QUALITY_DATE") + @ApiParam("保质期") + private String qualityDate; + @Column(name = "LEFT_CODE", nullable = false) - @ApiParam(value = "有效期") + @ApiParam(value = "生产批次") private String leftCode = ""; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编码") public String vendorNo; - @Column(name = "FIX_LOT_NO", nullable = false) - @ApiParam(value = "特殊批次") - private String fixLotNo = ""; - @Column(name = "CUST_NO") @ApiParam(value = "客户编码") private String custNo; @@ -163,10 +167,6 @@ public class WmsStockSn extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") private Integer snType = 10; - @Column(name = "QUALITY_DATE") - @ApiParam("保质期日期") - private String qualityDate; - @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From f39e16511fcbf2de8ffb1f0ac4b2ff44e3f10b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 23 Nov 2019 19:00:52 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E7=BB=99=E6=89=80=E6=9C=89JOB=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E4=BA=86redis=E9=94=81+IOT=E8=A7=A3=E6=9E=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96+=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AEPOJO=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=80=BC=E7=9A=84=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=95=BF=E6=95=B4=E5=BD=A2=EF=BC=8C=E5=90=A6=E5=88=99=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=E5=8F=82=E6=95=B0=E5=80=BC=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E4=BC=9A=E7=B3=BB=E7=BB=9F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java index a3f4148..dff5890 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -51,6 +52,7 @@ public class WmsConfig extends BaseBean { @ApiParam(value ="参数值类型") private String configValueType; + @Lob @Column(name="CONFIG_VALUE") @ApiParam(value ="参数值") private String configValue;