I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'ext-dev' (#267) from andly.pan/i3plus-pojo:ext-dev into ext-dev

Browse Source 
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/267
yun-zuoyi
潘天虎 4 years ago
parent 7a4ab20483 43d7195a37
commit 8c68b49cb6
15 changed files with 233 additions and 7 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -2100,7 +2100,8 @@ public class MesEnumUtil {
MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"),
MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"),
MES_JISA(640, "jisaExcelService", "JISA导入"),
MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入");
MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"),
MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入");
private int value;
private String service;

55
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java
Unescape Escape View File

@ -0,0 +1,55 @@
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:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-16-17:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_CONTAINER_SN_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PART_NO"),
@Index(columnList = "CT_NO")
})
@Api("容器条码记录表")
public class MesContainerSnRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -303802118993255101L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "CT_NO")
@ApiParam("容器号")
private String ctNo;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
}

42
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java
Unescape Escape View File

@ -0,0 +1,42 @@
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
* @CreateDate: 2019/10/18 2:55 下午
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_HOLIDAY_VACTION")
@Api("节假日")
public class MesHolidayVacation extends BaseBean implements Serializable {
private static final long serialVersionUID = -1620451254243818560L;
@Column(name = "YEAR")
@ApiParam("年")
private String year;
@Column(name = "MONTH")
@ApiParam("月")
private String month;
@Column(name = "DAY")
@ApiParam("日")
private String day;
}

49
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlcDataRecord.java
Unescape Escape View File

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.ProductDataModel;
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.List;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate:2019\10\9 0009
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_PLC_DATA_RECORD", indexes = {
@Index(columnList = "PLC_CODE")
})
@Api("PLC数据记录表")
public class MesPlcDataRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -8789141495695469898L;
@Column(name = "PLC_CODE")
@ApiParam("PLC代码")
private String plcCode;
@Column(name = "PLC_NAME")
@ApiParam("PLC名称")
private String plcName;
@Column(name = "PLC_VLAUE")
@ApiParam("PLC型号")
private String plcValue;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
Unescape Escape View File

@ -123,6 +123,10 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("任务单类型")
private String checkOrderType;
@Column(name = "ON_SITE_FREQUENCY")
@ApiParam("巡检次数")
private Integer onSiteFrequency = 0;
@Deprecated
@ApiParam(value = "检测结果")
@Transient

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java
Unescape Escape View File

@ -60,5 +60,5 @@ public class MesWorkCellDefect extends BaseBean implements Serializable {
@Transient
@ApiParam("缺陷名称")
private String defectCodeName;
private String defectName;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
Unescape Escape View File

@ -393,6 +393,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("生产节拍")
private Integer takt;
@Transient
@ApiParam("容器号")
private String ctNo;
/********************** 动态冗余字段（界面维护大写） *********************************/
@Transient

7
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java
Unescape Escape View File

@ -8,6 +8,7 @@ import java.io.Serializable;
/**
* 产品履历报表-缺陷信息
*
* @author yumingxing
* @version 1.0
* @date 2020/12/18 15:16
@ -51,8 +52,11 @@ public class DefectRecordModel implements Serializable {
@ApiParam(value = "扫描时间")
public String createDatetime;
@ApiParam(value = "图片路径")
private String pictureUrl;
public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime, String pictureUrl) {
this.workCenterName = workCenterName;
this.processName = processName;
this.qcStatus = qcStatus;
@ -62,5 +66,6 @@ public class DefectRecordModel implements Serializable {
this.serialNumber = serialNumber;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.pictureUrl = pictureUrl;
}
}

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnRecord;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/5/1 12:21 PM
* @Modify:
*/
public interface MesContainerSnRecordRepository extends BaseRepository<MesContainerSnRecord, Long> {
}

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesHolidayVacation;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/5/7 4:44 PM
* @Modify:
*/
public interface MesHolidayVacationRepository extends BaseRepository<MesHolidayVacation, Long> {
}

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcDataRecordRepository.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPlcDataRecord;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/5/2 4:11 PM
* @Modify:
*/
public interface MesPlcDataRecordRepository extends BaseRepository<MesPlcDataRecord, Long> {
}

13
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
Unescape Escape View File

@ -6,14 +6,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 移库单条码表
@ -96,6 +100,9 @@ public class WmsDocMovementSn extends BaseBean {
@ApiParam(value = "目标库位代码")
public String destLocateNo;
@Column(name = "PACKAGE_NO")
@ApiParam(value = "包装编号")
private String packageNo;
@Transient
@ApiParam("前端表格编辑使用")

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java
Unescape Escape View File

@ -60,6 +60,10 @@ public class WmsPrintingQueue extends BaseBean{
@ApiParam("供应商编码")
private String vendorNo;
@Column(name="PART_NO")
@ApiParam("物料编码")
public String partNo;
public WmsPrintingQueue() {
}

9
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
Unescape Escape View File

@ -237,6 +237,11 @@ public class WmsStockSn extends BaseBean {
// @ApiParam(value = "乐观锁", example = "1")
// public Integer lockVersion;
@ApiParam("托盘(容器)类型编号")
@Column(name = "CT_CODE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String ctCode;
@ApiParam(value = "仓库名称")
@Transient
public String whNameRdd;
@ -955,4 +960,8 @@ public class WmsStockSn extends BaseBean {
this.zoneNo = zoneNo;
this.vendorNo = vendorNo;
}
public WmsStockSn(String partNo, Double qty) {
this.partNo = partNo;
this.qty = qty;
}
}

9
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -3222,6 +3222,9 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result);
}
getStringBuilderPack(details, result);
DdlPreparedPack.getOrderByPack(
new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},
new String[]{"seq"}, result);
return result;
}
@ -3271,7 +3274,11 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result);
/**
* @Author : gsz 2021/04/09
* 15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430
**/
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result);
if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) {

Write Preview
Loading…
Cancel
Save