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

冲突解决

Browse Source
yun-zuoyi
wynne1005 5 years ago
parent b3aa6eef70 310da99743
commit f9fa5814f6
131 changed files with 2552 additions and 225 deletions
Show Stats Download Patch File Download Diff File

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

@ -286,6 +286,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
@ApiParam(value ="安灯类型名称")
private String alarmCodeName;
@Transient
@ApiParam(value ="响应时长-分钟")
private Integer downtime;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@ -93,6 +93,9 @@ public class AndonMenuInterfaceModel implements Serializable {
@ApiParam("当前产线的未解决故障统计")
private List<AndonBoardModel> pendingSolveBrokenInfoList;
@ApiParam("安灯队列停机时长")
private List<AndonManageQueue> andonManageQueueList;
public double getExceptionTimeVal() {
return exceptionTime == null ? 0 : exceptionTime;
}

35
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java
Unescape Escape View File

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.andon.model;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
/**
* @Description : 人员model
* @Reference :
* @Author : wangjie
* @CreateDate : 2018-10-11 11:02
* @Modify:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("用户信息model")
public class AndonUserModel extends BaseBean {
@ApiParam(value ="部门名称")
private String departmentNameRdd;
@ApiParam(value ="用户名称" , access ="账号名称")
private String userName;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="员工编号")
private String userEmpNo;
}

30
modules/i3plus-pojo-base-mongo/pom.xml
Unescape Escape View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-base-mongo</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-platform</artifactId>
</dependency>
</dependencies>
</project>

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java → modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java
Unescape Escape View File

@ -2,13 +2,11 @@ package cn.estsh.i3plus.pojo.base.jpa.dao;
import cn.estsh.i3plus.pojo.base.common.Pager;
import org.bson.conversions.Bson;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.data.repository.NoRepositoryBean;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description : 自定义Repository的方法接口

0
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java → modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java
Unescape Escape View File

0
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java → modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java
Unescape Escape View File

0
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java → modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java
Unescape Escape View File

0
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java → modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java
Unescape Escape View File

0
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java → modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java
Unescape Escape View File

0
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java → modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java
Unescape Escape View File

0
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java → modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java
Unescape Escape View File

15
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
Unescape Escape View File

@ -10,11 +10,11 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.mongodb.core.index.IndexDirection;
import org.springframework.data.mongodb.core.index.Indexed;
import javax.persistence.*;
import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* @Description :
@ -88,7 +88,6 @@ public abstract class BaseBean implements Serializable {
searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
public String createUser;
@Indexed(direction = IndexDirection.DESCENDING)
@Column(name="CREATE_DATE_TIME",updatable = false)
@ApiParam(value = "创建日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@ -142,13 +141,18 @@ public abstract class BaseBean implements Serializable {
public transient Integer ascOrDesc = 1;
public int getIsValidVal() {
return this.isValid == null ? 0 : this.isValid.intValue();
return this.isValid == null ? 0 : this.isValid;
}
public int getIsDeletedVal() {
return this.isDeleted == null ? 0 : this.isDeleted.intValue();
return this.isDeleted == null ? 0 : this.isDeleted;
}
// @Transient
// @ApiParam(value = "多列排序")
// @AnnoOutputColumn(hidden = true)
// public LinkedHashMap<String,Integer> sortParamMap;
//排序方式
public String orderBy(){
String result = "";
@ -162,4 +166,5 @@ public abstract class BaseBean implements Serializable {
}
return result;
}
}

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

@ -2558,4 +2558,101 @@ public class CommonEnumUtil {
public enum DYNAMIC_DATA_SOURCE_TYPE {
MASTER,NODE
}
/**
* 会话模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SESSION_MODE {
DEFAULT(10, "默认"),
OVERWRITE(20, "覆盖"),
SEIZE(30, "抢占");
private int value;
private String description;
SESSION_MODE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(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 desc) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 条码解析校验模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BARCODE_CHECK_MODE {
SEPARATOR_NUM(10, "分割数"),
ANALYTIC_NUM(20, "解析数"),
WEAK(30, "弱校验");
private int value;
private String description;
BARCODE_CHECK_MODE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(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 desc) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

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

@ -1331,4 +1331,49 @@ public class ImppEnumUtil {
return null;
}
}
/**
* 用户定制化配置类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_CUSTOMIZE_CONFIG_TYPE {
WEB_TABLE_SHOW_COL(10, "前端表格显示列");
private int value;
private String description;
USER_CUSTOMIZE_CONFIG_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(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 desc) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

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

@ -1968,7 +1968,9 @@ public class MesEnumUtil {
MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"),
BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"),
BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入");
BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"),
MES_PROD_WORK_CENTER(530, "prodWorkCenterExcelService", "产品工作中心配置导入"),
MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入");
private int value;
private String service;
@ -2339,7 +2341,8 @@ public class MesEnumUtil {
public enum MES_WORK_CELL_TYPE {
NORMAL(10, "正常"),
REWORK(20, "返修");
REWORK(20, "返修"),
ON_LINE(30, "上线工位");
private int value;
private String description;
@ -6932,6 +6935,54 @@ public class MesEnumUtil {
}
/**
* 产品位置
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_CATEGORY {
FL("FL", "DOOR_FRONT_LEFT"),
FR("FR", "DOOR_FRONT_RIGHT"),
RL("RL", "DOOR_REAR_LEFT"),
RR("RR", "DOOR_REAR_RIGHT");
private String description;
private String value;
PRODUCE_CATEGORY(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.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String description) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@ -63,7 +63,8 @@ public class MesPcnEnumUtil {
BUTTON_MODULE(30, "按钮组件"),
TIMING_MODULE(40, "定时组件"),
PCS_BACK_MODULE(50, "工序后台组件"),
PLC_CALLBACK_MODULE(60, "PLC回调工位参数");
PLC_CALLBACK_MODULE(60, "PLC回调工位参数"),
ASSIST_MODULE(70, "辅助组件");
private int value;
private String description;
@ -797,7 +798,8 @@ public class MesPcnEnumUtil {
public enum MES_WORK_CELL_TYPE {
NORMAL(10, "正常"),
REWORK(20, "返修");
REWORK(20, "返修"),
ON_LINE(30, "上线工位");
private int value;
private String description;
@ -2577,7 +2579,10 @@ public class MesPcnEnumUtil {
STEP_LIST("stepList", "工步列表"),
STATE_LIST("stateList", "状态列表"),
STEP_CONTENT("stepContent", "工步内容"),
MODULE_CONTENT("moduleContent", "组件内容"),
MODULE_CONTENT("moduleContent", "展示组件内容"),
MODULE_HEAD("moduleHead", "展示组件头"),
GUIDE_CONTENT("guideContent", "指导内容"),
ASSISTANT_CONTENT("assistantContent", "辅助展示组件"),
CUSTOM_COMPONENT("customComponent", "定制内容"),
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
@ -2633,6 +2638,8 @@ public class MesPcnEnumUtil {
FORM("form", "文本按钮"),
SPEC_TEXT("spec_text", "工步弹框文本"),
IMAGE_LIST("image_list", "图片列表"),
MODULE_HEAD("module_head", "展示组件头部"),
MODULE_GUIDE("module_guide", "展示组件知道内容"),
SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"),
BACKGROUND_COLOR_TEXT("BACKGROUND_COLOR_TEXT", "背景色文字");
@ -3542,6 +3549,36 @@ public class MesPcnEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STEP_RESULT_CMD {
JUMP_STEP(10, "JUMP_STEP", "跳过工步"),
REDO_PROCESS(20, "REDO_PROCESS", "重做工序"),
JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"),
NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成");
private int value;
private String code;
private String description;
STEP_RESULT_CMD(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
/**
* 容器使用状态
@ -4066,7 +4103,8 @@ public class MesPcnEnumUtil {
JUMP_STEP(20, "跳过工步"),
JUMP_STATE(30, "跳过状态点"),
ABNORMAL_DEDUCTION(40, "扣减异常"),
REDO_STATION(50, "工位重做");
REDO_STATION(50, "工位重做"),
RELEASE(60, "放行继续");
private int value;
private String description;
@ -4378,6 +4416,16 @@ public class MesPcnEnumUtil {
return tmp;
}
public static int codeOf(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
@ -4642,8 +4690,163 @@ public class MesPcnEnumUtil {
public int getValue() {
return value;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GET_AND_SET {
GET(10, "get"),
SET(20, "set");
private int value;
private String description;
GET_AND_SET(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PLC_BUSI_TYPE {
AGV_EMERGENCY_STOP(10, "紧急停止"),
AGV_EMERGENCY_RESET(20, "急停复位"),
AGV_DELAY_HELP(30, "延时帮助");
private int value;
private String description;
PLC_BUSI_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
}
/**
* mes设备状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQUIPMENT_STATUS {
INUSE(10, "在用"),
SPARE(20, "停止"),
FAULT(30, "故障"),
SERVICE(40, "检修"),
STOPUSING(50, "暂停");
private int value;
private String description;
MES_EQUIPMENT_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;
}
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;
}
}
/**
* JIT队列锁定池 状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum JIT_LOCK_CACHE_STATUS {
CREATE(10, "创建"),
RELEASE(20, "下达"),
ONLINE_COMPLETE(30, "上线完成");
private Integer value;
private String description;
JIT_LOCK_CACHE_STATUS(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* JIT队列锁定池 状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ASSISTANT_MODULE_DISPLAY {
MULTIMEDIA_PLUG(10, "多媒体插头"),
ATTENTION_INFO(20, "关注内容");
private Integer value;
private String description;
ASSISTANT_MODULE_DISPLAY(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -136,6 +136,63 @@ public class SwebEnumUtil {
}
/**
* PO订单来源
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_SOURCE {
WMS(10, "WMS", "WMS"),
SWEB(20, "SWEB", "SWEB");
private int value;
private String code;
private String description;
ORDER_SOURCE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(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 int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static int codeOf(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 包装类型枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@ -363,7 +363,7 @@ public class WmsEnumUtil {
public enum REC_STATUS_KANBAN {
TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"),
RECEIVING(20, "RECEIVING", "收货中"),
DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"),
DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟"),
COMPLETED(40, "COMPLETED", "已完成");
private int value;
@ -856,7 +856,9 @@ public class WmsEnumUtil {
INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"),
CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"),
MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"),
PROD_SCRAP(680, "PROD_SCRAP", "生产报废");
PROD_SCRAP(680, "PROD_SCRAP", "生产报废"),
OUT_RETURN_SOURCING(690, "PROD_SCRAP", "委外返工发料");
private int value;
private String code;
private String description;
@ -1776,6 +1778,7 @@ public class WmsEnumUtil {
public enum QC_STATUS {
INSPECTION_FREE(10, "免检"),
PENDING_QUALITY_INSPECTION(20, "待质检"),
DELAYED_NON_QC(40, "延迟"),
QUALITY_INSPECTION_COMPLETED(30, "质检完成");
private int value;
@ -4767,7 +4770,8 @@ public class WmsEnumUtil {
LINE_PULL(30, "巡线拉动"),
PLANNED_PULL(40, "计划拉动"),
ANDON_PULL(50, "安灯拉动"),
EXTERNAL_PULL(60, "手工拉动");
EXTERNAL_PULL(60, "手工拉动"),
WORKORDER_PULL(70, "工单拉动");
private int value;
private String description;
@ -6245,19 +6249,21 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WEEK_TYPE {
MONDAY(20, "星期一"),
TUESDAY(30, "星期二"),
WEDNESDAY(40, "星期三"),
THURSDAY(50, "星期四"),
FRIDAY(60, "星期五"),
SATURDAY(70, "星期六"),
SUNDAY(10, "星期日");
MONDAY(20, 1, "星期一"),
TUESDAY(30, 2, "星期二"),
WEDNESDAY(40, 3, "星期三"),
THURSDAY(50, 4, "星期四"),
FRIDAY(60, 5, "星期五"),
SATURDAY(70, 6, "星期六"),
SUNDAY(10, 0, "星期日");
private final int value;
private final int code;
private final String description;
WEEK_TYPE(int value, String description) {
WEEK_TYPE(int value, int code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -6265,6 +6271,10 @@ public class WmsEnumUtil {
return value;
}
public int getCode() {
return code;
}
public String getDescription() {
return description;
}
@ -6287,6 +6297,15 @@ public class WmsEnumUtil {
}
return tmp;
}
public static int getValByCode(int code) {
for (int i = 0; i < values().length; i++) {
if (values()[i].code == code) {
return values()[i].value;
}
}
return 0;
}
}
/**
@ -8853,6 +8872,52 @@ public class WmsEnumUtil {
}
/**
* 收货看板状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RC_BOARD_STATUS {
FINISH(10, "已完成(绿色)"),
OVER_TIME(20, "已超时（红色）"),
UNRECEIVED(30, "未收货（蓝色）"),
VARIANT(40, "有差异（黄色）");
private int value;
private String description;
RC_BOARD_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static RC_BOARD_STATUS codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
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;
}
}
/**
* 循环规则
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -8960,4 +9025,50 @@ public class WmsEnumUtil {
return null;
}
}
/**
* 成品条码状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCT_STATUS {
NORMAL(10, "正常"),
REPAIRE(20, "返工"),
SCRAP(30, "报废");
private int value;
private String description;
PRODUCT_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static PRODUCT_STATUS codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
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;
}
}
}

12
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -48,6 +48,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
private SnowflakeIdMaker snowflakeIdMaker;
/* 默认查询数据条数 */
private static final Pager DEFAULT_PAGER = new Pager(10,10);
private static final Pager GETBYPROPERTY_PAGER = new Pager(1,1);
public BaseRepositoryImpl(Class<T> clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) {
super(clz, em);
@ -61,6 +62,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
public void detachObject(T t){
if (t == null) {
return;
}
entityManager.detach(t);
}
@ -509,7 +513,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public T getByProperty(DdlPackBean packBean) {
try {
List<T> list = findByHqlWherePage(packBean,DEFAULT_PAGER);
List<T> list = findByHqlWherePage(packBean,GETBYPROPERTY_PAGER);
return list != null && list.size() != 0 ? list.get(0) : null;
}catch(NoResultException ne){
LOGGER.error("数据不存在，DdlPackBean：{}",packBean);
@ -522,17 +526,17 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public T getByProperty(String propertyName, Object value) {
return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER);
return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, GETBYPROPERTY_PAGER);
}
@Override
public T getByProperty(String[] propertyNames, Object[] values) {
return getByPropertyPager(propertyNames, values, DEFAULT_PAGER);
return getByPropertyPager(propertyNames, values, GETBYPROPERTY_PAGER);
}
@Override
public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) {
pager = pager == null ? DEFAULT_PAGER: pager;
pager = pager == null ? GETBYPROPERTY_PAGER: pager;
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);

23
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.base.util;
import com.google.common.collect.Lists;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.cglib.beans.BeanGenerator;
import org.springframework.cglib.beans.BeanMap;
@ -24,6 +25,7 @@ public class BeanMapUtils {
return map;
}
/**
* 将map集合中的数据转化为指定对象的同名属性中
*/
@ -37,6 +39,7 @@ public class BeanMapUtils {
/**
* 键值对转换为对象
*
* @param mapList
* @return
*/
@ -61,4 +64,24 @@ public class BeanMapUtils {
return null;
}
}
/**
* 将List<obj>转换为List<Map<String,Object>>
* @param objList
* @param <T>
* @return
*/
public static <T> List<Map<String, Object>> objectsToMaps(List<T> objList) {
List<Map<String, Object>> list = Lists.newArrayList();
if (objList != null && objList.size() > 0) {
Map<String, Object> map = null;
T bean = null;
for (int i = 0, size = objList.size(); i < size; i++) {
bean = objList.get(i);
map = beanToMap(bean);
list.add(map);
}
}
return list;
}
}

