From 63fc619c749cf2f0aff41ed25724fbbab3c364b4 Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 7 Jan 2021 16:20:21 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java | 11 +++++------ .../cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java | 11 ++++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java index ce0f43a..e1de11e 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java @@ -5,17 +5,12 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; /** * @Description : @@ -167,4 +162,8 @@ public class SwebDocMovementDetails extends BaseBean { @Column(name = "LOT_NO") @ApiParam("批次") public String lotNo; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java index 30a319d..c7e256f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java @@ -1,19 +1,16 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : @@ -81,4 +78,8 @@ public class SwebDocMovementSn extends BaseBean { @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") private String vendorName; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } From 45a7ff613240a2499981f67ba4361297e70f337c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 7 Jan 2021 16:37:36 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/MesPaintSnPrintModel.java | 4 +++ .../i3plus/pojo/mes/model/StationRequestBean.java | 4 ++- .../mes/model/mgn/tj/AssemblyRealWorkModel.java | 30 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java 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 index 45ed828..c92b82b 100644 --- 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import cn.estsh.i3plus.pojo.mes.bean.MesPackage; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,6 +30,9 @@ public class MesPaintSnPrintModel implements Serializable { @ApiParam("包装编号") private String packageNo; + @ApiParam("包装信息") + private MesPackage packageInfo; + @ApiParam("工单号") private String workOrderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 846880d..30814e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -190,7 +190,7 @@ public class StationRequestBean implements Serializable { @ApiParam("创建时间") private String createDatetime; - @ApiParam("创建时间") + @ApiParam("包装编号") private String packageNo; @ApiParam("密码") @@ -232,6 +232,8 @@ public class StationRequestBean implements Serializable { ", workOrderNo='" + workOrderNo + '\'' + ", tray='" + tray + '\'' + ", finishCount=" + finishCount + + ", packageNo=" + packageNo + + ", createDatetime=" + createDatetime + '}'; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java new file mode 100644 index 0000000..ebb9bc8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 总装实际产量model + * @Author: wangjie + * @Date: 2020/10/28 2:56 PM + * @Modify: + */ +@Data +public class AssemblyRealWorkModel { + + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("实际产量") + private Double realProdQty; + + @ApiParam("实际目标") + private Double realPlanQty; + + @ApiParam("班产目标") + private Double shiftPlanQty; + + @ApiParam("本班达成率") + private Integer shiftPassPercent; + +} From 10ae50395265c7c70b523a78f14f9870748df05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 7 Jan 2021 19:35:25 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E3=80=90=E6=B3=B0=E5=9B=BD=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4=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/model/GenSerialNoModel.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 03b6571..2d3b703 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -100,6 +100,12 @@ public class GenSerialNoModel { @ApiParam("版本号") private String versionNo; + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("颜色名称") + private String colorName; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 82dfdf8..c7e4c70 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -141,4 +141,8 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("版本号") private String versionNo; + @ApiParam("泰国WL物料描述") + private String tgPartDesc; + @ApiParam("泰国过程条码截取前11位") + private String snTop11; } From 7d8fd1537070cbc269fbfd22fdf103fd503b3fd0 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 8 Jan 2021 09:33:38 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 49b6317..ae350ac 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 @@ -872,7 +872,8 @@ public class WmsEnumUtil { COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"), SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"), COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR - PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库");//默认DMR + PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库"), + SUSPECT_IN_STOCK(790, "SUSPECT_IN_STOCK", "可疑品入库");//默认DMR private int value; private String code; From 7f6281f63e24ab709a7443736c8386c24cc2f592 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 8 Jan 2021 17:38:38 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 +++- 2 files changed, 4 insertions(+), 2 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 d42b6e7..12e6d71 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 @@ -2056,7 +2056,7 @@ public class MesEnumUtil { MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"), MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"), MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"), - MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"), + MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表，支持编辑"), MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"), MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"), MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"), 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 4b09f12..797fa82 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 @@ -172,10 +172,12 @@ public class IfProductOffLine extends BaseBean implements Serializable { this.qcStatus = qcStatus; } - public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) { + public IfProductOffLine(String workCenterCode, String partNo, String partName, String itemPartNo, String itemPartName, String packageNo, Double qty, String createDatetime, String workOrderNo) { this.workCenterCode = workCenterCode; this.partNo = partNo; this.partName = partName; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; this.packageNo = packageNo; this.qty = qty; this.createDatetime = createDatetime; From 72cb3a0cd5e16d92678dfdc1c0f9fe9988ded924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 9 Jan 2021 15:32:53 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E3=80=90Bi=20=E7=95=8C=E9=9D=A2bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/LogisticsBiModel.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java new file mode 100644 index 0000000..b267f7f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/28 2:37 下午 + * @Modify: + */ +@Data +public class LogisticsBiModel implements Serializable { + + @ApiParam(value = "去年每月发运数量") + private double lastQty = 0; + + @ApiParam(value = "今年每月发运数量") + private double thisQty = 0; + + @ApiParam(value = "比例值") + private double annualRatio = 0; + + @ApiParam(value = "月份") + private Integer month; +} From 90bfcd6d461edd52c042874ffa2e8731eb1aaaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 9 Jan 2021 15:35:22 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E3=80=90Bi=20=E7=95=8C=E9=9D=A2bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfDeliverOrderData.java | 66 ++++++++++++++++++++++ .../repository/IfDeliverOrderDataRepository.java | 9 +++ 2 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java new file mode 100644 index 0000000..5b8ad38 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.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.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description :IF_订单交付数据 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_DELIVER_ORDER_DATA") +@Api("IF_订单交付数据") +public class IfDeliverOrderData extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053695347L; + + @Column(name = "RGANIZTION_CODE") + @ApiParam("工厂代码") + private String rganiztionCode; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("发运数量") + private Integer qty = 0; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java new file mode 100644 index 0000000..69bc18f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfDeliverOrderData; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfDeliverOrderDataRepository extends BaseRepository { +} From d486da1120121234fe26206403f3dcd3d4d45bb4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 9 Jan 2021 18:25:45 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java index 51867fc..b4b90d9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * @Description 北京麦格纳BBAC库存扣减MODEL @@ -35,6 +34,9 @@ public class WmsBjmgnBbacReductModel implements Serializable { public Double qty; @ApiParam("单位") public String unit; + @ApiParam("包含0") + public Integer includeZero; + public WmsBjmgnBbacReductModel() { } From e72c2dd09a604860e42188dee6fb52c9d80180e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 11 Jan 2021 14:14:01 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2586?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java index 4a59bba..47731d5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java @@ -26,4 +26,6 @@ public class WmsAgCacheModel implements Serializable { public List options; @ApiParam("作业流程明细Model集合") public Map wmsAgdCacheModelMap; + @ApiParam("流程级别组件参数集合") + public Map> wmsAgAmParamsMap; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index f4f5bd8..2ccb28b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 作业流程 @@ -98,6 +99,9 @@ public class WmsActionGroup extends BaseBean { @Transient @ApiParam(value = "提交步骤序号") private Integer submitStepSeq; + @Transient + @ApiParam(value = "流程级别组件参数") + private List agAmParamsList; public long getInitAmIdVal() { return this.initAmId == null ? 0 : this.initAmId.longValue(); From 1ed47f152641695bae3af9c12d9690b89a091504 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 11 Jan 2021 14:40:20 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A5=E6=89=93=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 b07ece5..0dce57a 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 @@ -244,18 +244,13 @@ public class MesProduceSn extends BaseBean implements Serializable { this.qcStatus = qcStatus; this.qty = qty; } -//sn.serialNumber, sn.productSn, " + -// " sn.partNo, sn.partNameRdd, sn.qty, sn.qcStatus, sn.snStatus, sn.printCount, sn.printStatus" + -// " sn.workCenterCode, sn.workCellCode, sn.routeCode, sn.processCode, sn.nextProcessCode, sn.inWorkCenterTime, " + -// " sn.outWorkCenterTime, sn.shippingTime, sn.workOrderNo, sn.custSn, sn.custPartNo, sn.custCode," + -// " sn.snType, sn.trayNo, sn.operateType, sn.processLabelTemplate, sn.prodLabelTemplate, sn.custLabelTemplate, " + -// " sn.lotNo, sn.defectActionType, sn.vinCode, p.versionNo + public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus, Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode, String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo, String custSn, String custPartNo, String custCode, Integer snType, String trayNo, Integer operateType, String processLabelTemplate, String prodLabelTemplate, String custLabelTemplate, String lotNo, - String defectActionType, String vinCode, String versionNo) { + String defectActionType, String vinCode, String versionNo, String createUser, String createDatetime) { this.id = id; this.serialNumber = serialNumber; this.productSn = productSn; @@ -288,6 +283,8 @@ public class MesProduceSn extends BaseBean implements Serializable { this.defectActionType = defectActionType; this.vinCode = vinCode; this.versionNo = versionNo; + this.createUser = createUser; + this.createDatetime = createDatetime; } public double getQtyVal() { From 193c4a254cfc952863eacb9a87a1bf4b649be466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 11 Jan 2021 16:22:27 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E3=80=9013608=2020027-BI-=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E4=BA=A7=E7=BA=BF-=E7=89=A9?= =?UTF-8?q?=E6=B5=81=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AE=9E=E9=99=85=E5=87=BA=E5=BA=93=E4=B8=8EBP?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=AF=B9=E6=AF=94-2021-01-15?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/IfDeliverOrderData.java | 4 ++ .../i3plus/pojo/mes/model/LogisticsBiModel.java | 6 +++ 3 files changed, 55 insertions(+) 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 12e6d71..ea8bfa9 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 @@ -8243,4 +8243,49 @@ public class MesEnumUtil { return tmp; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DELIVER_ORDER_MOVE_TYPE { + SHIPING(10, "发运"), + ALLOCATION(20, "发运&调拨"); + + private int value; + private String description; + + DELIVER_ORDER_MOVE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public static MesEnumUtil.DELIVER_ORDER_MOVE_TYPE getByValue(Integer value) { + for (MesEnumUtil.DELIVER_ORDER_MOVE_TYPE showSupplierCode : values()) { + if (showSupplierCode.getValue() == value) { + return showSupplierCode; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java index 5b8ad38..7b8c9ff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java @@ -48,6 +48,10 @@ public class IfDeliverOrderData extends BaseBean implements Serializable { @ApiParam("发运数量") private Integer qty = 0; + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private Integer moveType; + @Column(name = "SYNC_STATUS") @ApiParam("同步状态") private Integer syncStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java index b267f7f..b3105ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java @@ -27,4 +27,10 @@ public class LogisticsBiModel implements Serializable { @ApiParam(value = "月份") private Integer month; + + @ApiParam(value = "实际出库数量") + private double outQty = 0; + + @ApiParam(value = "BP总数") + private double bpQty= 0; } From c475abc39d3f5f1c536470c8c58dea2a3de98f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 11 Jan 2021 16:24:06 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E3=80=9013608=2020027-BI-=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E4=BA=A7=E7=BA=BF-=E7=89=A9?= =?UTF-8?q?=E6=B5=81=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AE=9E=E9=99=85=E5=87=BA=E5=BA=93=E4=B8=8EBP?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=AF=B9=E6=AF=94-2021-01-15?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesBpBusiness.java | 43 ++++++++++++++++++++++ .../mes/repository/MesBpBusinessRepository.java | 9 +++++ 2 files changed, 52 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java new file mode 100644 index 0000000..5a1bed1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.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.*; +import java.io.Serializable; + +/** + * @Description :BP业务对比表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BP_BUSINESS") +@Api("BP业务对比表") +public class MesBpBusiness extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053666347L; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("预测数量") + private Double qty = 0d; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java new file mode 100644 index 0000000..743c8fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBpBusiness; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesBpBusinessRepository extends BaseRepository { +} From 1f3f891264ae716e2f177f58090e86a06f336a15 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 11 Jan 2021 18:23:58 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 34dbb05..61f52e9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -13,7 +13,9 @@ public class WmsInterfaceEnumUtil { SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"), WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"), - SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"); + SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"), + SAP2MES(60, "SAP2MES", "SAP --> WMS"), + ; private int value; private String name;