From 68fa329701c1db389ce281d8b63a3de61d229e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 22 Jun 2020 16:51:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 5 ++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++ .../mes/model/PackageSnLabelTemplateDataModel.java | 30 ++++++++++ .../pojo/mes/model/PaintWorkOrderSnModel.java | 64 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/model/ProdPackModel.java | 60 ++++++++++++++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 43 +++++++++++++++ 6 files changed, 206 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 4b81afd..541d461 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -118,6 +118,11 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("客户发往地") private String custDeliveryLocation; + // 赋值模板代码 + @Column(name = "PACKAGE_LABEL_TEMPLATE") + @ApiParam("包装标签模板") + private String packageLabelTemplate; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 27ad0ee..0a67fe0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -177,6 +177,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("预留字段4") private String reserved4; + @Column(name = "PARENT_PART_NO") + @ApiParam("父阶物料号") + private String parentPartNo; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java new file mode 100644 index 0000000..426707f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class PackageSnLabelTemplateDataModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + // 工单表.包装规格描述 + @ApiParam("包装规格") + private Double packSpecQty; + + @ApiParam("生产日期") + private String prodDate; + + @ApiParam("工单班次") + private String workOrderShift; + + @ApiParam("操作人员名称") + private String operatorName; + + @ApiParam("工厂名称") + private String organizeName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java new file mode 100644 index 0000000..16a9bfe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Description : 涂装工单条码-展示组件model + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-06-21 11:02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("涂装工单条码展示组件model") +public class PaintWorkOrderSnModel extends BaseBean { + + @ApiParam("工单号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("颜色名称") + private String colorName; + + @ApiParam("工单数量") + private Double workOrderQty; + + @ApiParam("包装数量") + private Double packageQty; + + @ApiParam("项目名称") + private String prodCfgTypeName; + + @ApiParam("圈数") + private Integer groupNum; + + @ApiParam("工单状态") + private Integer workOrderStatus; + + // 父阶物料号 -- 涂装客户标签打印 + @ApiParam("父阶物料号") + private String parentPartNo; + + // 父阶物料名称 -- 涂装二次条码打印 + @ApiParam("父阶物料名称") + private String parentPartName; + + private List prodPackageList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java new file mode 100644 index 0000000..b00f907 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 涂装工单条码-展示组件(产品包装)model + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-06-21 11:02 + * @Modify: + **/ +@Data +@Api("产品包装model") +public class ProdPackModel { + + // 产品条码表--产品条码 + @ApiParam("产品条码") + private String productSn; + + // 包装主表--包装标号 + @ApiParam("一检箱条码") + private String packageNo; + + // 包装明细表--创建时间 + @ApiParam("一检校验时间") + private String createDatetime; + + // 包装主表--打印状态(10：未打印 20：已打印) + @ApiParam("箱条码状态") + private Integer printStatus; + + // 涂装客户标签打印 + @ApiParam("客户标签") + private String custSn; + + // 涂装客户标签打印 + @ApiParam("当前工序") + private String processCode; + + // 涂装客户标签打印 + @ApiParam("更新时间") + private String modifyDateTime; + + public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) { + this.productSn = productSn; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.printStatus = printStatus; + } + + public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) { + this.productSn = productSn; + this.packageNo = packageNo; + this.custSn = custSn; + this.processCode = processCode; + this.modifyDateTime = modifyDateTime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 9d81d04..0539818 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -616,4 +616,47 @@ public class MesPcnHqlPack { return endIndex; } + /** + * 涂装一次箱条码打印获取工单 查询条件封装 + * + * @param mesWorkOrder + * @return + */ + public static DdlPackBean getWorkOrderList(MesWorkOrder mesWorkOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkOrder, organizeCode); + if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); + } + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + // 时间段查询 + if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + + return packBean; + } } From 66b98dd6d56273efec559a21ab73f8ee7b940670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 22 Jun 2020 20:17:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E5=BC=80=E5=8F=91=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=8A=9F=E8=83=BD=E9=80=BB=E8=BE=91=202.?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B6=82=E8=A3=85=E5=B7=A5=E5=8D=95=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=93=E5=8D=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 5 ++ .../pojo/mes/model/MesPaintSnPrintModel.java | 45 ++++++++++++++++++ .../i3plus/pojo/mes/model/PaintOnLineModel.java | 55 ++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index 41042ca..40939d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -30,6 +30,11 @@ import java.io.Serializable; @Api("工位投料信息") public class MesCellFeed extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369479107782L; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java new file mode 100644 index 0000000..abf1eff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java @@ -0,0 +1,45 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020\06\22 15:58 + * @Modify: + **/ +@Data +public class MesPaintSnPrintModel implements Serializable { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产品条码") + private String produceSn; + + @ApiParam("包装编号") + private String packageNo; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("打印模板") + private MesLabelTemplate labelTemplate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java new file mode 100644 index 0000000..33f7751 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.mes.bean.MesCellFeed; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Author: siliter.yuan + * @CreateDate: 2020/6/21 8:06 PM + * @Description: + **/ +@Data +@Api("涂装上线MODEL") +public class PaintOnLineModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色") + private String color; + + @ApiParam("工单数量") + private Double orderNum; + + @ApiParam("包装数量") + private Double packageNum; + + @ApiParam("项目名称") + private String productName; + + @ApiParam("创建时间") + private String createDateTime; + + @ApiParam("圈数") + private Integer rounds; + + @ApiParam("工位投料数据列表") + private List cellFeedList; +} From fe05a76f6fc0894ebbe293211e7dd6f0df8f7089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 23 Jun 2020 09:19:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E4=B8=8E?= =?UTF-8?q?model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 bc568d7..09296ef 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 @@ -140,6 +140,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("产品标签模板") private String prodLabelTemplate; + @Column(name = "CUST_LABEL_TEMPLATE") + @ApiParam("客户标签模板") + private String custLabelTemplate; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index b00f907..f4a4de9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -19,7 +19,7 @@ public class ProdPackModel { @ApiParam("产品条码") private String productSn; - // 包装主表--包装标号 + // 包装主表--包装编号 @ApiParam("一检箱条码") private String packageNo; From 3247ef5ed7a514dce6ab4014511f6ae727dc0c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 23 Jun 2020 09:51:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=B7=A5=E4=BD=8D=E5=B1=95=E7=A4=BA=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java index 33f7751..f1f7d53 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java @@ -1,13 +1,10 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesCellFeed; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import java.util.List; - /** * @Author: siliter.yuan * @CreateDate: 2020/6/21 8:06 PM @@ -49,7 +46,4 @@ public class PaintOnLineModel { @ApiParam("圈数") private Integer rounds; - - @ApiParam("工位投料数据列表") - private List cellFeedList; }