47
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java
Unescape Escape View File

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.mes.pcn.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.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :配置表
* @Reference :
* @Author : crish
* @CreateDate : 2019-06-04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_STATUS")
@Api("工位运行状态")
public class MesWorkCellStatus extends BaseBean implements Serializable {
private static final long serialVersionUID = 102975351699481524L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "TIME_OUT_STATUS")
@ApiParam("超时状态")
private Integer timeOutStatus;
}

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellStatus;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\15 11:21
* @Modify:
**/
@Repository
public interface MesWorkCellStatusRepository extends BaseRepository<MesWorkCellStatus, Long> {
}

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

@ -65,7 +65,7 @@ public class IfDefectData extends BaseBean implements Serializable {
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private Integer defectActionType;
private String defectActionType;
@Column(name = "QTY")
@ApiParam("数量")

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

@ -131,4 +131,16 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name = "QC_STATUS")
@ApiParam("质量状态")
private Integer qcStatus = 10;
@Column(name = "JIS_BACKFLUSH_STATUS")
@ApiParam("回冲状态")
private String jisBackflushStatus;
}

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

@ -93,7 +93,6 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
@Lob
private String errorMessage;
@Column(name = "ACTION_CODE")
@ -143,4 +142,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@Column(name = "DOCK_NO")
@ApiParam("道口")
private String dockNo;
@Column(name = "VERSION")
@ApiParam("版本号")
private String version;
}

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

