From f969ab4599e20922d61cc9f8f86fe2b6bea7b867 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 20 Nov 2019 22:17:12 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=AF=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=8E=92=E7=A8=8BBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 0b9c305..86c482c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -40,7 +40,7 @@ public class OperInput extends BaseAPS { private Long materialId; @Column(name="INPUT_COUNT") - @ApiParam(value ="输入数量") + @ApiParam(value ="单位输入量") private Double inputCount; @Column(name="YIELD") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 1b2ef55..9160586 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -39,7 +39,7 @@ public class OperOutput extends BaseAPS { private Long materialId; @Column(name="OUTPUT_COUNT") - @ApiParam(value ="输出数量") + @ApiParam(value ="单位输出量") private Double outputCount; @Column(name="YIELD") From f640f971163d94a5d37424e34c76a23e07a22c60 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 21 Nov 2019 11:51:16 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=AF=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=8E=92=E7=A8=8BBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java | 4 ++++ modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 067f76a..3935866 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.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; @@ -26,14 +27,17 @@ import javax.persistence.Table; public class DataLink extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") + @FieldAnnotation(notEmpty = true) private String code; @Column(name="TYPE") @ApiParam(value ="链接类型") + @FieldAnnotation(defaultValue = "CSV") private ApsEnumUtil.DATA_LINK_TYPE type; @Column(name="PATH") @ApiParam(value ="IP/文件路径") + @FieldAnnotation(notEmpty = true) private String path; @Column(name="PORT") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 77f0691..5eee173 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -135,6 +135,10 @@ public class Work extends BaseAPS { @FieldAnnotation(modify = false) private String failedReason; + @Column(name="REMARK") + @ApiParam(value ="备注") + private String remark; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index f35fbed..a6aa5e5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -312,6 +312,10 @@ public class BeanRelation { } } + public static void setOne(BaseBean bean, Enum holder, BaseBean relaBean) { + get(bean).get(holder).add(relaBean); + } + /** * 移除关联 * diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index c47bdad..1adb280 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -2,7 +2,7 @@ - + From c5bc44f29a9f71c25b774f81c5c2c57edf573691 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 21 Nov 2019 13:55:12 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6522=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=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/mes/bean/MesWorkCell.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index b0992b6..5bd428a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -51,6 +51,10 @@ public class MesWorkCell extends BaseBean { @ApiParam("工位类型") private Integer workCellType; + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + @Transient @ApiParam(value = "子集列表") private List childTreeList; From c051b6024b02f28e0dd849dc70a4b08f1ed51d7b Mon Sep 17 00:00:00 2001 From: qinjia zou Date: Thu, 21 Nov 2019 14:06:32 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E3=80=90VDA=E7=89=A9=E6=B5=81=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF-=E8=B7=AF=E7=BA=BF=E6=96=B0=E5=A2=9E-=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B5=8B=E5=80=BC=E3=80=91bug6515?= 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 | 4 +++- 1 file changed, 3 insertions(+), 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 d405adc..76fbdbb 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 @@ -2414,7 +2414,9 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result); DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getRoutingCode(), "routingCode", result); - + if (StringUtils.isNotBlank(wmsRoutingRule.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getOrganizeCode(), "organizeCode", result); + } DdlPreparedPack.getInPack(wmsRoutingRule.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRoutingRule.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRoutingRule, result); From 07ee1971ae20f6cd4cbc8b73199ffa6f7536aa5f Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 21 Nov 2019 16:10:07 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6522=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=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/mes/pcn/bean/MesWorkCell.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java index efcf8fd..efd99e5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java @@ -46,4 +46,8 @@ public class MesWorkCell extends BaseBean { @Column(name = "WORK_CELL_TYPE") @ApiParam("工位类型") private Integer workCellType; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; } From 11bc24034725231d8c8df74c86657c8df0a9d806 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 21 Nov 2019 15:54:00 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 13 ++++++++--- .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 3 ++- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 25 ++++++++-------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index e312525..709d90a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -223,9 +223,7 @@ public class CommonEnumUtil { EXCEPTION_DETAIL(3, "异常明细"), EXCEPTION_SOLUTION(4, "解决方案"), ENUM(5, "枚举"), - MODULE(10, "模块"), - METHOD(11, "功能"), - BUTTON(12, "按钮"), + MENU(10, "功能权限"), WEB(13, "前端"); private int value; @@ -597,6 +595,15 @@ public class CommonEnumUtil { return tmp; } + public static METHOD_LEVEL get(int id){ + for (int i = 0; i < values().length; i++) { + if (values()[i].value == id) { + return values()[i]; + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index f9e9067..95deac5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -50,7 +50,8 @@ public class SysMenu extends BaseBean { * 产品类型暂时不能填写, 产品以上线调整影响范围太大. */ @Column(name="SOFT_TYPE") - @ApiParam(value ="产品类型", example = "0") + @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp") + @AnnoOutputColumn private Integer softTyp; @Column(name="MENU_TYPE") 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 99bac14..e373af9 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 @@ -257,22 +257,15 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(menu); DdlPreparedPack.getInPackList(idList,"id",result); - DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); - - result.setOrderByStr(menu.orderBy()); - - return result; - } - - public static DdlPackBean packDdlBeanSysMenu(SysMenu menu){ - - DdlPackBean result = DdlPackBean.getDdlPackBean(menu); - DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - result.setOrderByStr(menu.orderBy()); + if(menu != null){ + DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); + DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + + result.setOrderByStr(menu.orderBy()); + } return result; } From 6cb9eeed8c1750441ead097c5b1846da2f4ee1ae Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 21 Nov 2019 16:24:22 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90=20?= =?UTF-8?q?=E5=80=92=E5=85=A5=E5=AF=BC=E5=87=BA=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 95deac5..8a47f38 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -52,7 +52,7 @@ public class SysMenu extends BaseBean { @Column(name="SOFT_TYPE") @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp") @AnnoOutputColumn - private Integer softTyp; + private Integer softType; @Column(name="MENU_TYPE") @ApiParam(value ="功能类型" , example ="-1" ,access = "枚举：1.模块，2.菜单，3.按钮") From 4f87ec8516851e024b9f958161ae1d4a3ce85f67 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 21 Nov 2019 16:47:50 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 11 ++++ .../i3plus/pojo/mes/model/SnPrintDataModel.java | 27 ++++++++ .../estsh/i3plus/pojo/mes/model/SnPrintModel.java | 27 ++++++++ .../pojo/mes/model/SnPrintTemplateModel.java | 26 -------- .../i3plus/pojo/mes/model/SnPrintValueModel.java | 72 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 73 ++++++++++++++++++++-- 6 files changed, 206 insertions(+), 30 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 9f2dc8c..7e72209 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -129,6 +129,15 @@ public class MesProduceSn extends BaseBean { @ApiParam("返回信息") private String resultMsg; + @Transient + @ApiParam("下线时间开始") + private String outWorkCenterTimeStart; + + @Transient + @ApiParam("下线时间截止") + private String outWorkCenterTimeEnd; + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } @@ -178,6 +187,8 @@ public class MesProduceSn extends BaseBean { ", snType='" + snType + '\'' + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + + ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + + ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' + '}'; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java new file mode 100644 index 0000000..764b522 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 打印信息封装模板 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("打印信息封装模板") +public class SnPrintDataModel { + + @ApiParam("打印数据") + private List snPrintValueModel; + + @ApiParam("打印模板及参数") + private MesLabelTemplate labelTemplate; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java new file mode 100644 index 0000000..47c87a9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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 SnPrintModel extends SnPrintValueModel { + + @ApiParam("过程条码") + private SnPrintDataModel snPrintModel; + + @ApiParam("产品条码") + private SnPrintDataModel prodPrintModel; + + @ApiParam("包装条码") + private SnPrintDataModel packagePrintModel; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java deleted file mode 100644 index 5c0b2ab..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description : 产品/包装打印模板model - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-18 11:00 - * @Modify: - **/ -@Data -public class SnPrintTemplateModel implements Serializable { - - @ApiParam("产品条码模板") - private MesLabelTemplate prodSnPrintTemplate; - - @ApiParam("包装条码模板集合") - private List packageSnPrintTemplateList; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java new file mode 100644 index 0000000..a26ac51 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.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/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 897e791..d39ad15 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 @@ -1860,10 +1860,6 @@ public class MesHqlPack { if (mesProduceSn.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } - DdlPreparedPack.timeBuilder( - mesProduceSn.getCreateDateTimeStart(), - mesProduceSn.getCreateDateTimeEnd(), - "createDatetime", packBean, true); return packBean; } @@ -1927,4 +1923,73 @@ public class MesHqlPack { return packBean; } + /** + * 按条件分页查询产品条码补打印数据 + * @param mesProduceSn + * @return + */ + public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { + DdlPackBean packBean = getMesAllData(mesProduceSn.getOrganizeCode()); + if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { + DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); + } + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterTimeStart(), + mesProduceSn.getOutWorkCenterTimeEnd(), + "outWorkCenterTime", packBean, true); + + return packBean; + } + + /** + * 按条件分页查询包装条码补打印数据 + * @param mesPackage + * @return + */ + public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) { + + DdlPackBean packBean = getMesAllData(mesPackage.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPackage.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getPackLevel())) { + DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); + } + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesPackage.getCreateDateTimeStart(), + mesPackage.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + + return packBean; + } + } From e349ab3e9bb7a154b103433b54dd4cc128d9da1b Mon Sep 17 00:00:00 2001 From: 1111 Date: Thu, 21 Nov 2019 17:00:52 +0800 Subject: [PATCH 09/10] =?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 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java 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 2d2f84a..a873f7f 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 @@ -642,7 +642,8 @@ public class WmsEnumUtil { VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"), KT_DEFINITE(430,"KT_DEFINITE", "KT合格"), VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"), - KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"); + KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"), + KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"); private int value; 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 new file mode 100644 index 0000000..75685c5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * 物料数量DTO + */ +@Data +public class WmsPartQtyDto { + + @ApiParam(value = "物料名称") + private String partName; + @ApiParam(value = "物料编码") + private String partNO; + @ApiParam(value = "应收数量") + private String qty; + @ApiParam(value = "实收数量") + private String rcQty; + @ApiParam(value = "待收数量") + private String dueQty; +} From ff1f561b9d97b503b93efaab20fb5a411ad1ce4a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 21 Nov 2019 17:01:34 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=20=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index ee8cdc6..0a8b2f9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -56,6 +56,8 @@ public class WmsMessageStyleModel implements Serializable { this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); } else if (actQty == transQty) {//处理完成 this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } else if (transQty < actQty) {//处理中 处理数量可以大于需求数量 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); } } }