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

Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

Browse Source
yun-zuoyi
陈思洁 5 years ago
parent 1706b7a684 269f072fb8
commit 11b461f1d6
28 changed files with 242 additions and 22 deletions
Show Stats Download Patch File Download Diff File

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

@ -3416,7 +3416,8 @@ public class MesEnumUtil {
REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
REVERSE_SPRAY_ORDER(130, "反喷工单"),
SPARE_RETURN_REPAIR(140, "客退备件返修"),
SEIZE_SEAT_ORDER(150, "占位工单");
SEIZE_SEAT_ORDER(150, "占位工单"),
SAMPLE_ORDER(160, "样件工单");
private int value;
private String description;
@ -3581,11 +3582,11 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_ORDER_STATUS {
WAIT_LANDED(5, "待下达"),
NORMAL(10, "正常"),
ONLINE(20, "已上线"),
OFFLINE(30, "已下线"),
CLOSE(40, "已关闭"),
;
CLOSE(40, "已关闭");
private int value;
private String description;

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

@ -2075,8 +2075,7 @@ public class MesPcnEnumUtil {
NORMAL(10, "正常"),
ONLINE(20, "已上线"),
OFFLINE(30, "已下线"),
CLOSE(40, "已关闭"),
;
CLOSE(40, "已关闭");
private int value;
private String description;

2
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -88,7 +88,7 @@ public class MesHqlPack {
public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
return packBean;
}

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

@ -104,4 +104,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
}

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

@ -79,10 +79,22 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "STOCK_QTY")
@ApiParam("排程实时库存")
private Integer stockQty;
@Column(name = "MIN_GEN_LOT")
@ApiParam("最小生成批次")
private Integer minGenLot;
@Transient
@ApiParam("已下达箱数")
private Integer alreadyLandedNum;
@Transient
@ApiParam("物料名称")
private String partName;

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

@ -122,6 +122,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
@ApiParam("特殊标识")
private Integer specialFlag;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Transient
@ApiParam("起始车号")
private String custFlagNoStart;

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

@ -220,6 +220,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
return this.qty == null ? 0.0d : this.qty;
}
public double getFinsihQtyVal() {
return this.finsihQty == null ? 0.0d : this.finsihQty;
}
public int getStatusVal() {
return this.status == null ? 0 : this.status;
}

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

@ -55,4 +55,8 @@ public class MesRouteProcessCell extends BaseBean implements Serializable {
@ApiParam("工序代码名称")
private String processCodeName;
@Transient
@ApiParam("正在生产队列数量")
private Integer genningNum;
}

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

@ -152,6 +152,10 @@ public class MesStationBom extends BaseBean implements Serializable {
private Integer length;
@Transient
@ApiParam("缺陷代码")
private String defectCode;
@Transient
@ApiParam("校验内容")
private String checkContent;

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -19,12 +20,15 @@ public class FutrueTaskModel<T> {
@ApiParam("实现类")
private Object futrueTaskService;
@ApiParam("包装条码")
@ApiParam("工位请求bean")
private StationRequestBean stationRequestBean;
@ApiParam("过程条码")
@ApiParam("产品条码表")
private MesProduceSn produceSn;
@ApiParam("产品绑定记录表")
private MesProdBindRecord prodBindRecord;
@ApiParam("组织代码")
private String organizeCode;

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

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@Data
public class MgnPaintPolishingReportModel {
@ApiParam("物料号")
private String partNo;
@ApiParam("物料描述")
private String partDesc;
@ApiParam("工单号")
private String workOrderNo;
@ApiParam("日期")
private String modifyDate;
@ApiParam("开始日期")
private String modifyStartDate;
@ApiParam("结束日期")
private String modifyEndDate;
@ApiParam("抛光数量")
private Double polishingQty;
@ApiParam("返喷标识")
private String reverseSprayMark;
@ApiParam("打磨件物料号")
private String polishPartNo;
@ApiParam("打磨件物料描述")
private String polishPartDesc;
@ApiParam("组织代码")
private String organizeCode;
}

9
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
Unescape Escape View File

@ -119,6 +119,15 @@ public class QueueOrderModel implements Serializable {
public QueueOrderModel() {
}
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
public double getFinsihQtyVal() {
return this.finsihQty == null ? 0.0d : this.finsihQty;
}
public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
this.queueSeq = queueSeq;

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

@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.mes.bean.*;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@ -3415,6 +3416,18 @@ public class MesHqlPack {
return packBean;
}
public static DdlPackBean getMesPaintPolishing(MgnPaintPolishingReportModel paintPolishingReportModel, String organizeCode) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(paintPolishingReportModel.getOrganizeCode());
if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) {
DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) {
DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(),
"modifyDatetime", packBean, true);
}
return packBean;
}
public static DdlPackBean getMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) {
DdlPackBean packBean = getAllBaseData(mesExceptionAlertCfg.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getSrcMenuCode(), "srcMenuCode", packBean);

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

@ -106,7 +106,7 @@ public class MesPcnHqlPack {
public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
return packBean;
@ -122,7 +122,7 @@ public class MesPcnHqlPack {
public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
return packBean;

7
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
Unescape Escape View File

@ -21,7 +21,12 @@ public class WmsJobParamModel implements Serializable {
private Integer snType;//条码类型（虚拟，实物）
private String devOpsEmail;//运维人员邮箱
private Integer minuteDiff;//处理周期(分钟)
private String whereHql;//业务查询条件HQL
private List<String> fixPartList;//需要特殊处理的零件号集合
private String fixPartAndWhere; // 特殊零件号需要加的过滤条件
private Integer pageSize;//数据条数
private Integer isCheckSn;//是否检查条码存在
private Integer erpSyncFlag;//查询SHIPPING表的条件
public int getMinuteDiffVal() {
return this.minuteDiff == null ? 0 : this.minuteDiff.intValue();

8
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
Unescape Escape View File

@ -19,4 +19,12 @@ public class WmsMoveDetailsModel implements Serializable {
private static final long serialVersionUID = -6968143574442339454L;
private WmsMoveDetails details;
private List<WmsMoveSn> moveSnList;
public WmsMoveDetailsModel(WmsMoveDetails details, List<WmsMoveSn> moveSnList) {
this.details = details;
this.moveSnList = moveSnList;
}
public WmsMoveDetailsModel() {
}
}

8
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java
Unescape Escape View File

@ -18,4 +18,12 @@ public class WmsMoveMasterModel implements Serializable {
private static final long serialVersionUID = -5490167040159056107L;
private WmsMoveMaster moveMaster;
private List<WmsMoveDetailsModel> moveDetails;
public WmsMoveMasterModel(WmsMoveMaster moveMaster, List<WmsMoveDetailsModel> moveDetails) {
this.moveMaster = moveMaster;
this.moveDetails = moveDetails;
}
public WmsMoveMasterModel() {
}
}

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

@ -1,8 +1,11 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -42,4 +45,14 @@ public class WmsStockFifoModel {
@ApiParam("同批次")
private boolean fifoSameBatch;
@ApiParam("FIFO查询获取方式")
private Integer fifoSnByLood;
@ApiParam("物料条码信息")
Map<String, List<WmsStockSn>> snMap = new HashMap<>();
@ApiParam("所有推荐条码信息")
List<WmsStockSn> wmsStockSnAllList = new ArrayList<>();
}

19
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -1232,4 +1232,23 @@ public class CoreHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment);
DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean);
DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize);
DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean);
DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean);
return ddlPackBean;
}
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -54,6 +56,7 @@ public class BsSuitDataDetail extends BaseBean {
@Column(name = "CASE_TYPE_ID")
@ApiParam(value = "套件类型id(枚举)")
@AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class)
private Integer caseTypeId;
@Column(name = "SUIT_TYPE_NAME_RDD")
@ -81,8 +84,14 @@ public class BsSuitDataDetail extends BaseBean {
@Column(name = "PROCESS_STATE")
@ApiParam(value = "处理状态")
@AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class)
private Integer processState;
public String getProcessStateTxt() {
return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() :
BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState);
}
@Column(name = "PROCESS_TIME")
@ApiParam(value = "处理时间")
private String processTime;

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

