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 6c04caf728 5b2bbf7b1e
commit 0fee0dbe67
11 changed files with 75 additions and 29 deletions
Show Stats Download Patch File Download Diff File

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

@ -127,4 +127,8 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@ApiParam("检测值")
private String checkValue;
@Transient
@ApiParam("质检单检测记录id")
private Long qcOrderRecordId;
}

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

@ -9,10 +9,7 @@ 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.Transient;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@ -28,7 +25,12 @@ import java.util.Date;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIT_ACTUAL")
@Table(name = "MES_QUEUE_JIT_ACTUAL", indexes = {
@Index(columnList = "JIS_ACTUAL_NO"),
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "VIN_CODE"),
@Index(columnList = "JIT_SEQ")
})
@NoArgsConstructor
@AllArgsConstructor
@Builder

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

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable;
@ -28,7 +29,12 @@ import java.io.Serializable;
@AllArgsConstructor
@Builder
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM")
@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM", indexes = {
@Index(columnList = "JIS_ACTUAL_NO"),
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "PRODUCE_CTGY_CODE"),
@Index(columnList = "PART_NO")
})
@Api("客户JIT生产队列散件清单")
public class MesQueueJitActualBom extends BaseBean implements Serializable {
private static final long serialVersionUID = 1604529847020812472L;

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

@ -7,10 +7,7 @@ import lombok.*;
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.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -27,7 +24,12 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@AllArgsConstructor
@Builder
@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL")
@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL", indexes = {
@Index(columnList = "JIS_ACTUAL_NO"),
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "PART_NO"),
@Index(columnList = "PRODUCE_CTGY_CODE")
})
@Api("MES_客户JIT生产队列明细")
public class MesQueueJitActualDetail extends BaseBean implements Serializable {

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

@ -9,11 +9,7 @@ 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.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -28,7 +24,11 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIT_PLAN")
@Table(name = "MES_QUEUE_JIT_PLAN", indexes = {
@Index(columnList = "JIS_PLAN_NO"),
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "VIN_CODE")
})
@Api("MES_客户JIT预装队列")
public class MesQueueJitPlan extends BaseBean implements Serializable {

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

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable;
@ -26,7 +27,12 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIT_PLAN_BOM")
@Table(name = "MES_QUEUE_JIT_PLAN_BOM", indexes = {
@Index(columnList = "JIS_PLAN_NO"),
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "PRODUCE_CTGY_CODE"),
@Index(columnList = "PART_NO")
})
@Api("MES_客户JIT预装队列BOM")
public class MesQueueJitPlanBom extends BaseBean implements Serializable {

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

@ -8,10 +8,7 @@ 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.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +23,12 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL")
@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL", indexes = {
@Index(columnList = "JIS_PLAN_NO"),
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "PRODUCE_CTGY_CODE"),
@Index(columnList = "PART_NO")
})
@Api("MES_客户JIT预装队列明细")
public class MesQueueJitPlanDetail extends BaseBean implements Serializable {

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

@ -27,7 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_QUEUE_ORDER_BOM", indexes = {
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO")
@Index(columnList = "PART_NO"),
@Index(columnList = "PRODUCE_CTGY_CODE")
})
@Api("MES_生产队列散件清单")
public class MesQueueOrderBom extends BaseBean implements Serializable {

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

@ -16,7 +16,7 @@ import java.io.Serializable;
/**
* @author dominic
* @date 2020/11/18 21:52
* @date 2020/11/19 00:47
* @desc 包装明细
*/
@Data
@ -45,5 +45,4 @@ public class PackageDetailModel {
public PackageDetailModel() {
}
;
}

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

@ -2783,8 +2783,8 @@ public class MesHqlPack {
* @param organizeCode
* @return
*/
public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCellSkill, organizeCode);
public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());;
if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
}
@ -3637,4 +3637,28 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean);
return packBean;
}
/**
* MES_看板自定义参数配置查询条件封装
*
* @param boardLineStaffMatrix
* @return
*/
public static DdlPackBean getBoardLineStaffMatrix(MesBoardLineStaffMatrix boardLineStaffMatrix) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardLineStaffMatrix.getOrganizeCode());
if (!StringUtils.isEmpty(boardLineStaffMatrix.getBoardCode())) {
DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getBoardCode(), "boardCode", packBean);
}
if (!StringUtils.isEmpty(boardLineStaffMatrix.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getWorkCellCode(), "workCellCode", packBean);
}
if (!StringUtils.isEmpty(boardLineStaffMatrix.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(boardLineStaffMatrix.getUserCode())) {
DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getUserCode(), "userCode", packBean);
}
return packBean;
}
}

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

@ -1753,7 +1753,7 @@ public class WmsHqlPack {
*/
public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
//DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
/*DdlPreparedPack.getOrderByPack(

Write Preview
Loading…
Cancel
Save