@ -72,6 +72,10 @@ public class MesCellFeed extends BaseBean implements Serializable {
@ApiParam("供应商代码")
private String supplierCode;
@Column(name = "RACK_NO")
@ApiParam("料箱编号")
private String rackNo;
@Transient
@ApiParam(value = "原料类型名称")
private String rawTypeName;

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

@ -71,6 +71,10 @@ public class MesCellFeedRecord extends BaseBean implements Serializable {
@ApiParam("供应商代码")
private String supplierCode;
@Column(name = "RACK_NO")
@ApiParam("料箱编号")
private String rackNo;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}

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

@ -40,4 +40,24 @@ public class MesContainer extends BaseBean {
@Column(name = "USE_STATUS")
@ApiParam(value = "使用状态")
private String useStatus;
@Column(name = "IP_ADDRESS")
@ApiParam(value = "IP")
private String ipAddress;
@Column(name = "PORT")
@ApiParam(value = "端口")
private String port;
@Column(name = "UNLOCK_DO")
@ApiParam(value = "接收DO")
private String unlockDo;
@Column(name = "RED_LIGHT_DO")
@ApiParam(value = "红灯DO")
private String redLightDo;
@Column(name = "TIME_SECOND")
@ApiParam(value = "处理时间(秒)")
private String timeSecond;
}

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

@ -82,7 +82,11 @@ public class MesDefectRecord extends BaseBean implements Serializable {
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private Integer defectActionType;
private String defectActionType;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Transient
private List<MesDefect> mesDefectList;

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

@ -0,0 +1,98 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :设备运行履历表
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQUIPMENT_TRAVEL")
@Api("设备运行履历表")
public class MesEquipmentTravel extends BaseBean implements Serializable {
private static final long serialVersionUID = -419342647505833190L;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Column(name = "EQUIPMENT_NAME")
@ApiParam("设备名称")
private String equipmentName;
@Column(name = "STATUS")
@ApiParam("设备状态")
private Integer status;
@Column(name = "EQUIPMENT_TYPE")
@ApiParam("设备类型")
private Integer equipmentType;
@Column(name = "EQUIPMENT_CATEGORY")
@ApiParam("设备类别")
private String equipmentCategory;
@Column(name = "EQUIPMENT_MODEL")
@ApiParam("型号")
private String equipmentModel;
@Column(name = "EQUIPMENT_SPEC")
@ApiParam("规格")
private String equipmentSpec;
@Column(name = "EQUIPMENT_MAKER")
@ApiParam("制造商")
private String equipmentMaker;
@Column(name = "RELEASE_DATE")
@ApiParam("出厂日期")
private String releaseDate;
@Column(name = "RECEIVE_DATE")
@ApiParam("接收日期")
private String receiveDate;
@Column(name = "ENABLE_DATE")
@ApiParam("启用日期")
private String enableDate;
@Column(name = "CONNECT_TYPE")
@ApiParam("连接类型")
private Integer connectType;
@Column(name = "CHECK_MODEL")
@ApiParam("作业校验模式")
private Integer checkModel;
@Column(name = "STATUS_START_TIME")
@ApiParam("状态开始时间")
private String statusStartTime;
@Column(name = "STATUS_END_TIME")
@ApiParam("状态结束时间")
private String statusEndTime;
}

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

@ -0,0 +1,61 @@
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.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :MES_库位信息
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_LOCATION")
@Api("MES_库位信息")
public class MesLocation extends BaseBean implements Serializable {
private static final long serialVersionUID = -896118285166769048L;
@Column(name = "LOCATION_CODE")
@ApiParam("库位代码")
private String locationCode;
@Column(name = "LOCATION_NAME")
@ApiParam("库位名称")
private String locationName;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty = 0d;
@Column(name = "MAX_QTY")
@ApiParam("最大存储量")
private Integer maxQty = 0;
@Transient
@ApiParam("物料名称")
private String partNameRdd;
}

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

@ -0,0 +1,35 @@
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 org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "MES_LOG")
@Api("MES_日志表")
public class MesLog extends BaseBean implements Serializable {
private static final long serialVersionUID = 4089347882308864216L;
@Column(name = "METHOD_NAME")
@ApiParam(value = "方法名")
private String methodName;
@Column(name = "LOG")
@ApiParam(value = "日志")
private String log;
@Column(name = "RESULT")
@ApiParam(value = "更新结果")
private String result;
}

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

@ -76,7 +76,7 @@ public class MesPackage extends BaseBean implements Serializable {
@Column(name = "PACK_LEVEL")
@ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层")
private Integer packLevel;
private Integer packLevel = 1;
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
@ -132,6 +132,14 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("包装二维码")
private String qrCode;
@Column(name = "LOCATION_CODE")
@ApiParam("库位代码")
private String locationCode;
@Transient
@ApiParam("目标库位代码")
private String destLocationCode;
public MesPackage() {
}

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

@ -58,5 +58,10 @@ public class MesPackageDetail extends BaseBean implements Serializable {
@ApiParam("包装编码4")
private String packageNo4;
@Transient
@ApiParam("批次")
private String lotNo;
}

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

@ -36,7 +36,11 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
@Column(name = "MIN_CAPACITY")
@ApiParam("最小库存")
private Integer minCapacity;
private Integer minCapacity = 0;
@Column(name = "MAX_CAPACITY")
@ApiParam("最大库存")
private Integer maxCapacity = 0;
@Column(name = "TOTAL_CAPACITY")
@ApiParam("总容量")
@ -57,4 +61,8 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
@Column(name = "TOTAL_PLAN_QTY")
@ApiParam("JSP总数")
private Integer totalPlanQty;
@Column(name = "PROD_CFG_CODE")
@ApiParam("配置代码")
private String prodCfgCode;
}

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

@ -88,7 +88,7 @@ public class MesPlc extends BaseBean implements Serializable {
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
private String busiType;
private Integer busiType;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")

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

@ -37,4 +37,12 @@ public class MesProdCfgType extends BaseBean implements Serializable {
@Column(name = "PROD_CFG_TYPE_NAME")
@ApiParam("项目名称")
private String prodCfgTypeName;
@Column(name = "PCT_VERSION")
@ApiParam("项目版本")
private String pctVersion;
@Column(name = "DWG_VERSION")
@ApiParam("图纸版本")
private String dwgVersion;
}

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

@ -44,9 +44,9 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
@ApiParam("是否默认")
private Integer isDefault;
@Column(name = "PART_SN")
@ApiParam("料箱条码")
private String partSn;
@Column(name = "RACK_NO")
@ApiParam("料箱编号")
private String rackNo;
@Column(name = "TARGET_PASS_RATE")
@ApiParam("目标合格率")
@ -55,4 +55,8 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
@Column(name = "PRIORITY_ORDER")
@ApiParam("优先级顺序")
private Integer priorityOder = 0;
@ApiParam("物料名称")
private String partName;
}

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

@ -41,4 +41,8 @@ public class MesProduceCategory extends BaseBean implements Serializable {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "PRODUCE_CTGY_DESC")
@ApiParam("产品类型描述")
private String produceCategoryDesc;
}

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

