diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 4dc2203..1b131b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -52,7 +52,7 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam("标准包规数量") - private Double partSpecQty; + private Double partSpecQty = 0d; @Column(name = "CATEGORY_CODE1") @ApiParam("分类1") @@ -84,15 +84,15 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private Integer processMatchType; + private Integer processMatchType = 0; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") - private Integer packageMatchType; + private Integer packageMatchType = 0; @Column(name = "PRODUCT_MATCH_TYPE") @ApiParam("产品编码匹配类型") - private Integer productMatchType; + private Integer productMatchType = 0; @Column(name = "PPT_CODE") @ApiParam("产品类型代码") @@ -100,7 +100,7 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "PART_TRAIT") @ApiParam("物料特性") - private Integer partTrait; + private Integer partTrait = 0; @Column(name = "COLOR_CODE") @ApiParam("颜色代码") @@ -112,11 +112,11 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "SHELVES_AMOUNT") @ApiParam("挂架数") - private Integer shelvesAmount; + private Integer shelvesAmount = 0; @Column(name = "QUANTITY_PER_RACK") @ApiParam("挂架可放零件数") - private Integer quantityPerRack; + private Integer quantityPerRack = 0; @Column(name = "PAINT_TANK_CODE") @ApiParam("供漆罐代码") 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 8bb9074..2286808 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 @@ -397,7 +397,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Transient @ApiParam("节拍") - private Integer chainSpeed; + private String chainSpeed; @Transient @ApiParam("小车号") @@ -405,11 +405,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Transient @ApiParam("小车数量") - private Integer smallCarAmount; + private String smallCarAmount; @Transient @ApiParam("标包") - private Integer standardPackage; + private String standardPackage; @Transient @ApiParam("包规代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java index e40623b..004561a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + @Data public class MgnBoardAreaYieldModel { @@ -15,4 +17,13 @@ public class MgnBoardAreaYieldModel { @ApiParam("注塑") private MgnBoardListModel injectMoldBoardListModel; + @ApiParam("组装集合") + private List assembleBoardListModelList; + + @ApiParam("涂装集合") + private List paintBoardListModelList; + + @ApiParam("注塑集合") + private List injectMoldBoardListModelList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java new file mode 100644 index 0000000..711d0ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardListColorModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("颜色") + private String color; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 8ad36ad..cce2193 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -38,10 +38,22 @@ public class MgnBoardListModel { @ApiParam("计划完成率") private String planCompleteRate; - @ApiParam("异常数量") + @ApiParam("呼叫异常数量") private Integer exceptQty; + @ApiParam("响应异常数量") + private Integer responseQty; + @ApiParam("正常数量") private Integer normalQty; + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("车间") + private String areaCode; + + @ApiParam("产线集合") + private List workCenterList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index b55ccd2..fcf9501 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -65,4 +66,12 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("不良汇总列值") private List defectValueList; + @Transient + @ApiParam("开始工单") + private String workOrderNoStart; + + @Transient + @ApiParam("结束工单") + private String workOrderNoEnd; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index a84874b..21110ed 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -470,7 +470,8 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { + public WmsDocMovementDetails (String createDatetime, String srcZoneNo,String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { + System.out.println("=======参数方法"); this.createDatetime = createDatetime; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; @@ -478,6 +479,7 @@ public class WmsDocMovementDetails extends BaseBean { this.itemStatus= itemStatus; this.orderNo = orderNo; this.partNo=partNo; + this.srcZoneNo = srcZoneNo; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 35bcf37..dce7352 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -162,6 +162,10 @@ public class WmsPOMasterDetails extends BaseBean { private String dateCode; @Transient + @ApiParam(value = "颜色控制") + private String color; + + @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 542301e..6def198 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -16,6 +16,7 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; import java.util.List; +import java.util.Map; /** * @Description : 库存信息 @@ -169,6 +170,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "应有数量") private Double theoryQty; + @Transient + @ApiParam(value = "差异数量MAP") + private Map> differenceQtyMap; + public Integer getIsSnapshot() { return this.isSnapshot == null ? 0 : this.isSnapshot; @@ -362,4 +367,11 @@ public class WmsStockQuan extends BaseBean { this.partNameRdd = partNameRdd; this.qty = qty; } + public WmsStockQuan(String whNo, String zoneNo, String locateNo, String partNo, String partNameRdd) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index 79bb4c4..fc673d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -10,7 +10,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单条码信息 @@ -167,6 +171,11 @@ public class WmsMoveSnSnapshot extends SnapshotBean { @ApiParam("供应商编号") private String vendorNo; + @Column(name = "LEFT_CODE") + @ApiParam(value = "生产批次") + private String leftCode; + + @Transient @ApiParam("业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") 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 0cd559a..cd0c07a 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 @@ -1373,6 +1373,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLeftCode(), "leftCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {