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 19e6a45..787e7a6 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 @@ -3322,7 +3322,8 @@ public class MesEnumUtil { FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); + REPRODUCTION_NOT_RMS(120, "重新生产-不报功"), + REVERSE_SPRAY_ORDER(130, "反喷工单"); private int value; private String description; @@ -4484,7 +4485,9 @@ public class MesEnumUtil { public enum QUEUE_JIT_ACTUAL_STATUS { CREATE(10, "创建"), LANDED(20, "下达"), - CANCEL(30, "取消"); + CANCEL(30, "取消"), + OFFLINE(40, "下线"), + SHIPMENT(50, "发运"); private int value; private String description; @@ -7093,4 +7096,86 @@ public class MesEnumUtil { } } + + /** + * 涂装导入--反喷标识（Y-正常；F-反喷） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REVERSE_SPRAY_MARK { + REVERSE_SPRAY("F", "反喷"), + NORMAL("Y", "正常"); + + private String value; + private String description; + + REVERSE_SPRAY_MARK(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MES_出入库事务表--事务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TRANS_TYPE { + + OUTSTOCK(10, "出库"), + INSTOCK(20, "入库"), + GOBACK(30, "退回"); + + private int value; + private String description; + + PACKAGE_TRANS_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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 static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index e65bb5a..95020ed 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -5132,4 +5132,42 @@ public class MesPcnEnumUtil { } + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_STATUS { + CREATE(10, "创建"), + LANDED(20, "下达"), + CANCEL(30, "取消"), + OFFLINE(40, "下线"), + SHIPMENT(50, "发运"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java new file mode 100644 index 0000000..a1f1796 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java @@ -0,0 +1,57 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_SYSTEM_CFG") +@Api("MES_PCN_系统配置") +public class MesPcnSystemCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324811596L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "SYS_NAME") + @ApiParam("系统名称") + private String sysName; + + @Column(name = "COMPANY") + @ApiParam("公司名称") + private String company; + + @Column(name = "SYS_LOG") + @ApiParam("系统LOG") + private String sysLog; + + @Column(name = "MAIN_LOG") + @ApiParam("主页LOG") + private String mainLog; + + @Column(name = "COPYRIGHT") + @ApiParam("版权信息") + private String copyright; + + @Transient + @ApiParam("LOG存放地址") + private String logUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index d290454..b2631fb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -58,4 +59,26 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { @Column(name = "FORMULA_CONTENT") @ApiParam("配方内容") private String formulaContent; + + @Transient + @ApiParam("工单类型") + private Integer woType; + + @Transient + @ApiParam("子物料名称") + private String itemPartNo; + + @Transient + @ApiParam("数量") + private long qty; + + public MesQueueJitPlanDetail() { + + } + + public MesQueueJitPlanDetail(String partNo, String itemPartNo, long qty) { + this.partNo = partNo; + this.itemPartNo = itemPartNo; + this.qty = qty; + } } 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 new file mode 100644 index 0000000..63b76b8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +@Data +public class TJMgnBoardModel extends BaseBean { + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色") + private String partColor; + + @ApiParam("生产数量") + private Double prodQty; + + @ApiParam("一次合格数量") + private Double firstQuQty; + + @ApiParam("抛光数量") + private Double polishQty; + + @ApiParam("不合格数量") + private Double noQuQty; + + @ApiParam("一次合格率") + private String firstPassRate; + + @ApiParam("最终合格率") + private String finalPassRate; + + @ApiParam("列名") + private List> headModelList; + + @ApiParam("列值") + private List> headValueModelList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java index 834aedf..ce900de 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java @@ -51,7 +51,7 @@ public class ZzMesWorkOrderModel extends BaseBean { private String snp; @ApiParam(value = "包装规格") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String packageSpec; @ApiParam(value = "备注") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java new file mode 100644 index 0000000..bc0a358 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnSystemCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPcnSystemCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 0333bea..de9c87c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3326,4 +3326,28 @@ public class MesHqlPack { } return packBean; } + + /** + * 预装区域查询 + * + * @param packageTrans + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPackageTrans(MesPackageTrans packageTrans, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(packageTrans, organizeCode); + if (!StringUtils.isEmpty(packageTrans.getTransType())) { + DdlPreparedPack.getNumEqualPack(packageTrans.getTransType(), "transType", packBean); + } + if (!StringUtils.isEmpty(packageTrans.getPartNo())) { + DdlPreparedPack.getStringLikerPack(packageTrans.getPartNo(), "partNo", packBean); + } + if (!StringUtil.isEmpty(packageTrans.getCreateDateTimeStart()) || !StringUtil.isEmpty(packageTrans.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + packageTrans.getCreateDateTimeStart(), + packageTrans.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } } 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 9cc690d..6133593 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 @@ -11,7 +11,12 @@ 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; +import javax.persistence.Version; /** * @Description : PO订单明细信息 @@ -190,6 +195,14 @@ public class WmsPOMasterDetails extends BaseBean { private String planEndDate; + /** + * 状态:1=新建,10=收货中,20=收货完成, + * 30=入库中,40=入库完成,90=已关闭,91=已取消 + */ + @Transient + @ApiParam(value = "状态", example = "1") + public Integer poStatus; + public Double getSnpVal() { return snp; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index aa6cdcf..df864de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -157,4 +157,23 @@ public class WmsPartExtend extends BaseBean { @ApiParam(value = "自动采购数量") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer autoPurchaseQty; + + @Column(name = "QC_SKIP_CYCLE") + @ApiParam(value = "质检跳批周期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer qcSkipCycle; + + @Column(name = "QC_PASS_COUNT") + @ApiParam(value = "质检合格次数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer qcPassCount; + + @Column(name = "LAST_QC_TIME") + @ApiParam(value = "上次质检时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lastQcTime; + + public Integer getQcPassCount() { + return this.qcPassCount == null ? 0 :this.qcPassCount.intValue(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index d5b5feb..4f21a95 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import java.time.LocalTime; +import java.util.Map; /** * @Description : 供应商收货看板信息 @@ -48,6 +50,12 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable> gteCurrentDayResultMap; + + @ApiParam("小于今天的结果集") + private Map> ltCurrentDayResultMap; + public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName, String planTime, Double transQty, Double resQty) { this.orderNo = orderNo;