@ -148,6 +148,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("生产批次")
private String lotNo;
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private String defectActionType;
@Column(name = "VIN_CODE")
@ApiParam("Vin")
private String vinCode;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")

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

@ -126,6 +126,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
@ApiParam("托盘号")
private String trayNo;
@Column(name = "VIN_CODE")
@ApiParam("Vin")
private String vinCode;
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;

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

@ -86,6 +86,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
@ApiParam("JIT排序号")
private String jitSeq;
@Column(name = "JIA_SEQ")
@ApiParam("JIA排序号")
private String jiaSeq;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.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.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -61,4 +62,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable {
@Column(name = "OPTION_TYPE")
@ApiParam("选配类型")
private Integer optionType;
@Transient
@ApiParam("物料类型3")
private String categoryCode3;
}

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

@ -120,6 +120,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("料架摆放位置")
private String groupSide;
@Column(name = "GROUP_SEQ")
@ApiParam("分组序号")
private String groupSeq;
@Transient
@ApiParam("Vin")
private String vinCode;
@ -180,6 +184,14 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("产品条码")
private String productSn;
@Transient
@ApiParam("队列类型")
private Integer queueType;
@Transient
@ApiParam("等级名称")
private String gradeName;
public double getQueueSeqVal() {
return this.queueSeq == null ? 0.0d : this.queueSeq;
}
@ -207,7 +219,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode,
Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,
String gradeCode,String assyNo,Integer queueType) {
this.orderNo = orderNo;
this.vinCode = vinCode;
this.partNo = partNo;
@ -224,5 +237,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
this.produceColor = produceColor;
this.gradeCode = gradeCode;
this.assyNo = assyNo;
this.queueType = queueType;
}
}

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

@ -85,4 +85,8 @@ public class MesScatterBomCfg extends BaseBean implements Serializable {
@Column(name = "RECIPE_SEQ")
@ApiParam("配方序号")
private String recipeSeq;
@Column(name = "CHANGE_NO")
@ApiParam("change No")
private String changeNo;
}

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

@ -173,4 +173,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
@Column(name = "IS_CHECK")
@ApiParam("是否复核校验")
private Integer isCheck;
@Column(name = "PICK_QTY")
@ApiParam("拣货数量")
private Integer pickQty;
}

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

@ -51,6 +51,10 @@ public class MesStep extends BaseBean implements Serializable {
@ApiParam("工步对象")
private String stepObject;
@Column(name = "TRIGGER_TYPE")
@ApiParam("触发类型")
private Integer triggerType;
/**
* 工位扫描业务所需使用字段
*/

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

@ -69,6 +69,10 @@ public class MesStepParam extends BaseBean implements Serializable {
@ApiParam("type")
private Integer type = 0;
@Column(name = "OBJECT_WHERE")
@ApiParam("参数对象查询条件")
private String objectWhere;
@Transient
@ApiParam("可选值的数据")
private List<Map<String, Object>> enumList;

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

@ -0,0 +1,50 @@
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.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/21 1:45 PM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WC_CURRENT_STATUS")
@Api("工位实时状态表")
public class MesWcCurrentStatus extends BaseBean implements Serializable {
private static final long serialVersionUID = -4224360275760211780L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "VIN_CODE")
@ApiParam("当前VIN号")
private String vinCode;
@Column(name = "LAST_VIN_CODE")
@ApiParam("上一VIN号")
private String lastVinCode;
}

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

@ -67,7 +67,7 @@ public class MesWorkCell extends BaseBean implements Serializable {
private String workCellPort;
@Column(name = "GRADE")
@ApiParam("工作等级")
@ApiParam("工位等级")
private Integer grade;
@Column(name = "TARGET_PASS_RATE")

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

@ -48,7 +48,7 @@ public class MesWorkCellDefect extends BaseBean implements Serializable {
private String partAssemble;
@Column(name = "AREA_CODE")
@ApiParam("物料集")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "DEFECT_TYPE")

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

@ -0,0 +1,47 @@
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.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :配置表
* @Reference :
* @Author : crish
* @CreateDate : 2019-06-04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_STATUS")
@Api("工位运行状态")
public class MesWorkCellStatus extends BaseBean implements Serializable {
private static final long serialVersionUID = 102975351699481524L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "TIME_OUT_STATUS")
@ApiParam("超时状态")
private Integer timeOutStatus;
}

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

@ -298,6 +298,54 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("客户物料号")
private String customerPartNo;
@Transient
@ApiParam("客户物料名称")
private String customerPartName;
@Transient
@ApiParam("客户物料颜色")
private String customerPartColor;
@Transient
@ApiParam("项目名称")
private String prodCfgTypeName;
@Transient
@ApiParam("颜色代码")
private String colorCode;
@Transient
@ApiParam("挂架数")
private Integer shelvesAmount;
@Transient
@ApiParam("供漆罐代码")
private String paintTankCode;
@Transient
@ApiParam("计划报表标识")
private String reportFormCode;
@Transient
@ApiParam("一检数量")
private Integer firstInspectionQty;
@Transient
@ApiParam("二检数量")
private Integer secondInspectionQty;
@Transient
@ApiParam("子零件")
private String itemPartNo;
@Transient
@ApiParam(value = "子零件数量", example = "0")
private Double itemQty = 0d;
@Transient
@ApiParam(value = "子零件总数", example = "0")
private Double itemQtyCount = 0d;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -330,4 +378,17 @@ public class MesWorkOrder extends BaseBean implements Serializable {
return this.approvalStatus == null ? 0 : this.approvalStatus;
}
public MesWorkOrder(){}
public MesWorkOrder(String orderNo,String startTime,String workCenterCode,Double qty,
String partNo,String partNameRdd,String itemPartNo,Double itemQty){
this.orderNo = orderNo;
this.startTime = startTime;
this.workCenterCode = workCenterCode;
this.qty = qty;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.itemPartNo = itemPartNo;
this.itemQty = itemQty;
}
}

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

