diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 017b3c5..1892d1e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1476,6 +1476,7 @@ public class ImppEnumUtil { /** * 短信供应商 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_SUPPLIER { ALI_CLOUD(1, "阿里云"); @@ -1523,10 +1524,11 @@ public class ImppEnumUtil { /** * 短信模板状态 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_TEMPLATE_STATUS { - VER_CODE(10, "审核中"), - NOTICE_SMS(20, "审核通过"), - PROMOTE_SMS(30, "审核失败"); + UNDER_REVIEW(10, "审核中"), + PASS(20, "审核通过"), + FAIL(30, "审核失败"); private int value; private String description; @@ -1561,6 +1563,7 @@ public class ImppEnumUtil { /** * 短信模板类型 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_TEMPLATE_TYPE { VER_CODE(10, "验证码"), NOTICE_SMS(20, "短信通知"), @@ -1600,6 +1603,7 @@ public class ImppEnumUtil { /** * 短信发送状态 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_SEND_STATUS { WAIT_RECEIPT(10, "等待回执"), FAIL(20, "发送失败"), 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-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 16afd40..91f0f5d 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; @@ -2487,7 +2488,8 @@ public class WmsEnumUtil { TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"), BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"), BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"), - BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"); + BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"), + PDA_BTN(90, "PDA_BTN", "PDA按钮"); private String code; private String description; @@ -9540,6 +9542,87 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * PDA_BTN + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PDA_BTN { + CLEAR_REDIS(10, "CLEAR_REDIS", "清空缓存"); + + private int value; + private String code; + private String description; + + PDA_BTN(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * TIME_STATUS + */ + public enum TIME_STATUS { + NORMAL(1,"正常"), + TIME_OUT(2,"超时"); + + private int value; + private String description; + + TIME_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } 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/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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java index e3c9b8b..cfd1a27 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java @@ -30,7 +30,7 @@ import java.io.Serializable; @Api("MES_看板图片") public class MesBoardImage extends BaseBean implements Serializable { - private static final long serialVersionUID = -3757764185082659130L; + private static final long serialVersionUID = -3511836584646450267L; @Column(name = "BOARD_CODE") @ApiParam("看板代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java index 560d696..873c9da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java @@ -4,21 +4,17 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** * @Description: - * @Author: jokelin - * @Date: 2020/4/20 5:16 下午 + * @Author: Jessica + * @Date: 2020/11/20 5:16 下午 * @Modify: */ @Data @@ -41,6 +37,10 @@ public class MesPartFurnace extends BaseBean implements Serializable { @ApiParam("物料编码") private String partNo; + @Column(name = "orientation") + @ApiParam("方向") + private String orientation; + @Column(name = "MODEL_IMG_URL") @ApiParam("模式图片路径") private String modelImgUrl; 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 0bdd015..b07ece5 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 @@ -131,7 +131,6 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; - @Column(name = "TRAY_NO") @ApiParam("托盘号") private String trayNo; @@ -233,6 +232,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("颜色名称") private String colorName; + @Transient + @ApiParam("物料版本号") + private String versionNo; + public MesProduceSn() { } @@ -241,6 +244,51 @@ 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) { + this.id = id; + this.serialNumber = serialNumber; + this.productSn = productSn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.qcStatus = qcStatus; + this.snStatus = snStatus; + this.printCount = printCount; + this.printStatus = printStatus; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.routeCode = routeCode; + this.processCode = processCode; + this.nextProcessCode = nextProcessCode; + this.inWorkCenterTime = inWorkCenterTime; + this.outWorkCenterTime = outWorkCenterTime; + this.shippingTime = shippingTime; + this.workOrderNo = workOrderNo; + this.custSn = custSn; + this.custPartNo = custPartNo; + this.custCode = custCode; + this.snType = snType; + this.trayNo = trayNo; + this.operateType = operateType; + this.processLabelTemplate = processLabelTemplate; + this.prodLabelTemplate = prodLabelTemplate; + this.custLabelTemplate = custLabelTemplate; + this.lotNo = lotNo; + this.defectActionType = defectActionType; + this.vinCode = vinCode; + this.versionNo = versionNo; + } public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; 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 e0ce76a..025a99d 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 @@ -111,6 +111,10 @@ public class MesProductData extends BaseBean implements Serializable { @ApiParam("数据组号") private String groupNo; + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + @Json4Es @Lob @Column(name = "LINE_DATA") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 416d7cd..91703ac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -86,6 +86,10 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("是否需要设备自动报警") private Integer isEquMonitor; + @Column(name = "IS_TEMPORARY") + @ApiParam("是否临时开线") + private Integer isTemporary = 2; + @Transient @ApiParam(value = "子集列表") private List childTreeList; 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/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; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java index 586c574..2c9bcb2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +26,7 @@ public class MesBoardWorkCenterOverviewModel { private String imageUrl; @ApiParam("工单列表") - List workOrderList; + List workOrderList; @ApiParam("班组信息") MesShiftGroup shiftGroup; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java index 38eaaa0..e0a2aa2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java @@ -26,6 +26,9 @@ public class MesPackageQueryModel extends MesPackage { @ApiParam("工作单元名称") private String workCellName; + @ApiParam("是否封箱Name") + private String isSealedName; + public MesPackageQueryModel(String workCenterName, String workCellName) { this.workCenterName = workCenterName; this.workCellName = workCellName; @@ -37,4 +40,13 @@ public class MesPackageQueryModel extends MesPackage { this.workCenterName = workCenterName; this.workCellName = workCellName; } + + public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName,String isSealedName) { + super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo); + this.isSealedName=isSealedName; + this.processName=processName; + this.workCenterName = workCenterName; + this.workCellName = workCellName; + } + } 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/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index e93626f..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 @@ -139,4 +139,10 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("产品位置名称") private String produceCategoryName; + @ApiParam("版本号") + private String versionNo; + @ApiParam("泰国WL物料描述") + private String tgPartDesc; + @ApiParam("泰国过程条码截取前11位") + private String snTop11; } 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; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java new file mode 100644 index 0000000..26dfa50 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品条码返回model + * @author xiangming.liao + * @version 1.0 + * @date 2021/01/06 10:43 + **/ +@Data +@ApiModel("产品条码返回model") +public class CosmaReportProductSnModel extends MesProduceSn implements Serializable { + + private static final long serialVersionUID = 5217363746963291483L; + @ApiParam("条码类型Name") + private String snTypeName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java index ca3ec40..cbc5250 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java @@ -21,18 +21,37 @@ import java.util.List; public class ProduceDispPassPlatoModel { @ApiParam("项目号") - private List prodCfgTypeCodeList; + private String prodCfgTypeCode; @ApiParam("零件号") - private List partNoList; + private String partNo; - @ApiParam("单项占比") - private BigDecimal singleRatio; + @ApiParam("缺陷代码") + private String defectCode; - @ApiParam("累计占比") - private BigDecimal cumulativeRatio; + @ApiParam("缺陷名称") + private String defectName; - @ApiParam("缺陷数量") - private BigDecimal defectQty; + @ApiParam("单项占比") + private Double singleRatio; + @ApiParam("累计占比") + private Double cumulativeRatio; + + @ApiParam("数量") + private Long qty; + + public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, String defectCode, String defectName, Long qty) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.partNo = partNo; + this.defectCode = defectCode; + this.defectName = defectName; + this.qty = qty; + } + + public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, Long qty) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.partNo = partNo; + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java index 806e221..631c6cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -17,16 +18,17 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor -public class ProduceDispPassPlatoQueryModel { +public class ProduceDispPassPlatoQueryModel extends BaseBean { /** * 必选 */ @ApiParam("工序") - private String processCode; + private List processCodeList; - @ApiParam("统计方式") - private Integer statisticalPlacer; + //质量状态（20冻结，30报废） + @ApiParam("质量状态") + private List qcStatusList; /** * 可选 */ @@ -36,6 +38,10 @@ public class ProduceDispPassPlatoQueryModel { @ApiParam("零件号") private List partNoList; + //统计方式（0按月，1按天） + @ApiParam("统计方式") + private Integer statisticalMethod; + @ApiParam("开始时间") private String modifyStartDate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java index d27e146..84449e1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java @@ -19,11 +19,9 @@ public class ProduceDispPassRateModel { @ApiParam("统计时间") private String statisticalTime; - @ApiParam("质量状态/类型") - private Integer qcStatus; - + //统计选项（10=全部，20=冻结，30=报废） @ApiParam("统计选项") - private String statisticalOption; + private Integer statisticalOption; @ApiParam("冻结数") private BigDecimal freezeQty; @@ -37,9 +35,8 @@ public class ProduceDispPassRateModel { @ApiParam("占比率") private BigDecimal ratio; - public ProduceDispPassRateModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { + public ProduceDispPassRateModel(String statisticalTime, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { this.statisticalTime = statisticalTime; - this.qcStatus = qcStatus; this.statisticalOption = statisticalOption; this.freezeQty = freezeQty; this.scrapQty = scrapQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java index ed9dd7b..5b6f1fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java @@ -25,11 +25,20 @@ public class ProduceDispPassRateQueryModel { @ApiParam("工序") private String processCode; + //统计方式（0=按月，1按天） @ApiParam("统计方式") - private Integer statisticalPlacer; + private Integer statisticalMethod; + //质量状态（10=合格，20=冻结，30=报废） @ApiParam("质量类型") - private String qcStatus; + private Integer qcStatus; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; + /** * 可选 @@ -40,10 +49,5 @@ public class ProduceDispPassRateQueryModel { @ApiParam("零件号") private List partNoList; - @ApiParam("开始时间") - private String modifyStartDate; - - @ApiParam("结束时间") - private String modifyEndDate; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java index edad180..ecb716e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java @@ -41,12 +41,11 @@ public class ScrapOfPlatoModel { private BigDecimal scrapRatioPlato; - public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects,String workCellCode) { + public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) { this.partNo = partNo; this.prodCfgTypeCode = prodCfgTypeCode; this.defectCode = defectCode; this.defectName = defectName; this.numberOfDefects = numberOfDefects; - this.workCellCode = workCellCode; } } 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 { +} 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() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java index 64f297f..19bbe3f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -47,6 +48,10 @@ public class SysSmsSendRecord extends BaseBean { @ApiModelProperty(value = "软件模块") private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + /** * 接收手机号 */ @@ -104,6 +109,10 @@ public class SysSmsSendRecord extends BaseBean { @ApiModelProperty(value = "短信发送状态") private Integer smsSendStatus; + public String getSmsSendStatusTxt() { + return smsSendStatus == null ? null : ImppEnumUtil.SMS_SEND_STATUS.valueOfDescription(smsSendStatus); + } + /** * 短信发送时间 */ diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java index c298f3e..40bf0f3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java @@ -51,12 +51,13 @@ public class SysSmsTemplate extends BaseBean { * 模板代码 */ @Column(name = "SUPPLIER_TEMPLATE_CODE") - @ApiModelProperty(value = "模板代码") + @ApiModelProperty(value = "供应商模板代码") private String supplierTemplateCode; /** * 模板类型 */ + @AnnoOutputColumn @Column(name = "TEMPLATE_TYPE") @ApiModelProperty(value = "模板类型") private Integer templateType; @@ -64,10 +65,15 @@ public class SysSmsTemplate extends BaseBean { /** * 供应商类型 */ + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SUPPLIER.class) @Column(name = "SUPPLIER_TYPE") @ApiModelProperty(value = "供应商类型") private Integer supplierType; + public String getSupplierTypeTxt() { + return supplierType == null ? null : ImppEnumUtil.SMS_SUPPLIER.valueOfDescription(supplierType); + } + /** * 模板状态 */ @@ -76,6 +82,10 @@ public class SysSmsTemplate extends BaseBean { @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_TEMPLATE_STATUS.class) private Integer templateStatus; + public String getTemplateStatusTxt() { + return templateStatus == null ? null : ImppEnumUtil.SMS_TEMPLATE_STATUS.valueOfDescription(templateStatus); + } + /** * 模板内容 */ @@ -92,6 +102,13 @@ public class SysSmsTemplate extends BaseBean { /** + * 是否修改模板内容 + */ + @Transient + @ApiModelProperty(value = "是否修改模板内容") + private Integer isModifyContent; + + /** * 审批备注 */ @Transient 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/SwebDocMovementMaster.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java index 7d33c67..c8ac075 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java @@ -1,18 +1,15 @@ 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : @@ -149,4 +146,8 @@ public class SwebDocMovementMaster extends BaseBean { @Column(name = "SHIP_TIME") @ApiParam(value = "发运时间") private String shipTime; + + @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; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java index cfac2ee..449c54d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java @@ -24,6 +24,8 @@ public class AutoPickingModel { private String partNo; @ApiParam("简称") private String partNameRdd; + @ApiParam("成品数量") + private Double productQty; @ApiParam("完成数量") private Double printQty; @ApiParam("总数量") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java new file mode 100644 index 0000000..3f50ac6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +@Api("JIS发运报表明细模型") +public class JisReportDetailModel extends BaseBean { + @ApiParam("客户工厂") + private String customerNo; + @ApiParam("计划发货数量") + private Integer planShipingCount; + @ApiParam("计划发货时间") + private String planLoadTime; + @ApiParam("料架号") + private String fixLotNo; + @ApiParam("排序单号") + private String queneGroupNo; + @ApiParam("JIS号") + private String jisNo; + @ApiParam("箱条码") + private String sn; + @ApiParam("实际发货时间") + private String actualLoadTime; + @ApiParam("实际上线时间") + private String custOnLineTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java new file mode 100644 index 0000000..827a1a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +@Api("JIS发运报表模型") +public class JisReportModel extends BaseBean { + + @ApiParam("客户工厂") + private String custOrganizeCode; + @ApiParam("计划装车时间") + private String planLoadTime; + @ApiParam("计划发货数量") + private Double planShipingCount; + @ApiParam("实际装车时间") + private String actualLoadTime; + @ApiParam("实际发货数量") + private Double actualShipingCount; + @ApiParam("状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.TIME_STATUS.class,refForeignKey = "value",value = "description") + private Integer shippingStatus; + @ApiParam("料架号1") + private String queueGroupNo_1; + @ApiParam("客户上线时间1") + private String custOnLineTime_1; + @ApiParam("料架号2") + private String queueGroupNo_2; + @ApiParam("客户上线时间2") + private String custOnLineTime_2; + @ApiParam("料架号3") + private String queueGroupNo_3; + @ApiParam("客户上线时间3") + private String custOnLineTime_3; + @ApiParam("料架号4") + private String queueGroupNo_4; + @ApiParam("客户上线时间4") + private String custOnLineTime_4; + @ApiParam("客户现场库存") + private Double qty; + +}