@ -53,6 +53,10 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "REF_ITEM")
@ApiParam("关联行号")
public Integer refItem;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")

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

@ -10,12 +10,8 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
* @Description : 库存移动单主表信息
@ -177,6 +173,22 @@ public class WmsMoveMaster extends BaseBean {
@ApiParam("总行数")
private Long itemQty;
@Transient
@ApiParam("存储区")
private String zoneNo;
@Transient
@ApiParam("仓库")
private String whNo;
@Transient
@ApiParam("状态集合")
private List<Integer> orderStatusList;
@Transient
@ApiParam("交易类型集合")
private List<String> transTypeCodeList;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")

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

@ -273,4 +273,13 @@ public class WmsPOMasterDetails extends BaseBean {
this.totalBoxes = totalBoxes.intValue();
this.qty = qty;
}
public WmsPOMasterDetails(String orderNo, String partNo, Double qty,
Double rcQty, Integer itemStatus) {
this.orderNo = orderNo;
this.partNo = partNo;
this.qty = qty;
this.rcQty = rcQty;
this.itemStatus = itemStatus;
}
}

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

@ -221,6 +221,11 @@ public class WmsPart extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double proportion;
@Column(name = "STD_CHECK_TIME")
@ApiParam(value = "标准质检时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer stdCheckTime;
@Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
@ApiParam(value = "是否贵重")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE")

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

@ -14,6 +14,7 @@ import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.Version;
import java.util.List;
/**
@ -119,6 +120,11 @@ public class WmsStockQuan extends BaseBean {
@ApiParam(value = "报废数量")
private Double scrapQty;
@Version
@Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
@ApiParam(value = "乐观锁", defaultValue = "0")
public Integer lockVersion;
@Transient
@ApiParam(value = "总数量")
private Double totalQty;
@ -220,6 +226,12 @@ public class WmsStockQuan extends BaseBean {
return this.boxQty == null ? 0 : this.boxQty;
}
public Integer getLockVersion() {
return this.lockVersion == null ? 0 : this.lockVersion;
}
public WmsStockQuan() {
}

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

@ -14,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
@ -229,6 +225,11 @@ public class WmsStockSn extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer seqNo;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")
// public Integer lockVersion;
@ApiParam(value = "仓库名称")
@Transient
public String whNameRdd;

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

@ -81,6 +81,10 @@ public class WmsTransType extends BaseBean {
@ApiParam(value = "交易处理组件名称")
private String tmName;
@Column(name = "DIRECT")
@ApiParam(value = "交易的方向：IN,OUT,MOVE")
private String direct;
@Transient
@ApiParam("菜单URL")
private String menuUrl;

7
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java
Unescape Escape View File

@ -21,4 +21,11 @@ public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
* @return 配置信息
*/
WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode);
/**
* 按照配置代码查询配置信息
* @param configCode 配置代码
* @return 配置信息
*/
WmsConfig getFirstByConfigCode(String configCode);
}

Write Preview
Loading…
Cancel
Save