@ -10,7 +10,8 @@ public class MesInterfaceEnumUtil {
WMS2SAP(20, "WMS2SAP", "WMS --> SAP"),
MES2WMS(30, "MES2WMS", "MES --> WMS"),
WMS2MES(40, "WMS2MES", "WMS --> MES"),
MES2SAP(50, "MES2SAP", "MES --> SAP");
MES2SAP(50, "MES2SAP", "MES --> SAP"),
SAP2MES(60, "SAP2MES", "SAP --> MES");
private int value;
private String name;

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

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("海纳川数据复核model")
public class HncDataReviewModel {
@ApiParam("关键件")
private String itemPartNo;
@ApiParam("关键件名称")
private String itemPartName;
@ApiParam("需要数量")
private String needNum;
@ApiParam("实际数量")
private String realNum;
@ApiParam("对象代码")
private String objectCode;
@ApiParam("是否合格标识")
private Integer reviewFlag;
@ApiParam("是否合格")
private String reviewResult;
@ApiParam("关键件颜色")
private String keyPartColor;
@ApiParam("生产数据颜色")
private String prodDataColor;
}

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

@ -0,0 +1,41 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @author wangjie
* @date 2020/4/9 18:00
* @desc TJ注塑上料展示组件顶部数据集合model
*/
@Data
public class InjectionFeedingDetailModel {
@ApiParam("是否选中：1=是，2=否")
private Integer isCheck = 2;
@ApiParam("机台编号")
private String workCenterCode;
@ApiParam("机台名称")
private String workCenterName;
@ApiParam("工单号")
private String workOrderNo;
@ApiParam("工单状态")
private Integer workOrderStatus;
@ApiParam("工单状态名称")
private String workOrderStatusName;
@ApiParam("工单计划数量")
private String qty;
@ApiParam("颜色")
private String color;
@ApiParam("错误信息")
private String error;
}

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

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author wangjie
* @date 2020/4/9 18:00
* @desc TJ注塑上料展示组件顶部数据model
*/
@Data
public class InjectionFeedingModel {
@ApiParam("料箱")
private String rackNo;
@ApiParam("原材料物料号")
private String partNo;
@ApiParam("是否锁定：1=是，2=否")
private Integer lockFlag;
@ApiParam("机台工单集合")
private List<InjectionFeedingDetailModel> detailModelList = new ArrayList<>();
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("组织代码")
private String organizeCode;
}

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

@ -45,6 +45,12 @@ public class InjectionProductionControlModel {
@ApiParam("箱条码状态")
private String printStatusName;
@ApiParam("缺陷代码")
private String defectCode;
@ApiParam("缺陷名称")
private String defectName;
@ApiParam("序号")
private Integer index;

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

@ -1,22 +1,11 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
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 java.util.List;
/**
* @Description : 设备任务通知人员model
@ -34,23 +23,18 @@ public class NotifyUserModel extends BaseBean {
@ApiParam(value ="账户ID")
private Long userInfoId;
@Column(name="USER_NAME_RDD")
@ApiParam(value ="用户名称" , access ="账号名称")
private String userName;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="登陆名称" , access ="登陆名称")
private String userLoginName;
@Column(name="USER_EMAIL")
@ApiParam(value ="邮箱" , access ="邮箱")
private String userEmail;
@Column(name="USER_PHONE")
@ApiParam(value ="手机号" , access ="手机号")
private String userPhone;
@Column(name="USER_STATUS")
@ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
private Integer userStatus;

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

@ -32,6 +32,10 @@ public class PlcEquStatusModel implements Serializable {
@ApiParam("产线状态")
private Integer workCenterStatus;
// 电检设备切换密码
@ApiParam("电检设备切换密码")
private String equChoosePassWard;
@ApiParam("停机类型")
private Integer stopType;

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

@ -69,6 +69,9 @@ public class ProdPackModel implements Serializable {
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("是否封箱名称")
private String isSealedName;
public ProdPackModel() {
}

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

@ -75,6 +75,12 @@ public class ProductBiModel {
@ApiParam("总页数")
private Integer totalPage;
@ApiParam("开启工单标识")
private Integer opWoFlag = 2;
@ApiParam("工位序号")
private Integer workCellSeq;
@ApiParam("x坐标内容")
private List<String> xAxis;

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

@ -84,6 +84,9 @@ public class ProductInfoManageModel {
@ApiParam("主队列编号")
private String orderNo;
@ApiParam("校验VIN")
private String checkVinCode;
@ApiParam("总队列类型")
private List<Integer> queueTypeList;

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

@ -91,6 +91,15 @@ public class QueueOrderModel implements Serializable {
@ApiParam("产品位置")
private String produceCategoryCode;
@ApiParam("项目代码")
private String prodCfgTypeCode;
@ApiParam("配方内容")
private String formulaContent;
@ApiParam("分组序号")
private String groupSeq;
public QueueOrderModel() {
}
@ -174,7 +183,9 @@ public class QueueOrderModel implements Serializable {
this.orderNo = orderNo;
}
public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) {
// getPrintSnQueueOrderModel
public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo,
String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber) {
this.id = id;
this.queDetailSeq = queDetailSeq;
this.pgCode = pgCode;
@ -183,6 +194,13 @@ public class QueueOrderModel implements Serializable {
this.prodCfgCode = prodCfgCode;
this.isGroupPrinted = isGroupPrinted;
this.jitActualNo = jitActualNo;
this.prodCfgTypeCode = prodCfgTypeCode;
this.produceCategoryCode = produceCategoryCode;
this.qty = qty;
this.vinCode = vinCode;
this.queueSeq = queueSeq;
this.groupSeq = groupSeq;
this.serialNumber = serialNumber;
}
public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
@ -203,7 +221,30 @@ public class QueueOrderModel implements Serializable {
//getWaitQueueOrderModelNoSn
public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) {
String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String queueGroupNo, Integer groupNo) {
this.serialNumber = serialNumber;
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workType = workType;
this.finsihQty = finsihQty;
this.qty = qty;
this.orderNo = orderNo;
this.pptCode = pptCode;
this.produceCategoryCode = produceCategoryCode;
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
}
//getWaitQueueOrderModelNoSnMgn
public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode,
String vinCode, String formulaContent, String queueGroupNo) {
this.serialNumber = serialNumber;
this.id = id;
this.queueSeq = queueSeq;
@ -219,6 +260,30 @@ public class QueueOrderModel implements Serializable {
this.orderNo = orderNo;
this.pptCode = pptCode;
this.produceCategoryCode = produceCategoryCode;
this.prodCfgTypeCode = prodCfgTypeCode;
this.vinCode = vinCode;
this.formulaContent = formulaContent;
this.queueGroupNo = queueGroupNo;
}
//getAlreadyQueueOrderModelNoSnMgn
public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workType = workType;
this.orderNo = orderNo;
this.serialNumber = serialNumber;
this.prodCfgTypeCode = prodCfgTypeCode;
this.vinCode = vinCode;
this.formulaContent = formulaContent;
this.queueGroupNo = queueGroupNo;
}
//getAlreadyQueueOrderModelNoSn

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

@ -27,9 +27,12 @@ public class StationRequestBean implements Serializable {
@ApiParam("扫描信息")
private String scanInfo;
@ApiParam("产品条码")
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("产品条码")
private String productSn;
@ApiParam("物料号")
private String partNo;
@ -131,6 +134,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("当前流程状态")
private MesStateMachineStatus curFsmState;
@ApiParam("是否重选进入")
private boolean isReselect;
@JsonIgnore
@ApiParam("展示组件")
private Object moduleService;

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

@ -82,11 +82,15 @@ public class StepModel implements Serializable {
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("触发类型")
private Integer triggerType;
public StepModel() {
}
public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) {
String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName,
String workCellCode, Integer triggerType) {
this.stepCode = stepCode;
this.stepName = stepName;
this.stepText = stepText;
@ -98,5 +102,6 @@ public class StepModel implements Serializable {
this.paramCode = paramCode;
this.stepDisplayName = stepDisplayName;
this.workCellCode = workCellCode;
this.triggerType = triggerType;
}
}

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

@ -92,14 +92,28 @@ public class StepPrintSnModel extends MesProduceSn {
private String vinCode;
@ApiParam("客户JIT生产队列排序号")
private Double seq;
@ApiParam("jit车号")
private String jitCarNo;
@ApiParam("JIA排序号")
private String jiaSeq;
@ApiParam("JIP排序号")
private String jipSeq;
@ApiParam("车型代码")
private String carModuleCode;
@ApiParam("上一个序列号")
private String lastQueDetailSeq;
private String lastSeq;
@ApiParam("第一个序列号")
private String firstSeq;
@ApiParam("序列架号")
private String serialFrameNum;
@ApiParam("DOCK")
private String dock;
@ApiParam("包装数量")
private Integer pgCodeNum;
private Integer pgNum;
@ApiParam("数量")
private Integer num;
@ApiParam("客户工厂代码")
private String custPlantCode;
@ApiParam("产品类型描述")
private String produceCategoryDesc;
@ApiParam("批次")
private String lotNo;
@ -108,4 +122,21 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("产品配置名称")
private String prodCfgCodeName;
@ApiParam("项目代码")
private String prodCfgTypeCode;
@ApiParam("产品位置")
private String produceCategoryCode;
@ApiParam("结果")
private String result;
@ApiParam("项目版本")
private String pctVersion;
@ApiParam("图纸版本")
private String dwgVersion;
@ApiParam("班次名称")
private String shiftName;
@ApiParam("JIT排序号")
private String jitSeq;
@ApiParam("产品位置名称")
private String produceCategoryName;
}

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

@ -23,6 +23,8 @@ public class StepResult<T> {
private StationRequestBean stationRequestBean;
private MesPcnEnumUtil.STEP_RESULT_CMD cmd;
public static StepResult getNonComplete() {
return new StepResult(false, "");
}
@ -69,6 +71,10 @@ public class StepResult<T> {
return new StepResult(true, msg);
}
public static StepResult getSuccessComplete(MesPcnEnumUtil.STEP_RESULT_CMD cmd) {
return new StepResult(true, cmd);
}
public static StepResult getSuccessComplete() {
return new StepResult(true, "");
}
@ -101,6 +107,11 @@ public class StepResult<T> {
this.msg = msg;
}
private StepResult(boolean isCompleted, MesPcnEnumUtil.STEP_RESULT_CMD cmd) {
this.isCompleted = isCompleted;
this.cmd = cmd;
}
public StepResult(boolean isCompleted, StationRequestBean stationRequestBean) {
this.isCompleted = isCompleted;

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

@ -6,6 +6,12 @@ import lombok.Data;
@Data
public class TorqueReviewModel {
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作单元代码")
private String workCellCode;
@ -21,4 +27,10 @@ public class TorqueReviewModel {
@ApiParam("显示颜色")
private String showColor;
@ApiParam("是否大枪")
private Integer isPf;
@ApiParam("对象代码")
private String objectCode;
}

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

@ -36,4 +36,7 @@ public class Head implements Serializable {
@XStreamAlias("status")
private String status;
@XStreamAlias("vehicleName")
private String vehicleName;
}

6
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java
Unescape Escape View File

@ -19,6 +19,9 @@ public class Part implements Serializable {
@XStreamAlias("item")
private String item;
@XStreamAlias("componentGroup")
private String componentGroup;
@XStreamAlias("dock")
private String dock;
@ -26,7 +29,7 @@ public class Part implements Serializable {
private String qty;
@ApiParam("是否是baseModule")
private boolean isBaseModule;
private Integer isBaseModule;
@ApiParam("前左数量")
private String flQty;
@ -49,7 +52,6 @@ public class Part implements Serializable {
@ApiParam("配方顺序")
private String recipeSeq;
@ApiParam("Mes物料号")
private String partNo;

1
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java
Unescape Escape View File

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**

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

@ -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.MesEquipmentTravel;
import org.springframework.stereotype.Repository;
/**
* @Description :设备运行履历
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesEquipmentTravelRepository extends BaseRepository<MesEquipmentTravel, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.IfProductOffLine;
import cn.estsh.i3plus.pojo.mes.bean.MesLocation;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\18 10:32
* @Modify:
**/
public interface MesLocationRepository extends BaseRepository<MesLocation, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesLog;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\18 10:34
* @Modify:
**/
public interface MesLogRepository extends BaseRepository<MesLog, Long> {
}

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.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.MesWcCurrentStatus;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/23 7:30 PM
* @Description:
**/
public interface MesWcCurrentStatusRepository extends BaseRepository<MesWcCurrentStatus, Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellStatus;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\15 11:21
* @Modify:
**/
@Repository
public interface MesWorkCellStatusRepository extends BaseRepository<MesWorkCellStatus, Long> {
}

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

@ -205,6 +205,7 @@ public class MesHqlPack {
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
DdlPreparedPack.getOrderDefault(mesWorkOrder);
return packBean;
}
@ -282,7 +283,10 @@ public class MesHqlPack {
public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode);
if (!StringUtils.isEmpty(mesArea.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean);
DdlPreparedPack.getStringLikerPack(mesArea.getAreaCode(), "areaCode", packBean);
}
if (!StringUtils.isEmpty(mesArea.getAreaName())) {
DdlPreparedPack.getStringLikerPack(mesArea.getAreaName(), "areaName", packBean);
}
return packBean;
@ -325,6 +329,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
}
if (!StringUtils.isEmpty(mesWorkCell.getWorkCellName())) {
DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellName(), "workCellName", packBean);
}
return packBean;
}
@ -1198,7 +1205,10 @@ public class MesHqlPack {
public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode);
if (!StringUtils.isEmpty(workCellPoint.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringLikerPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean);
}
if (!StringUtils.isEmpty(workCellPoint.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(workCellPoint.getWorkCenterCode(), "workCenterCode", packBean);
}
return packBean;
}
@ -1898,7 +1908,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
}
if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) {
DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean);
DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "templateName", packBean);
}
return packBean;
}
@ -1999,6 +2009,9 @@ public class MesHqlPack {
if (mesProduceSn.getQcStatus() != null) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
}
if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
}
@ -2193,6 +2206,9 @@ public class MesHqlPack {
if (mesProduceSnTravel.getQcStatus() != null) {
DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getVinCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getVinCode(), "vinCode", packBean);
}
if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) {
DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
}
@ -3155,6 +3171,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) {
DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean);
}
if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
}

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

@ -221,6 +221,7 @@ public class MesPcnHqlPack {
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
return packBean;
}
@ -630,9 +631,6 @@ public class MesPcnHqlPack {
if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
}
if (!CollectionUtils.isEmpty(mesWorkOrder.getCustList())) {
DdlPreparedPack.getInPackList(mesWorkOrder.getCustList(), "custCode", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
}
@ -667,4 +665,25 @@ public class MesPcnHqlPack {
return packBean;
}
/**
* 产品工作中心配置
*
* @param prodWorkCenter
* @param organizeCode
* @return
*/
public static DdlPackBean getMesProdWorkCenter(MesProdWorkCenter prodWorkCenter, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(prodWorkCenter, organizeCode);
if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) {
DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean);
}
if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
}
return packBean;
}
}

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

@ -170,7 +170,7 @@ public class TorqueCollectionModel implements Serializable {
public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo,
String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq,
Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount,
String pokeYokeFix) {
String pokeYokeFix, String pokeYokeLength) {
this.vinCode = vinCode;
this.prodCfgTypeCode = prodCfgTypeCode;
this.gradeCode = gradeCode;
@ -186,6 +186,7 @@ public class TorqueCollectionModel implements Serializable {
this.isPf = isPf;
this.qualifiedCount = qualifiedCount;
this.pokeYokeFix = pokeYokeFix;
this.pokeYokeLength = pokeYokeLength;
}
/**

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

@ -21,6 +21,7 @@ public class WmsJobParamModel implements Serializable {
private Integer snType;//条码类型（虚拟，实物）
private String devOpsEmail;//运维人员邮箱
private Integer minuteDiff;//处理周期(分钟)
private String whereHql;//业务查询条件HQL
public int getMinuteDiffVal() {
return this.minuteDiff == null ? 0 : this.minuteDiff.intValue();

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

@ -72,6 +72,12 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam(value = "工厂代码")
public String organizeCode;
@ApiParam(value = "是否展示删除按钮")
public Integer isShowDeleteButton;
@ApiParam(value = "跳转后端请求")
public String actionUrl;
public WmsTaskInfoModel() {
}

10
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -50,4 +51,13 @@ public class SysBarcodeRule extends BaseBean {
@ApiParam(value ="条码规则描述")
private String barcodeRuleDescription;
@Column(name = "CHECK_MODE")
@ApiParam(value ="校验模式")
@AnnoOutputColumn(refClass = CommonEnumUtil.BARCODE_CHECK_MODE.class)
private Integer checkMode;
public int getCheckModeVal() {
return checkMode == null ? CommonEnumUtil.BARCODE_CHECK_MODE.SEPARATOR_NUM.getValue() : checkMode;
}
}

69
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java
Unescape Escape View File

@ -0,0 +1,69 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-08-10 15:13
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_USER_CUSTOMIZE_CONFIG")
@ApiModel(value="用户定制化配置",description = "用户定制化配置")
public class SysUserCustomizeConfig extends BaseBean {
private static final long serialVersionUID = -3757585990009089233L;
@Column(name="USER_ID")
@ApiModelProperty(value ="用户id" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name="CUSTOMIZE_CONFIG_TYPE")
@ApiModelProperty(value ="定制化配置类型" , example = "-1")
@AnnoOutputColumn(refClass = ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.class)
private Integer customizeConfigType;
public String getCustomizeConfigTypeTxt() {
return customizeConfigType == null ? "无" : ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.valueOf(customizeConfigType);
}
@Column(name="CONFIG_KEY")
@ApiModelProperty(value ="定制化配置类型" , example = "-1")
private String configKey;
@Column(name="CONFIG_VALUE")
@ApiModelProperty(value ="配置值" , example = "-1")
private String configValue;
public String getRedisKey(String keyPrefix) {
String redisKey = this.getUserId() + ":" + this.getCustomizeConfigType() + ":" + this.getConfigKey();
if (StringUtils.isNotBlank(keyPrefix)) {
return keyPrefix + ":" + redisKey;
} else {
return redisKey;
}
}
}

33
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
Unescape Escape View File

@ -8,12 +8,6 @@ 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 org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Table;
/**
* @Description :
@ -23,115 +17,88 @@ import javax.persistence.Table;
* @Modify:
**/
@Data
@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_CONSOLE")
@Api(value="系统异常表",description = "记录系统出现的异常")
public class SysLogConsole extends BaseBean {
private static final long serialVersionUID = -6073378683575266830L;
/******** 服务器信息 ********/
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品名称")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="LOG_HOST")
@ApiParam(value ="服务器IP")
private String logHost;
@Column(name="LOG_PID")
@ApiParam(value ="应用PID")
@JsonSerialize(using = ToStringSerializer.class)
private Long logPid;
@Column(name="LOG_PORT")
@ApiParam(value ="应用端口")
private Integer logPort;
@Column(name="LOG_GROUP")
@ApiParam(value ="日志分组(日志记录器名称，getLogger方法的参数值)")
private String logGroup;
@Column(name="LOG_LEVEL")
@ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)")
private String logLevel;
@Column(name="LOG_TYPE")
@ApiParam(value ="操作类型(post,put,get)")
private String logType;
/******** 用户信息 ********/
@Column(name="USER_HOST")
@ApiParam(value ="用户登录IP")
private String userHost;
@Column(name="USER_BROWSER")
@ApiParam(value ="用户登录浏览器")
private String userBrowser;
@Column(name="USER_OS")
@ApiParam(value ="用户登录操作系统")
private String userOs;
@Column(name="USER_ID")
@ApiParam(value ="账号ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="用户登录名称")
private String userLoginName;
/******** 日志信息 ********/
@Column(name="REQUEST_ID")
@ApiParam(value ="请求ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long requestId;
@Column(name="EXECUTE_THREAD_ID")
@ApiParam(value ="执行线程")
private String executeThreadId;
@Column(name="EXECUTE_CLASS_NAME")
@ApiParam(value ="执行Class")
private String executeClassName;
@Column(name="EXECUTE_METHOD")
@ApiParam(value ="执行方法")
private String executeMethod;
@Column(name="EXECUTE_LINE_NUMBER")
@ApiParam(value ="报错行数")
private Integer executeLineNumber;
@Column(name="EXECUTE_TITLE")
@ApiParam(value ="方法标题")
private String executeTitle;
@Column(name="EXECUTE_ARGS")
@ApiParam(value ="执行参数")
private String executeArgs;
@Column(name="EXECUTE_TIME")
@ApiParam(value ="执行耗时")
private Integer executeTime;
@Column(name="EXECUTE_STATUS")
@ApiParam(value ="执行状态")
private String executeStatus;
@Column(name="EXECUTE_MESSAGE")
@ApiParam(value ="执行日志信息")
private String executeMessage;
@Column(name="ERROR_STACK_TRACE",length = 5000)
@ApiParam(value ="执行异常堆栈信息")
private String errorStackTrace;

16
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java
Unescape Escape View File

@ -7,14 +7,8 @@ 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 org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 系统异常
@ -24,18 +18,13 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_EXCEPTION")
@Api(value="系统异常表",description = "记录系统出现的异常")
public class SysLogException extends BaseBean {
private static final long serialVersionUID = -2844455884020022321L;
//CommonEnumUtil.SOFT_TYPE
@Indexed
@Column(name="SOFT_TYPE")
@ApiParam(value ="系统模块（枚举）", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
private Integer softType;
@ -43,15 +32,12 @@ public class SysLogException extends BaseBean {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="EXC_CLASS_NAME")
@ApiParam(value ="异常类名")
private String excClassName;
@Column(name="EXC_MESSAGE")
@ApiParam(value ="异常信息")
private String excMessage;
@Column(name="EXC_STACK")
@ApiParam(value ="堆栈信息")
private String excStack;
}

15
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java
Unescape Escape View File

@ -12,11 +12,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
@ -27,7 +23,6 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@ -36,8 +31,6 @@ import javax.persistence.Table;
public class SysLogOperate extends BaseBean {
private static final long serialVersionUID = 1515035521283176727L;
@Indexed
@Column(name="SOFT_TYPE")
@ApiParam(value ="系统模块（枚举）", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
private Integer softType;
@ -45,8 +38,6 @@ public class SysLogOperate extends BaseBean {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Indexed
@Column(name="OPERATE_TYPE")
@ApiParam(value ="操作类型" , example = "-1")
@AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description")
private Integer operateType;
@ -55,19 +46,15 @@ public class SysLogOperate extends BaseBean {
return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType);
}
@Column(name="OPERATE_MESSAGE")
@ApiParam(value ="操作信息" , access ="操作信息")
private String operateMessage;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="登录用户名称" , access ="登录用户名称")
private String userLoginName;
@Column(name="REMOTE_IP")
@ApiParam(value ="请求IP" , access ="请求IP")
private String remoteIp;
@Column(name="REQUEST_URL")
@ApiParam(value ="请求路径" , access ="请求路径")
private String requestUrl;
@ -75,11 +62,9 @@ public class SysLogOperate extends BaseBean {
// @ApiParam(value ="http请求方法" , access ="http请求方法")
// private String httpMethod;
@Column(name="LOG_ARGS")
@ApiParam(value ="方法入参" , access ="方法入参")
private String logArgs;
@Column(name="EXECUTE_TIME")
@ApiParam(value ="执行耗时")
@JsonSerialize(using = ToStringSerializer.class)
private Long executeTime;

27
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
Unescape Escape View File

@ -10,14 +10,8 @@ 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 org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 系统日志表
@ -27,17 +21,11 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_SYSTEM")
@Api(value="系统日志表",description = "系统日志表")
public class SysLogSystem extends BaseBean {
private static final long serialVersionUID = -2209777442410263684L;
@Indexed
@Column(name="LOG_LEVEL")
@ApiParam(value ="日志级别" , example ="1")
@AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name")
private Integer logLevel;
@ -45,8 +33,6 @@ public class SysLogSystem extends BaseBean {
return logLevel == null ? null : ImppEnumUtil.LOG_LEVEL.valueOfDescription(logLevel);
}
@Indexed
@Column(name="SOFT_TYPE")
@ApiParam(value ="系统模块（枚举）", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
private Integer softType;
@ -54,8 +40,6 @@ public class SysLogSystem extends BaseBean {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Indexed
@Column(name="LOG_MODULE_ID")
@ApiParam(value ="系统模块（枚举）", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
private Integer logModuleId;
@ -63,48 +47,37 @@ public class SysLogSystem extends BaseBean {
return logModuleId == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(logModuleId);
}
@Column(name="REMOTE_IP")
@ApiParam(value ="请求IP" , access ="请求IP")
private String remoteIp;
@Column(name="REQUEST_URL")
@ApiParam(value ="请求路径" , access ="请求路径")
private String requestUrl;
@Column(name="HTTP_METHOD")
@ApiParam(value ="http请求方法" , access ="http请求方法")
private String httpMethod;
@Column(name="LOG_CLASS")
@ApiParam(value ="触发类路径" , access ="触发类路径")
private String logClass;
@Column(name="LOG_METHOD")
@ApiParam(value ="触发方法" , access ="触发方法")
private String logMethod;
@Column(name="ARGS_COUNT")
@ApiParam(value ="入参数量" , access ="入参数量", example = "0")
private Integer argsCount;
@Column(name="LOG_ARGS")
@ApiParam(value ="方法入参" , access ="方法入参")
private String logArgs;
@Column(name="LOG_TITLE")
@ApiParam(value ="日志标题")
private String logTitle;
@Column(name="LOG_DETAIL")
@ApiParam(value ="日志详情")
private String logDetail;
@Column(name="SERVER_HOST")
@ApiParam(value ="服务器")
private String serverHost;
@Column(name="EXECUTE_TIME")
@ApiParam(value ="执行耗时")
@JsonSerialize(using = ToStringSerializer.class)
private Long executeTime;

23
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
Unescape Escape View File

@ -11,11 +11,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Table;
/**
* @Description : 定时任务执行记录
@ -25,72 +22,60 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_TASK_TIME")
@Api(value="定时任务执行日志",description = "定时任务执行记录")
public class SysLogTaskTime extends BaseBean {
private static final long serialVersionUID = -841008177433745529L;
@Column(name="SCHEDULER_INSTANCE_ID")
@ApiParam(value ="调度器实例id")
private String schedulerInstanceId;
@Column(name="SCHEDULER_SERVER_IP")
@ApiParam(value ="调度服务器ip")
private String schedulerServerIp;
@Column(name="SCHEDULER_SERVER_PORT")
@ApiParam(value ="调度服务器端口")
private Integer schedulerServerPort;
@Column(name="TASK_THREAD_ID")
@ApiParam(value ="任务线程id")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskThreadId;
@Column(name="NAME")
@ApiParam(value ="任务名称")
private String name;
@Column(name="GROUP_NAME")
@ApiParam(value ="任务组名称")
private String groupName;
@Column(name="TASK_PLAN_ID")
@ApiParam(value ="任务计划id" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskPlanId;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品名称")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="TASK_CYCLE_NAME_RDD")
@ApiParam(value ="任务周期名称")
private String taskCycleNameRdd;
@Column(name="TASK_CYCLE_EXPS_RDD")
@ApiParam(value ="任务周期表达式")
private String taskCycleExpsRdd;
@Indexed
@Column(name="EXECUTE_TIME")
@ApiParam(value ="执行耗时")
@JsonSerialize(using = ToStringSerializer.class)
private Long executeTime;
@Column(name="TASK_STATUS")
@ApiParam(value ="任务完成情况(枚举：1正常，2失败)")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
private Integer taskStatus;
@Column(name="TASK_LOG_ERROR")
public int getTaskStatusVal() {
return taskStatus == null ? CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() : taskStatus;
}
@ApiParam(value ="任务异常日志")
private String taskLogError;
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysUserCustomizeConfig;
/**
* @Description : 用户定制化配置
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-08-10 15:34
* @Modify:
**/
public interface SysUserCustomizeConfigRepository extends BaseRepository<SysUserCustomizeConfig, Long> {
}

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

@ -1149,4 +1149,24 @@ public class CoreHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(),"id",ddlPackBean);
DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean);
DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean);
DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean);
DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean);
DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean);
return ddlPackBean;
}
}

61
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java
Unescape Escape View File

@ -0,0 +1,61 @@
package cn.estsh.i3plus.pojo.ptl.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.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "PTL_LOG")
@EqualsAndHashCode(callSuper = true)
@Api("PTL_LOG")
public class PtlLog extends BaseBean implements Serializable {
private static final long serialVersionUID = 3885987217528730391L;
@Column(name = "METHOD_NAME")
@ApiParam(value = "方法名")
private String methodName;
@Column(name = "EXCEPTION_LOG")
@ApiParam(value = "异常日志")
private String exceptionLog;
@Column(name = "CONTROL_CODE")
@ApiParam(value = "控制器")
private String controlCode;
@Column(name = "IP")
@ApiParam(value = "IP")
private String ip;
@Column(name = "AREA_NO")
@ApiParam(value = "区域")
private String areaNo;
@Column(name = "SECTION_CODE")
@ApiParam(value = "区段")
private String sectionCode;
@Column(name = "TAG_NO")
@ApiParam(value = "标签地址")
private Integer tagNo;
}

16
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLogRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.IfPickData;
import cn.estsh.i3plus.pojo.ptl.bean.PtlLog;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
public interface PtlLogRepository extends BaseRepository<PtlLog, Long> {
}

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

@ -71,6 +71,10 @@ public class SwebDocMovementDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "SNP")
@ApiParam(value = "标准包装", example = "1")
private Double snp;
/**
* 是否免费:0=计费,1=免费
*/

118
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java
Unescape Escape View File

@ -0,0 +1,118 @@
package cn.estsh.i3plus.pojo.sweb.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.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-06-10
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "SWEB_PO_SN_TO_WMS")
@Api("库存移动单处理成功后的记录")
public class SwebPoSnToWms extends BaseBean {
private static final long serialVersionUID = 746409789382994374L;
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
@ApiParam("供应商编号")
@Column(name = "VENDOR_CODE")
private String vendorCode;
@ApiParam("供应商名称")
@Column(name = "VENDOR_NAME")
private String vendorName;
@Column(name = "PART_NO")
@ApiParam(value = "零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "零件名称")
private String partName;
@ApiParam("零件类型")
@Column(name = "PART_TYPE")
private Integer partType;
@ApiParam(value = "单位")
@Column(name = "UNIT")
private String unit;
@Column(name = "BOX_QTY")
@ColumnDefault("0")
@ApiParam(value = "箱数", example = "0")
private Integer boxQty;
@Column(name = "SERIAL_NO")
@ApiParam(value = "序列号")
private String serialNo;
@Column(name = "SN")
@ApiParam(value = "箱条码")
private String sn;
@Column(name = "ERP_WAREHOUSE")
@ApiParam("库存地")
private String erpWarehouse;
@Column(name = "PRODUCTION_TIME")
@ApiParam(value = "产生时间")
private String productionTime;
@Column(name = "PRINT_TIME")
@ApiParam(value = "打印时间")
private String printTime;
@Column(name = "PRINTS")
@ApiParam("打印次数")
private Integer prints;
@Column(name = "CHECK_CODE")
@ApiParam(value = "检验编号")
private String checkCode;
@Column(name = "STOVE_NO")
@ApiParam(value = "特殊批号")
private String stoveNo;
@Column(name = "BATCH_NO")
@ApiParam(value = "批次号")
private String batchNo;
@ApiParam("是否同步")
@Column(name = "IS_SYN")
private String isSyn;
@Column(name = "REC_TIME")
@ApiParam(value = "收货时间")
private String recTime;
@Column(name = "PACKAGE_NO")
@ApiParam(value = "包装编号")
private String packageNo;
@ColumnDefault("0")
@Column(name = "WEIGHT")
@ApiParam(value = "重量")
private Double weight;
}

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

@ -104,6 +104,11 @@ public class SwebPurchaseOrder extends BaseBean {
@ApiParam(value = "合同号")
private String refNo;
// SwebEnumUtil.ORDER_SOURCE
@Column(name = "ORDER_SOURCE")
@ApiParam(value = "订单来源")
private Integer orderSource;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiParam(value = "预计到货时间 开始时间")

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

@ -55,9 +55,9 @@ public class SwebPurchaseOrderDetails extends BaseBean {
@ApiParam(value = "零件名称")
private String partName;
@ApiParam(value = "订单类型", example = "1")
/*@ApiParam(value = "订单类型", example = "1")
@Column(name = "ORDER_TYPE")
public Integer orderType;
public Integer orderType;*/
@ApiParam("零件类型")
@Column(name = "PART_TYPE")
@ -105,6 +105,7 @@ public class SwebPurchaseOrderDetails extends BaseBean {
@ApiParam("库存地")
private String erpWarehouse;
// 停用
@Column(name = "REF_QTY")
@ColumnDefault("0")
@ApiParam(value = "订单数量", example = "0")

6
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java
Unescape Escape View File

@ -17,4 +17,10 @@ public class SwebMovementModel {
@ApiParam(value = "需求数量")
private Double qty;
@ApiParam("计划日期")
private String planDate;
@ApiParam("计划时间")
private String planTime;
}

22
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -11,6 +11,8 @@ import cn.estsh.i3plus.pojo.sweb.bean.*;
import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
/**
* @Description : hql 封装
* @Reference :
@ -45,15 +47,21 @@ public class SwebHqlPack {
return hqlStr;
}
public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) {
public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder, List<String> vendorNos) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) {
DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
} else {
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
}
if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
}
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(purchaseOrder, result);
}
@ -118,6 +126,8 @@ public class SwebHqlPack {
public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(swebProcurementPlanOrderDetails, result);
}
@ -136,7 +146,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
return buildHql(details, result);
}
@ -145,7 +155,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
return buildHql(details, result);
}
@ -158,7 +168,7 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
// DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
return buildHql(details, result);
}

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save