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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
crish 6 years ago
parent 16073eb7e5 8d7c77d3ed
commit 4b032ac426
87 changed files with 1539 additions and 831 deletions
Show Stats Download Patch File Download Diff File

13
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.aps.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface RippleAnnotation {
String[] dependence() default {};
String method() default "";
}

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE;
@ -66,6 +67,7 @@ public class Material extends BaseCode {
@Column(name="LEVEL")
@ApiParam(value ="低阶码")
@RippleAnnotation(dependence = {"OperOutputs.Operation.ProductRouting.Material"}, method = "calcLevel")
private Integer level;
@Column(name="IS_AUTO_FIX_PEGGING")

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

@ -24,7 +24,7 @@ import java.util.List;
**/
@Data
@Entity
@Table(name = "APS_PRODUCTROUTING")
@Table(name = "APS_PRODUCT_ROUTING")
@Api("物料")
public class ProductRouting extends BaseCode {
@Column(name="VALID_START")

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

@ -155,13 +155,13 @@ public class Work extends BaseCode {
}
@JsonBackReference
public List<WorkRelation> getWorkRelationInputs() {
return BeanRelation.list(this, EWork.WorkRelationInputs);
public List<WorkRelation> getPrevRelations() {
return BeanRelation.list(this, EWork.PrevRelations);
}
@JsonBackReference
public List<WorkRelation> getWorkRelationOutputs() {
return BeanRelation.list(this, EWork.WorkRelationOutputs);
public List<WorkRelation> getPostRelations() {
return BeanRelation.list(this, EWork.PostRelations);
}
@JsonBackReference

15
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
Unescape Escape View File

@ -117,6 +117,17 @@ public class BeanRelation {
return result;
}
public static <T extends BaseBean> List<T> listByClass(BaseBean bean, Class<T> cls, Enum<?> holder, Enum<?>... args) {
List<T> beans = new ArrayList<>();
List<BaseBean> nextBeans = list(bean, holder, args);
for (BaseBean nextBean : nextBeans) {
if (nextBean.getClass() == cls) {
beans.add((T)nextBean);
}
}
return beans;
}
private static <T extends BaseBean> void listImpl(List<T> result, BaseBean bean, Predicate<T> pred, Enum<?>[] holders, int index) {
if (index >= holders.length) {
if (pred == null || pred.test((T)bean)) {
@ -191,7 +202,7 @@ public class BeanRelation {
* @param holder
*/
private static void remove(BaseBean bean, Enum<?> holder) {
if (holder == null) {
if (bean == null || holder == null) {
return;
}
BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
@ -215,7 +226,7 @@ public class BeanRelation {
* @param relaBean
*/
private static void remove(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
if (bean == null) {
if (bean == null || holder == null) {
return;
}
BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());

4
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
Unescape Escape View File

@ -6,8 +6,8 @@ public enum EWork {
WorkResources,
WorkInputs,
WorkOutputs,
WorkRelationInputs,
WorkRelationOutputs,
PrevRelations,
PostRelations,
Operation,
PlanFeedbacks
}

4
modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
Unescape Escape View File

@ -4,8 +4,8 @@
</Relation>
<Relation field="Works" name="Work" reverse="Order" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="PrevRelations" name="WorkRelation" reverse="PrevOrder" type="ONE_TO_MULTI" owner="false">
<Relation field="PostRelations" name="WorkRelation" reverse="PrevOrder" type="ONE_TO_MULTI" owner="false">
</Relation>
<Relation field="PostRelations" name="WorkRelation" reverse="PostOrder" type="ONE_TO_MULTI" owner="false">
<Relation field="PrevRelations" name="WorkRelation" reverse="PostOrder" type="ONE_TO_MULTI" owner="false">
</Relation>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/OperResource.xml
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="OperResource">
<Relation field="Resource" name="Resource" reverse="OperResources" type="MULTI_TO_ONE" owner="false">
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
</Relation>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/Operation.xml
Unescape Escape View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="Operation">
<Relation field="StandOperation" name="StandOperation" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="OperInputs" name="OperInput" reverse="Operation" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="OperOutputs" name="OperOutput" reverse="Operation" type="ONE_TO_MULTI" owner="true">

2
modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml
Unescape Escape View File

@ -1,5 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="StandOperation">
<Relation field="Operations" name="Operation" reverse="StandOperation" type="ONE_TO_MULTI" owner="false">
</Relation>
</Class>

4
modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
Unescape Escape View File

@ -6,9 +6,9 @@
</Relation>
<Relation field="WORK_RESOURCES" name="WorkResource" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="WorkRelationOutputs" name="WorkRelation" reverse="PrevWork" type="ONE_TO_MULTI" owner="false">
<Relation field="PostRelations" name="WorkRelation" reverse="PrevWork" type="ONE_TO_MULTI" owner="false">
</Relation>
<Relation field="WorkRelationInputs" name="WorkRelation" reverse="PostWork" type="ONE_TO_MULTI" owner="false">
<Relation field="PrevRelations" name="WorkRelation" reverse="PostWork" type="ONE_TO_MULTI" owner="false">
</Relation>
<Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
</Relation>

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

@ -30,4 +30,6 @@ public class BaseConstWords {
public static final String DICTIONARY_EMPLOYEE_TYPE ="EMPLOYEE_TYPE";
// 系统参数配置 PROPERTIES
public static final String DICTIONARY_PROPERTIES ="PROPERTIES";
// 打印模板分组
public static final String DICTIONARY_LABEL_TEMPLATE_GROUP ="LABEL_TEMPLATE_GROUP";
}

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

@ -823,114 +823,6 @@ public class BlockFormEnumUtil {
}
}
/**
* 元素控件类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_CONTROL_TYPE {
RADIO(100, "RADIO", "单选"),
CHECKBOX(110, "CHECKBOX", "复选"),
TEXT(200, "TEXT", "文本"),
NUMBER(210, "NUMBER", "数字"),
PASSWORD(230, "PASSWORD", "密码"),
DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN),
// DATE(300, "DATE", "日期(yyyy-MM-dd)"),
// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
// ELEMENT(700, "DICT_SELECT", "元素"),
DICTIONARY(800, "DICT_SELECT", "字典"),
CASCADE(900, "CASCADE", "级联");
//FILE(400, "file", "文件"),
//IMAGE(410, "image", "image"),
//OFF(500, "color", "颜色"),
private int value;
private String code;
private String description;
/**
* 默认查询关系
*/
private SQL_WHERE defaultWhere;
PROPERTY_CONTROL_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) {
this.value = value;
this.code = code;
this.description = description;
this.defaultWhere = defaultWhere;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public SQL_WHERE getDefaultWhere() {
return defaultWhere;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(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) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static PROPERTY_CONTROL_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 属性字段排序规则
@ -1172,102 +1064,26 @@ public class BlockFormEnumUtil {
}
}
/**
* 属性类型信息(属性转换器)
* <per>
* <br/> Form 核心转换器
* <br/> 数据库字段类型转换Java 属性类型
* <br/> Java 属性 转换为控件类型
* </per>
* 执行类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_TYPE {
STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""),
CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""),
INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss");
public enum EXECUTION_TYPE {
SQL(10, "SQL", "SQL脚本"),
CLASS_METHOD(20, "ClassMethod", "类方法"),
SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"),
SCRIPT(40, "Script", "脚本");
/**
* 属性类型值
*/
private int value;
/**
* 属性类型代码
*/
private String code;
/**
* 属性类型描述
*/
private String description;
/**
* 属性类型ClassPath
*/
private String classPath;
/**
* 属性类型 Class
*/
private Class clzFullName;
/**
* 属性类型 对应的 控件类型
*/
private PROPERTY_CONTROL_TYPE controlType;
/**
* 默认查询关系
*/
private SQL_WHERE defaultWhere;
/**
* 默认 格式化 方式
*/
private String defaultFormat;
/**
* 默认查询关系
*/
private String defaultValue;
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
}
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
this.defaultValue = defaultValue;
this.defaultFormat = defaultFormat;
}
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) {
private EXECUTION_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
this.defaultValue = defaultValue;
this.defaultFormat = defaultFormat;
}
public int getValue() {
@ -1282,30 +1098,6 @@ public class BlockFormEnumUtil {
return description;
}
public String getClassPath() {
return classPath;
}
public Class getClzFullName() {
return clzFullName;
}
public PROPERTY_CONTROL_TYPE getControlType() {
return controlType;
}
public SQL_WHERE getDefaultWhere() {
return defaultWhere;
}
public String getDefaultFormat() {
return defaultFormat;
}
public String getDefaultValue() {
return defaultValue;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -1316,182 +1108,38 @@ public class BlockFormEnumUtil {
return tmp;
}
public static PROPERTY_TYPE valueOfClzFullName(int val) {
PROPERTY_TYPE tmp = null;
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i];
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) {
PROPERTY_CONTROL_TYPE tmp = 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].controlType;
tmp = values()[i].description;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
public static EXECUTION_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
if (values()[i].value == val) {
return values()[i];
}
}
return tmp;
return null;
}
public static int codeOfClzFullName(Class clzFullName) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].clzFullName.equals(clzFullName)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static int codeOfClassPath(String classPath) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].classPath.equals(classPath)) {
tmp = values()[i].value;
}
}
return tmp;
}
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 PROPERTY_TYPE valueOfClassPath(String classPath) {
PROPERTY_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].classPath.equals(classPath)) {
tmp = values()[i];
}
}
return tmp;
}
public static PROPERTY_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static PROPERTY_TYPE indexOf(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (val.indexOf(values()[i].value) >= 0) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 执行类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EXECUTION_TYPE {
SQL(10, "SQL", "SQL脚本"),
CLASS_METHOD(20, "ClassMethod", "类方法"),
SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"),
SCRIPT(40, "Script", "脚本");
private int value;
private String code;
private String description;
private EXECUTION_TYPE(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;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(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) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static EXECUTION_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
@ -2423,6 +2071,115 @@ public class BlockFormEnumUtil {
}
/**
* 元素控件类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_CONTROL_TYPE {
RADIO(100, "RADIO", "单选"),
CHECKBOX(110, "CHECKBOX", "复选"),
TEXT(200, "TEXT", "文本"),
NUMBER(210, "NUMBER", "数字"),
PASSWORD(230, "PASSWORD", "密码"),
DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN),
// DATE(300, "DATE", "日期(yyyy-MM-dd)"),
// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
// ELEMENT(700, "DICT_SELECT", "元素"),
DICTIONARY(800, "DICT_SELECT", "字典"),
CASCADE(900, "CASCADE", "级联");
//FILE(400, "file", "文件"),
//IMAGE(410, "image", "image"),
//OFF(500, "color", "颜色"),
private int value;
private String code;
private String description;
/**
* 默认查询关系
*/
private SQL_WHERE defaultWhere;
PROPERTY_CONTROL_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) {
this.value = value;
this.code = code;
this.description = description;
this.defaultWhere = defaultWhere;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public SQL_WHERE getDefaultWhere() {
return defaultWhere;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(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) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static PROPERTY_CONTROL_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 条件运算符
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -2510,4 +2267,250 @@ public class BlockFormEnumUtil {
return tmp;
}
}
/**
* 属性类型信息(属性转换器)
* <per>
* <br/> Form 核心转换器
* <br/> 数据库字段类型转换Java 属性类型
* <br/> Java 属性 转换为控件类型
* </per>
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_TYPE {
STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""),
CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""),
INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss");
/**
* 属性类型值
*/
private int value;
/**
* 属性类型代码
*/
private String code;
/**
* 属性类型描述
*/
private String description;
/**
* 属性类型ClassPath
*/
private String classPath;
/**
* 属性类型 Class
*/
private Class clzFullName;
/**
* 属性类型 对应的 控件类型
*/
private PROPERTY_CONTROL_TYPE controlType;
/**
* 默认查询关系
*/
private SQL_WHERE defaultWhere;
/**
* 默认 格式化 方式
*/
private String defaultFormat;
/**
* 默认查询关系
*/
private String defaultValue;
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
}
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
this.defaultValue = defaultValue;
this.defaultFormat = defaultFormat;
}
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
this.defaultValue = defaultValue;
this.defaultFormat = defaultFormat;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public String getClassPath() {
return classPath;
}
public Class getClzFullName() {
return clzFullName;
}
public PROPERTY_CONTROL_TYPE getControlType() {
return controlType;
}
public SQL_WHERE getDefaultWhere() {
return defaultWhere;
}
public String getDefaultFormat() {
return defaultFormat;
}
public String getDefaultValue() {
return defaultValue;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static PROPERTY_TYPE valueOfClzFullName(int val) {
PROPERTY_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i];
}
}
return tmp;
}
public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) {
PROPERTY_CONTROL_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].controlType;
}
}
return tmp;
}
public static int codeOfValue(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 int codeOfClzFullName(Class clzFullName) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].clzFullName.equals(clzFullName)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static int codeOfClassPath(String classPath) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].classPath.equals(classPath)) {
tmp = values()[i].value;
}
}
return tmp;
}
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 PROPERTY_TYPE valueOfClassPath(String classPath) {
PROPERTY_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].classPath.equals(classPath)) {
tmp = values()[i];
}
}
return tmp;
}
public static PROPERTY_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static PROPERTY_TYPE indexOf(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (val.indexOf(values()[i].value) >= 0) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -521,6 +521,15 @@ public class BlockSoftSwitchEnumUtil {
}
return result;
}
public static PARAM_VALUE_TYPE valueOf(int value){
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
}
/**

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

@ -393,7 +393,67 @@ public class CommonEnumUtil {
return tmp;
}
}
/**
* 数据类型
* 1库存移动数据
* 2质检数据
* 3已配料待出库
* 4JIS发运扣减
* 5报工待汇总
* 6报工汇总待处理
* 7erp接口待同步
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NUM_TYPE {
MOVE_DETAILS(1, "MOVE_DETAILS", "库存移动数据"),
QC_DETAILS(2, "QC_DETAILS", "质检数据"),
DOC_MOVEMENT(3, "DOC_MOVEMENT", "已配料待出库"),
DOC_SHIPPING(4, "DOC_SHIPPING", "JIS发运扣减"),
FG_DETAILS(5, "FG_DETAILS", "报工待汇总"),
FG_SUM(6, "FG_SUM", "报工汇总待处理"),
ERP_INTERFACE(7, "ERP_INTERFACE", "ERP接口待同步");
private int value;
private String code;
private String description;
private NUM_TYPE(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 String getCode() {
return code;
}
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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_INFO_STATUS {
INCUMBENT(1, "正常", "正常_NORMAL"),

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

@ -1161,7 +1161,7 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DICTIONARY_GROUP {
SYSTEM(1, "系统字典"),
EXTERNAL(2, "外部人员");
EXTERNAL(2, "业务字典");
private int value;
private String description;

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

@ -12,6 +12,196 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* mes设备类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQUIPMENT_TYPE {
PHYSICAL(10, "物理设备"),
LOGIC(20, "逻辑设备");
private int value;
private String description;
MES_EQUIPMENT_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* mes设备连接类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQUIPMENT_CONNECT_TYPE {
PLC(10, "PLC"),
DB(20, "DB"),
OTHER(30, "其他");
private int value;
private String description;
MES_EQUIPMENT_CONNECT_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 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;
}
}
/**
* mes设备类别
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQUIPMENT_CATEGORY {
A("A", "A"),
B("B", "B"),
C("C", "C"),
D("D", "D");
private String value;
private String description;
MES_EQUIPMENT_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;
}
}
/**
* mes按钮状态配置 判断符号
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

4
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
Unescape Escape View File

@ -215,6 +215,8 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
List<T> findByProperty(String propertyName, Object value);
List<Map<String,Object>> findByWasProperty(String[] propertyNames, Object[] values);
List<T> findByProperty(String[] propertyNames, Object[] values);
List<T> findByProperty(String propertyName, Object value,String orderByStuff);
@ -231,6 +233,8 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
int findByPropertyCount(String propertyName, Object value);
T findByVendorNoProperty(String vendorNo);
int findByPropertyCount(String[] propertyNames, Object[] values);
List<T> findByPropertyPage(String propertyName, Object value,String orderByStuff,Pager pager);

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

@ -3,10 +3,16 @@ package cn.estsh.i3plus.pojo.base.jpa.daoimpl;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
import cn.estsh.i3plus.pojo.base.util.BeanMapUtils;
import cn.estsh.i3plus.pojo.base.util.StringCastUtils;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.NonUniqueResultException;
import org.hibernate.SQLQuery;
import org.hibernate.transform.Transformers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
@ -37,7 +43,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
private Class<T> persistentClass;
private SnowflakeIdMaker snowflakeIdMaker;
public BaseRepositoryImpl(Class<T> clz, EntityManager em,SnowflakeIdMaker snowflakeIdMaker) {
public BaseRepositoryImpl(Class<T> clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) {
super(clz, em);
this.entityManager = em;
this.persistentClass = clz;
@ -83,7 +89,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public T insert(T item) {
return insert(item,true);
return insert(item, true);
}
@Override
@ -94,7 +100,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public <S extends T> S save(S entity) {
//复写save方法，若id为0或空则新增，不然则修改
return (S) innerSave(entity,true);
return (S) innerSave(entity, true);
}
@Override
@ -136,100 +142,101 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
@Override
public void deleteById(ID id){
public void deleteById(ID id) {
deleteByProperty("id", id);
}
@Override
public int deleteByProperty(String propName, Object propValue) {
return deleteByProperties(new String[] { propName }, new Object[] { propValue });
return deleteByProperties(new String[]{propName}, new Object[]{propValue});
}
@Override
public int deleteByProperties(String[] propName, Object[] propValue) {
if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) {
StringBuffer sb = new StringBuffer("delete from " + persistentClass.getName() + " model where 1=1 ");
appendQL(sb,propName,propValue);
appendQL(sb, propName, propValue);
Query query = entityManager.createQuery(sb.toString());
setParameter(query,propName,propValue);
setParameter(query, propName, propValue);
return query.executeUpdate();
}else{
} else {
throw new IllegalArgumentException("删除错误!propName:" + propName + ",propValue:" + propValue);
}
}
@Override
public int deleteByIds(ID[] ids) {
return deleteByPropertyIn("id", ids);
return deleteByPropertyIn("id", ids);
}
@Override
public int deleteByPropertyIn(String propName, Object[] propValues) {
if ((propName != null && propName.length() > 0) && (propValues != null && propValues.length > 0)) {
String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:"+propName+") ";
String hql = "delete from " + persistentClass.getName() + " model where model." + propName + " in(:" + propName + ") ";
Query query = entityManager.createQuery(hql);
query.setParameter(propName, Arrays.asList(propValues));
return query.executeUpdate();
}else{
throw new IllegalArgumentException("删除出错："+propName+":" + propValues);
} else {
throw new IllegalArgumentException("删除出错：" + propName + ":" + propValues);
}
}
@Override
public int updateByProperties(String conditionName, Object conditionValue, String propertyName, Object propertyValue) {
return updateByProperties(new String[] { conditionName }, new Object[] { conditionValue }, new String[] { propertyName }, new Object[] { propertyValue });
return updateByProperties(new String[]{conditionName}, new Object[]{conditionValue}, new String[]{propertyName}, new Object[]{propertyValue});
}
@Override
public int updateByProperties(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue) {
return updateByProperties(new String[] { conditionName }, new Object[] { conditionValue }, propertyName, propertyValue);
return updateByProperties(new String[]{conditionName}, new Object[]{conditionValue}, propertyName, propertyValue);
}
@Override
public int updateByProperties(String[] conditionName, Object[] conditionValue, String propertyName, Object propertyValue) {
return updateByProperties(conditionName, conditionValue, new String[] { propertyName }, new Object[] { propertyValue });
return updateByProperties(conditionName, conditionValue, new String[]{propertyName}, new Object[]{propertyValue});
}
@Override
public int updateByProperties(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue) {
return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue,true);
return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue, true);
}
@Override
public int updateByPropertiesWithVal(String conditionName, Object conditionValue, String propertyName, Object propertyValue) {
return updateByPropertiesWithVal(new String[] { conditionName }, new Object[] { conditionValue }, new String[] { propertyName }, new Object[] { propertyValue });
return updateByPropertiesWithVal(new String[]{conditionName}, new Object[]{conditionValue}, new String[]{propertyName}, new Object[]{propertyValue});
}
@Override
public int updateByPropertiesWithVal(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue) {
return updateByPropertiesWithVal(new String[] { conditionName }, new Object[] { conditionValue }, propertyName, propertyValue);
return updateByPropertiesWithVal(new String[]{conditionName}, new Object[]{conditionValue}, propertyName, propertyValue);
}
@Override
public int updateByPropertiesWithVal(String[] conditionName, Object[] conditionValue, String propertyName, Object propertyValue) {
return updateByPropertiesWithVal(conditionName, conditionValue, new String[] { propertyName }, new Object[] { propertyValue });
return updateByPropertiesWithVal(conditionName, conditionValue, new String[]{propertyName}, new Object[]{propertyValue});
}
@Override
public int updateByPropertiesWithVal(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue) {
return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue,false);
return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue, false);
}
/**
* 更新参数汇总方法
* @param conditionName 条件属性名
*
* @param conditionName 条件属性名
* @param conditionValue 条件属性值
* @param propertyName 更新属性名
* @param propertyValue 更新属性值
* @param valWithSimple 是否简单赋值
* true为正常eg： price = :price
* false为自身添加eg： price = price + :price
* @param propertyName 更新属性名
* @param propertyValue 更新属性值
* @param valWithSimple 是否简单赋值
* true为正常eg： price = :price
* false为自身添加eg： price = price + :price
* @return
*/
private int updateByPropertiesMain(String[] conditionName, Object[] conditionValue,
String[] propertyName, Object[] propertyValue,boolean valWithSimple) {
String[] propertyName, Object[] propertyValue, boolean valWithSimple) {
if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null)
&& (propertyValue.length > 0) && (propertyName.length == propertyValue.length)
&& (conditionValue != null) && (conditionValue.length > 0)) {
@ -237,9 +244,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
sb.append("update " + persistentClass.getName() + " model set ");
for (int i = 0; i < propertyName.length; i++) {
if(valWithSimple) {
if (valWithSimple) {
sb.append(propertyName[i] + " = :p_" + propertyName[i] + ",");
}else{
} else {
sb.append(propertyName[i] + " = " + propertyName[i] + " + :p_" + propertyName[i] + ",");
}
}
@ -261,36 +268,36 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
@Override
public int updateByProperties(String propertyName, Object propertyValue,DdlPackBean packBean) {
return updateByProperties(new String[] { propertyName }, new Object[] { propertyValue },packBean);
public int updateByProperties(String propertyName, Object propertyValue, DdlPackBean packBean) {
return updateByProperties(new String[]{propertyName}, new Object[]{propertyValue}, packBean);
}
@Override
public int updateByProperties(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) {
return updateByPropertiesDdlPack(propertyName, propertyValue,packBean,true);
public int updateByProperties(String[] propertyName, Object[] propertyValue, DdlPackBean packBean) {
return updateByPropertiesDdlPack(propertyName, propertyValue, packBean, true);
}
@Override
public int updateByPropertiesWithVal(String propertyName, Object propertyValue,DdlPackBean packBean) {
return updateByPropertiesWithVal(new String[] { propertyName }, new Object[] { propertyValue },packBean);
public int updateByPropertiesWithVal(String propertyName, Object propertyValue, DdlPackBean packBean) {
return updateByPropertiesWithVal(new String[]{propertyName}, new Object[]{propertyValue}, packBean);
}
@Override
public int updateByPropertiesWithVal(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) {
return updateByPropertiesDdlPack(propertyName, propertyValue,packBean,false);
public int updateByPropertiesWithVal(String[] propertyName, Object[] propertyValue, DdlPackBean packBean) {
return updateByPropertiesDdlPack(propertyName, propertyValue, packBean, false);
}
private int updateByPropertiesDdlPack(String[] propertyName, Object[] propertyValue,
DdlPackBean packBean,boolean valWithSimple) {
DdlPackBean packBean, boolean valWithSimple) {
if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null)
&& (propertyValue.length > 0) && (propertyName.length == propertyValue.length)) {
StringBuffer sb = new StringBuffer();
sb.append("update " + persistentClass.getName() + " model set ");
for (int i = 0; i < propertyName.length; i++) {
if(valWithSimple) {
if (valWithSimple) {
sb.append(propertyName[i] + " = :p_" + propertyName[i] + ",");
}else{
} else {
sb.append(propertyName[i] + " = " + propertyName[i] + " + :p_" + propertyName[i] + ",");
}
}
@ -304,7 +311,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
//查询条件
for (String key : packBean.getHqlPreparedMap().keySet()) {
query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key));
}
return query.executeUpdate();
@ -345,9 +352,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public T getById(long id) {
try{
return entityManager.find(persistentClass,id);
}catch (Exception e){
try {
return entityManager.find(persistentClass, id);
} catch (Exception e) {
return null;
}
}
@ -361,12 +368,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> listPager(Pager pager) {
if(pager.getTotalRows() > 0) {
if (pager.getTotalRows() > 0) {
return entityManager.createQuery("from " + persistentClass.getName())
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
}else{
} else {
return new ArrayList<T>();
}
}
@ -379,16 +386,16 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByPage(DdlPackBean packBean, int offset, int pageSize) {
Query query = null;
String ddl = "from " + persistentClass.getName() + " where 1=1 " +packBean.getPackedHql();
String ddl = "from " + persistentClass.getName() + " where 1=1 " + packBean.getPackedHql();
if(packBean.isHql()){
if (packBean.isHql()) {
query = entityManager.createQuery(ddl);
}else{
} else {
query = entityManager.createNativeQuery(ddl);
}
for (String key : packBean.getHqlPreparedMap().keySet()) {
query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key));
}
return query.setFirstResult(offset)
@ -412,6 +419,37 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
@Override
public List<Map<String,Object>> findByWasProperty(String[] propertyNames, Object[] values) {
if (propertyNames.length != values.length) {
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append(" SELECT \n" +
" a.sn_status AS snStatus,\n" +
" a.wh_no AS whNo,\n" +
" a.locate_no AS locateNo,\n" +
" a.part_no AS partNo,\n" +
" a.part_name_rdd AS partNameRdd,\n" +
" a.lot_no AS lotNo,\n" +
" CAST(IFNULL(SUM(a.qty), 0) AS DOUBLE) AS qty \n" +
"FROM\n" +
" `wms_stock_sn` a ");
int size = propertyNames.length;
if (size > 0) {
queryString.append("where 1=1 and a.sn_status in ('"+ WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue()+"', '"+WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue()+"','"+WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue()+"','"+WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue()+"') ");
}
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryString.append(" and a." + StringCastUtils.upperCharToUnderLine(propertyNames[i]) + "= '" + values[i]+"'");
}
}
queryString.append(" group by a.lot_no,a.date_code");
return entityManager.createNativeQuery(queryString.toString()).unwrap(SQLQuery.class).setResultTransformer(
Transformers.ALIAS_TO_ENTITY_MAP).getResultList();
}
@Override
public List<T> findByProperty(String[] propertyNames, Object[] values) {
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
@ -570,6 +608,22 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
@Override
public T findByVendorNoProperty(String vendorNoStr) {
List<T> list=null;
try {
if(!StringUtil.isEmpty(vendorNoStr)){
String queryString = "from " + persistentClass.getSimpleName() + " as model where model.vendorNo= :vendorNo";
list=entityManager.createQuery(queryString)
.setParameter("vendorNo", vendorNoStr)
.getResultList();
}
} catch (Exception e) {
e.printStackTrace();
}
return list!=null ? list.get(0): null;
}
@Override
public int findByPropertyCount(String[] propertyNames, Object[] values) {
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
@ -1529,4 +1583,6 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
return num;
}
}

126
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
@ -47,8 +48,8 @@ public class DdlPreparedPack {
endDate += " 23:59:59";
}
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, endDate);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, endDate);
}
/**
@ -94,9 +95,9 @@ public class DdlPreparedPack {
String[] time = date.split(",");
if (time.length == 1) {
//只有开始日期，没有结束日期
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
} else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0)
|| (time[1] != null & time[1].trim().length() > 0))) {
|| (time[1] != null & time[1].trim().length() > 0))) {
if (time[0] == null || time[0].trim().length() == 0) {
time[0] = "1900-01-01";
} else {
@ -113,16 +114,16 @@ public class DdlPreparedPack {
if (isShowTime && time[1].trim().length() <= 11) {
time[1] += " 23:59:59";
}
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, time[0]);
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, time[1]);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, time[0]);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, time[1]);
} else {
if (showTaday) {
if (isShowTime) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_"+ columnName, today + " 23:59:59");
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, today + " 23:59:59");
} else {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today);
packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_" + columnName, today);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, today);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, today);
}
}
}
@ -147,14 +148,14 @@ public class DdlPreparedPack {
}
if (!isShowTime) {
date = date.substring(0, 10);
packBean.addColumnQuery(null," and '" + date + "' between substring(model." + startColumnName
+ ",1,10) and substring(model." + endColumnName + ",1,10)", null);
packBean.addColumnQuery(null, " and '" + date + "' between substring(model." + startColumnName
+ ",1,10) and substring(model." + endColumnName + ",1,10)", null);
return;
} else if (date.trim().length() <= 11) {
date += " 00:00:00";
}
packBean.addColumnQuery(null," and '" + date + "' between model." + startColumnName
+ " and model." + endColumnName, null);
packBean.addColumnQuery(null, " and '" + date + "' between model." + startColumnName
+ " and model." + endColumnName, null);
}
/**
@ -173,9 +174,9 @@ public class DdlPreparedPack {
} else {
order[i] = "desc";
}
if(columnName[i].indexOf(" model.") == -1){
if (columnName[i].indexOf(" model.") == -1) {
sqlStr += " model." + columnName[i];
}else{
} else {
sqlStr += columnName[i];
}
sqlStr += " " + order[i].toString() + ",";
@ -209,7 +210,7 @@ public class DdlPreparedPack {
*/
public static void getStringLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + val + "%");
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val + "%");
}
}
@ -222,7 +223,7 @@ public class DdlPreparedPack {
*/
public static void getStringLikerPackOr(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," or model." + columnName + " like :m_" + columnName, "%" + val + "%");
packBean.addColumnQuery(columnName, " or model." + columnName + " like :m_" + columnName, "%" + val + "%");
}
}
@ -235,7 +236,7 @@ public class DdlPreparedPack {
*/
public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, val + "%");
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%");
}
}
@ -248,7 +249,7 @@ public class DdlPreparedPack {
*/
public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + val);
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val);
}
}
@ -260,7 +261,7 @@ public class DdlPreparedPack {
*/
public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, val);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val);
}
}
@ -272,7 +273,7 @@ public class DdlPreparedPack {
*/
public static void getStringNoEqualPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, val);
packBean.addColumnQuery(columnName, " and model." + columnName + " <> :m_" + columnName, val);
}
}
@ -283,7 +284,7 @@ public class DdlPreparedPack {
* @param packBean
*/
public static void getStringNotNullPack(String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(null," and model." + columnName + " is not null", null);
packBean.addColumnQuery(null, " and model." + columnName + " is not null", null);
}
/**
@ -294,7 +295,7 @@ public class DdlPreparedPack {
*/
public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, val);
packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, val);
}
}
@ -306,7 +307,7 @@ public class DdlPreparedPack {
*/
public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Long.parseLong(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -318,7 +319,7 @@ public class DdlPreparedPack {
*/
public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -330,7 +331,7 @@ public class DdlPreparedPack {
*/
public static void getNumEqualPackOr(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Long.parseLong(data.toString()) > 0) {
packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, data);
}
}
@ -342,7 +343,7 @@ public class DdlPreparedPack {
*/
public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -354,7 +355,7 @@ public class DdlPreparedPack {
*/
public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) >= 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -366,7 +367,7 @@ public class DdlPreparedPack {
*/
public static void getStringBiggerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
}
}
@ -390,7 +391,7 @@ public class DdlPreparedPack {
*/
public static void getStringSmallerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, data);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, data);
}
}
@ -402,7 +403,7 @@ public class DdlPreparedPack {
*/
public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " < :m_s_" + columnName, data);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " < :m_s_" + columnName, data);
}
}
@ -414,9 +415,22 @@ public class DdlPreparedPack {
*/
public static void getNumberBiggerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
}
}
/**
* 封装double对象成大于语句
*
* @param columnName 列名
* @param packBean
*/
public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
}
}
/**
* 封装double对象成大于等于语句
*
@ -425,7 +439,7 @@ public class DdlPreparedPack {
*/
public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
}
}
@ -437,9 +451,10 @@ public class DdlPreparedPack {
*/
public static void getNumberSmallerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data);
}
}
/**
* 封装double对象成小于等于语句
*
@ -448,7 +463,7 @@ public class DdlPreparedPack {
*/
public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data);
}
}
@ -460,7 +475,7 @@ public class DdlPreparedPack {
*/
public static void getNumNOEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " <> :m_" + columnName, data);
}
}
@ -473,7 +488,7 @@ public class DdlPreparedPack {
*/
public static void getInPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -486,7 +501,7 @@ public class DdlPreparedPack {
*/
public static void getOrInPack(String data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " or model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -499,7 +514,7 @@ public class DdlPreparedPack {
*/
public static void getInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
if (data != null && data.length > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data));
packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data));
}
}
@ -512,7 +527,7 @@ public class DdlPreparedPack {
*/
public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
if (data != null && data.length > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data));
packBean.addColumnQuery(columnName, " and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data));
}
}
@ -525,7 +540,7 @@ public class DdlPreparedPack {
*/
public static void getInPackList(List<?> data, String columnName, DdlPackBean packBean) {
if (data != null && data.size() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -538,7 +553,7 @@ public class DdlPreparedPack {
*/
public static void getNotInPackList(List<?> data, String columnName, DdlPackBean packBean) {
if (data != null && data.size() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and model." + columnName + "not in (:m_" + columnName + ")", data);
}
}
@ -564,7 +579,7 @@ public class DdlPreparedPack {
data += "'" + dataArray[i] + "',";
}
}
packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " or model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -590,7 +605,7 @@ public class DdlPreparedPack {
data += "'" + dataArray[i] + "',";
}
}
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and " + columnName + " not in (:m_" + columnName + ")", data);
}
}
@ -603,26 +618,27 @@ public class DdlPreparedPack {
*/
public static void getNotInPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and " + columnName + " not in (:m_" + columnName + ")", data);
}
}
/**
* 转换排序列
*
* @param columnName 列名
* @param basisType 基本类型
* @see CommonEnumUtil.BASIS_TYPE
* @param basisType 基本类型
* @return
* @see CommonEnumUtil.BASIS_TYPE
*/
public static String getOrderColConvertType(String columnName,int basisType){
String name =" model." + columnName;
public static String getOrderColConvertType(String columnName, int basisType) {
String name = " model." + columnName;
if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) {
name = " cast(" + name+ " as integer)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()){
name = " cast(" + name+ " as double)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()){
name = " cast(" + name+ " as long)";
name = " cast(" + name + " as integer)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) {
name = " cast(" + name + " as double)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) {
name = " cast(" + name + " as long)";
}
return name;
}

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

@ -0,0 +1,33 @@
package cn.estsh.i3plus.pojo.base.util;
import org.springframework.cglib.beans.BeanMap;
import java.util.HashMap;
import java.util.Map;
public class BeanMapUtils {
/**
* 将对象属性转化为map结合
*/
public static <T> Map<String, Object> beanToMap(T bean) {
Map<String, Object> map = new HashMap<>();
if (bean != null) {
BeanMap beanMap = BeanMap.create(bean);
for (Object key : beanMap.keySet()) {
map.put(key + "", beanMap.get(key));
}
}
return map;
}
/**
* 将map集合中的数据转化为指定对象的同名属性中
*/
public static <T> T mapToBean(Map<String, Object> map, Class<T> clazz) throws Exception {
T bean = clazz.newInstance();
BeanMap beanMap = BeanMap.create(bean);
beanMap.putAll(map);
return bean;
}
}

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

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.base.util;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 字符串转大写换成下滑线加小写
*/
public class StringCastUtils {
public static String upperCharToUnderLine(String param) {
Pattern p= Pattern.compile("[A-Z]");
if(param==null ||param.equals("")){
return "";
}
StringBuilder builder=new StringBuilder(param);
Matcher mc=p.matcher(param);
int i=0;
while (mc.find()) {
System.out.println(builder.toString());
System.out.println("mc.start():" + mc.start() + ", i: " + i);
System.out.println("mc.end():" + mc.start() + ", i: " + i);
builder.replace(mc.start()+i, mc.end()+i, "_"+mc.group().toLowerCase());
i++;
}
if('_' == builder.charAt(0)){
builder.deleteCharAt(0);
}
System.out.println(builder.toString());
return builder.toString();
}
// public static void main(String[] args) {
// upperCharToUnderLine("snStatus");
// }
}

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

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.base.util;
public class StringUtil {
public static boolean isEmpty(Object obj){
if(obj ==null || obj.toString().trim().equals("")){
return true;
}
return false;
}
}

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

@ -55,8 +55,8 @@ public class MesDb extends BaseBean {
@ApiParam("密码")
private String dsPassword;
@Column(name="EQU_CODE")
@Column(name="EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equCode;
private String equipmentCode;
}

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

@ -41,19 +41,40 @@ public class MesEquipment extends BaseBean {
@Column(name="STATUS")
@ApiParam("设备状态")
private String status;
private Integer status;
@Column(name="WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="EQUIPMENT_TYPE")
@ApiParam("设备类型")
private Integer equipmentType;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@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="AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="CONNECT_TYPE")
@ApiParam("连接类型")

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

@ -63,9 +63,9 @@ public class MesPlc extends BaseBean {
@ApiParam("分组名称")
private String groupName;
@Column(name = "EQU_CODE")
@Column(name="EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equCode;
private String equipmentCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")

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

@ -34,6 +34,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam("零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("产品物料名称")
private String partName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@ -54,6 +58,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam("子零件")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料物料名称")
private String itemPartName;
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "子零件数量", example = "0")

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

@ -34,8 +34,8 @@ public class MesWcEquipment extends BaseBean {
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="EQU_CODE")
@Column(name="EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equCode;
private String equipmentCode;
}

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

@ -38,6 +38,9 @@ public class StationResultBean<T> implements Serializable {
@ApiParam("List结果集")
private List<T> resultList;
@ApiParam("结果对象")
private Object resultObj;
@ApiParam("Map结果集")
public Map<String, Object> resultMap;

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

@ -55,8 +55,8 @@ public class MesDb extends BaseBean {
@ApiParam("密码")
private String dsPassword;
@Column(name = "EQU_CODE")
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equCode;
private String equipmentCode;
}

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

@ -17,7 +17,7 @@ import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :生产区域
* @Description :生产设备
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
@ -41,24 +41,60 @@ public class MesEquipment extends BaseBean {
@Column(name="STATUS")
@ApiParam("设备状态")
private String status;
private Integer status;
@Column(name="WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="EQUIPMENT_TYPE")
@ApiParam("设备类型")
private Integer equipmentType;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="EQUIPMENT_CATEGORY")
@ApiParam("设备类别")
private String equipmentCategory;
@Column(name="AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@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;
@Transient
@ApiParam(value ="名称")
private String name;
@Transient
@ApiParam(value ="生产线")
private String workCenterCode;
@Transient
@ApiParam(value ="工位")
private String workCellCode;
@Transient
@ApiParam(value ="区域")
private String areaCode;
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")

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

@ -36,6 +36,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam("零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("产品物料名称")
private String partName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@ -57,6 +61,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam("子零件")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料物料名称")
private String itemPartName;
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "子零件数量", example = "0")

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

@ -35,8 +35,8 @@ public class MesWcEquipment extends BaseBean {
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="EQU_CODE")
@Column(name="EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equCode;
private String equipmentCode;
}

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

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
@Data
public class MesEquipmentModel implements Serializable {
@ApiParam(value ="id")
private Long id;
@ApiParam("设备代码")
private String equipmentCode;
@ApiParam("设备名称")
private String equipmentName;
@ApiParam("设备状态")
private Integer status;
@ApiParam(value ="生产线")
private String workCenterCode;
@ApiParam(value ="工位")
private String workCellCode;
@ApiParam(value ="区域")
private String areaCode;
@ApiParam(value ="设备工位关联ID")
private Long wcId;
public MesEquipmentModel() {
}
public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) {
this.wcId = wcId;
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.status = status;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.areaCode = areaCode;
}
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.status = status;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
}
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcEquipmentRepository.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.MesWcEquipment;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-10-09
* @Modify:
**/
@Repository
public interface MesWcEquipmentRepository extends BaseRepository<MesWcEquipment, Long> {
}

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

@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.StringUtils;
/**
* @Description:
@ -32,16 +32,16 @@ public class MesHqlPack {
public static DdlPackBean getMesPcnByCondition(MesPcn mesPcn, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesPcn.getConnectIp())) {
if (!StringUtils.isEmpty(mesPcn.getConnectIp())) {
DdlPreparedPack.getStringLikerPack(mesPcn.getConnectIp(), "connectIp", packBean);
}
if (StringUtils.isNotEmpty(mesPcn.getPcnName())) {
if (!StringUtils.isEmpty(mesPcn.getPcnName())) {
DdlPreparedPack.getStringLikerPack(mesPcn.getPcnName(), "pcnName", packBean);
}
if (StringUtils.isNotEmpty(mesPcn.getPcnCode())) {
if (!StringUtils.isEmpty(mesPcn.getPcnCode())) {
DdlPreparedPack.getStringLikerPack(mesPcn.getPcnCode(), "pcnCode", packBean);
}
if (StringUtils.isNotEmpty(mesPcn.getAreaCode())) {
if (!StringUtils.isEmpty(mesPcn.getAreaCode())) {
DdlPreparedPack.getStringLikerPack(mesPcn.getAreaCode(), "areaCode", packBean);
}
if (mesPcn.getIsValid() != null) {
@ -62,23 +62,23 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
if (StringUtils.isNotEmpty(mesPlanOrder.getOrderNo())) {
if (!StringUtils.isEmpty(mesPlanOrder.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesPlanOrder.getOrderNo(), "orderNo", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) {
if (!StringUtils.isEmpty(mesPlanOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPlanOrder.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) {
if (!StringUtils.isEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) {
DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) {
if (!StringUtils.isEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) {
DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
if (!StringUtils.isEmpty(mesPlanOrder.getCreateUser())) {
DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getCustOrderNo())) {
if (!StringUtils.isEmpty(mesPlanOrder.getCustOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCustOrderNo(), "custOrderNo", packBean);
}
@ -114,19 +114,19 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
if (StringUtils.isNotEmpty(mesPart.getPartNo())) {
if (!StringUtils.isEmpty(mesPart.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getPartName())) {
if (!StringUtils.isEmpty(mesPart.getPartName())) {
DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) {
if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) {
if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) {
if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
}
@ -143,31 +143,31 @@ public class MesHqlPack {
*/
public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesWorkOrder.getOrderNo())) {
if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) {
if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) {
if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
}
if (mesWorkOrder.getApprovalStatus() != null) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) {
if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) {
if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean);
}
if (mesWorkOrder.getIsValid() != null) {
@ -200,15 +200,15 @@ public class MesHqlPack {
*/
public static DdlPackBean getQueueOrder(MesQueueOrder mesQueueOrder, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoStart())) {
if (!StringUtils.isEmpty(mesQueueOrder.getCustFlagNoStart())) {
DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustFlagNoStart(), "custFlagNo", packBean);
}
if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) {
if (!StringUtils.isEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) {
DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean);
}
if (StringUtils.isNotEmpty(mesQueueOrder.getOrderNo() + "")) {
if (!StringUtils.isEmpty(mesQueueOrder.getOrderNo() + "")) {
DdlPreparedPack.getStringLikerPack(mesQueueOrder.getOrderNo(), "orderNo", packBean);
}
@ -253,7 +253,7 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode);
if (StringUtils.isNotEmpty(mesArea.getAreaCode())) {
if (!StringUtils.isEmpty(mesArea.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean);
}
@ -281,13 +281,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode);
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) {
if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())) {
if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())) {
if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
}
@ -295,24 +295,6 @@ public class MesHqlPack {
}
/**
* MES设备信息查询条件封装
*
* @param mesEquipment
* @return
*/
public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
}
if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())) {
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
}
return packBean;
}
/**
* 流程查询条件封装
*
* @param mesRoute
@ -350,13 +332,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesShift(MesShift shift, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode);
if (StringUtils.isNotEmpty(shift.getShiftCode())) {
if (!StringUtils.isEmpty(shift.getShiftCode())) {
DdlPreparedPack.getStringLikerPack(shift.getShiftCode(), "shiftCode", packBean);
}
if (StringUtils.isNotEmpty(shift.getShiftName())) {
if (!StringUtils.isEmpty(shift.getShiftName())) {
DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
}
if (StringUtils.isNotEmpty(shift.getWorkCenterCode())) {
if (!StringUtils.isEmpty(shift.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean);
}
@ -373,10 +355,10 @@ public class MesHqlPack {
public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode);
if (StringUtils.isNotEmpty(shiftGroup.getGroupCode())) {
if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) {
DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean);
}
if (StringUtils.isNotEmpty(shiftGroup.getGroupName())) {
if (!StringUtils.isEmpty(shiftGroup.getGroupName())) {
DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean);
}
return packBean;
@ -390,10 +372,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesShiftRest(MesShiftRest shiftRest, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(shiftRest, organizeCode);
if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())) {
if (!StringUtils.isEmpty(shiftRest.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(shiftRest.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(shiftRest.getShiftCode())) {
if (!StringUtils.isEmpty(shiftRest.getShiftCode())) {
DdlPreparedPack.getStringEqualPack(shiftRest.getShiftCode(), "shiftCode", packBean);
}
@ -408,10 +390,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) {
if (!StringUtils.isEmpty(mesScrap.getScrapCode())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean);
}
if (StringUtils.isNotEmpty(mesScrap.getScrapName())) {
if (!StringUtils.isEmpty(mesScrap.getScrapName())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean);
}
if (mesScrap.getIsValid() != null) {
@ -446,10 +428,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) {
if (!StringUtils.isEmpty(mesConfig.getCfgCode())) {
DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
}
if (StringUtils.isNotEmpty(mesConfig.getCfgName())) {
if (!StringUtils.isEmpty(mesConfig.getCfgName())) {
DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
}
if (mesConfig.getIsValid() != null) {
@ -466,10 +448,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) {
if (!StringUtils.isEmpty(mesRepair.getRepairCode())) {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean);
}
if (StringUtils.isNotEmpty(mesRepair.getRepairName())) {
if (!StringUtils.isEmpty(mesRepair.getRepairName())) {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean);
}
if (mesRepair.getRepairType() != null) {
@ -503,10 +485,10 @@ public class MesHqlPack {
public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())) {
if (!StringUtils.isEmpty(mesESOP.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesESOP.getPartNo())) {
if (!StringUtils.isEmpty(mesESOP.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean);
}
@ -639,13 +621,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesEventAction(MesEventAction mesEventAction, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesEventAction, organizeCode);
if (StringUtils.isNotEmpty(mesEventAction.getOrganizeCode())) {
if (!StringUtils.isEmpty(mesEventAction.getOrganizeCode())) {
DdlPreparedPack.getStringEqualPack(mesEventAction.getOrganizeCode(), "organizeCode", packBean);
}
if (StringUtils.isNotEmpty(mesEventAction.getEventCode())) {
if (!StringUtils.isEmpty(mesEventAction.getEventCode())) {
DdlPreparedPack.getStringLikerPack(mesEventAction.getEventCode(), "eventCode", packBean);
}
if (StringUtils.isNotEmpty(mesEventAction.getActionCode())) {
if (!StringUtils.isEmpty(mesEventAction.getActionCode())) {
DdlPreparedPack.getStringLikerPack(mesEventAction.getActionCode(), "actionCode", packBean);
}
@ -661,10 +643,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode);
if (StringUtils.isNotEmpty(process.getProcessCode())) {
if (!StringUtils.isEmpty(process.getProcessCode())) {
DdlPreparedPack.getStringLikerPack(process.getProcessCode(), "processCode", packBean);
}
if (StringUtils.isNotEmpty(process.getProcessName())) {
if (!StringUtils.isEmpty(process.getProcessName())) {
DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean);
}
@ -679,13 +661,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesStep(MesStep step, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode);
if (StringUtils.isNotEmpty(step.getStepCode())) {
if (!StringUtils.isEmpty(step.getStepCode())) {
DdlPreparedPack.getStringLikerPack(step.getStepCode(), "stepCode", packBean);
}
if (StringUtils.isNotEmpty(step.getStepName())) {
if (!StringUtils.isEmpty(step.getStepName())) {
DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
}
if (StringUtils.isNotEmpty(step.getStepType())) {
if (!StringUtils.isEmpty(step.getStepType())) {
DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean);
}
@ -700,13 +682,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesStepParam(MesStepParam stepParam, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(stepParam, organizeCode);
if (StringUtils.isNotEmpty(stepParam.getStepCode())) {
if (!StringUtils.isEmpty(stepParam.getStepCode())) {
DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean);
}
if (StringUtils.isNotEmpty(stepParam.getParamCode())) {
if (!StringUtils.isEmpty(stepParam.getParamCode())) {
DdlPreparedPack.getStringLikerPack(stepParam.getParamCode(), "paramCode", packBean);
}
if (StringUtils.isNotEmpty(stepParam.getParamName())) {
if (!StringUtils.isEmpty(stepParam.getParamName())) {
DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean);
}
@ -721,16 +703,16 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesRouteProcessCell(MesRouteProcessCell routeProcessCell, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(routeProcessCell, organizeCode);
if (StringUtils.isNotEmpty(routeProcessCell.getRouteCode())) {
if (!StringUtils.isEmpty(routeProcessCell.getRouteCode())) {
DdlPreparedPack.getStringEqualPack(routeProcessCell.getRouteCode(), "routeCode", packBean);
}
if (StringUtils.isNotEmpty(routeProcessCell.getProcessCode())) {
if (!StringUtils.isEmpty(routeProcessCell.getProcessCode())) {
DdlPreparedPack.getStringEqualPack(routeProcessCell.getProcessCode(), "processCode", packBean);
}
if (StringUtils.isNotEmpty(routeProcessCell.getWorkCellCode())) {
if (!StringUtils.isEmpty(routeProcessCell.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCellCode(), "workCellCode", packBean);
}
if (StringUtils.isNotEmpty(routeProcessCell.getWorkCenterCode())) {
if (!StringUtils.isEmpty(routeProcessCell.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCenterCode(), "workCenterCode", packBean);
}
@ -745,13 +727,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesBom(MesBom bom, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode);
if (StringUtils.isNotEmpty(bom.getPartNo())) {
if (!StringUtils.isEmpty(bom.getPartNo())) {
DdlPreparedPack.getStringLikerPack(bom.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(bom.getItemPartNo())) {
if (!StringUtils.isEmpty(bom.getItemPartNo())) {
DdlPreparedPack.getStringLikerPack(bom.getItemPartNo(), "itemPartNo", packBean);
}
if (StringUtils.isNotEmpty(bom.getBomVersion())) {
if (!StringUtils.isEmpty(bom.getBomVersion())) {
DdlPreparedPack.getStringLikerPack(bom.getBomVersion(), "bomVersion", packBean);
}
@ -791,10 +773,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode);
if (StringUtils.isNotEmpty(customer.getCustomerCode())) {
if (!StringUtils.isEmpty(customer.getCustomerCode())) {
DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean);
}
if (StringUtils.isNotEmpty(customer.getCustomerName())) {
if (!StringUtils.isEmpty(customer.getCustomerName())) {
DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
}
@ -809,10 +791,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode);
if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())) {
if (!StringUtils.isEmpty(custProdLine.getCustProdLineCode())) {
DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean);
}
if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())) {
if (!StringUtils.isEmpty(custProdLine.getCustProdLineName())) {
DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean);
}
@ -827,13 +809,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesCustomerPart(MesCustomerPart customerPart, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(customerPart, organizeCode);
if (StringUtils.isNotEmpty(customerPart.getCustomerCode())) {
if (!StringUtils.isEmpty(customerPart.getCustomerCode())) {
DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean);
}
if (StringUtils.isNotEmpty(customerPart.getPartNo())) {
if (!StringUtils.isEmpty(customerPart.getPartNo())) {
DdlPreparedPack.getStringLikerPack(customerPart.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())) {
if (!StringUtils.isEmpty(customerPart.getCustomerPartNo())) {
DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean);
}
@ -874,10 +856,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode);
if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())) {
if (!StringUtils.isEmpty(prodCfgType.getProdCfgTypeCode())) {
DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
}
if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())) {
if (!StringUtils.isEmpty(prodCfgType.getProdCfgTypeName())) {
DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean);
}
@ -902,13 +884,13 @@ public class MesHqlPack {
public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode);
if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) {
if (!StringUtils.isEmpty(prodCfg.getProdCfgCode())) {
DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean);
}
if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())) {
if (!StringUtils.isEmpty(prodCfg.getProdCfgName())) {
DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean);
}
if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())) {
if (!StringUtils.isEmpty(prodCfg.getProdCfgTypeCode())) {
DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
}
@ -923,10 +905,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesProdCfgDetail(MesProdCfgDetail prodCfgDetail, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgDetail, organizeCode);
if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())) {
if (!StringUtils.isEmpty(prodCfgDetail.getProdCfgCode())) {
DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean);
}
if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())) {
if (!StringUtils.isEmpty(prodCfgDetail.getPartNo())) {
DdlPreparedPack.getStringLikerPack(prodCfgDetail.getPartNo(), "partNo", packBean);
}
@ -941,19 +923,19 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesPart(MesPart part, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
if (StringUtils.isNotEmpty(part.getPartNo())) {
if (!StringUtils.isEmpty(part.getPartNo())) {
DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(part.getPartName())) {
if (!StringUtils.isEmpty(part.getPartName())) {
DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
}
if (StringUtils.isNotEmpty(part.getCategoryCode1())) {
if (!StringUtils.isEmpty(part.getCategoryCode1())) {
DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), "categoryCode1", packBean);
}
if (StringUtils.isNotEmpty(part.getCategoryCode2())) {
if (!StringUtils.isEmpty(part.getCategoryCode2())) {
DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), "categoryCode2", packBean);
}
if (StringUtils.isNotEmpty(part.getCategoryCode3())) {
if (!StringUtils.isEmpty(part.getCategoryCode3())) {
DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), "categoryCode3", packBean);
}
@ -968,10 +950,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode);
if (StringUtils.isNotEmpty(partCategory.getCategoryCode())) {
if (!StringUtils.isEmpty(partCategory.getCategoryCode())) {
DdlPreparedPack.getStringLikerPack(partCategory.getCategoryCode(), "categoryCode", packBean);
}
if (StringUtils.isNotEmpty(partCategory.getCategoryName())) {
if (!StringUtils.isEmpty(partCategory.getCategoryName())) {
DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean);
}
@ -986,13 +968,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode);
if (StringUtils.isNotEmpty(packSpec.getSpecCode())) {
if (!StringUtils.isEmpty(packSpec.getSpecCode())) {
DdlPreparedPack.getStringLikerPack(packSpec.getSpecCode(), "specCode", packBean);
}
if (StringUtils.isNotEmpty(packSpec.getSpecName())) {
if (!StringUtils.isEmpty(packSpec.getSpecName())) {
DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
}
if (StringUtils.isNotEmpty(packSpec.getParentSpec())) {
if (!StringUtils.isEmpty(packSpec.getParentSpec())) {
DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean);
}
@ -1007,10 +989,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode);
if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())) {
if (!StringUtils.isEmpty(produceCategory.getProduceCategoryCode())) {
DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean);
}
if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())) {
if (!StringUtils.isEmpty(produceCategory.getProduceCategoryName())) {
DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean);
}
@ -1025,7 +1007,7 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode);
if (StringUtils.isNotEmpty(kpsnRule.getPartNo())) {
if (!StringUtils.isEmpty(kpsnRule.getPartNo())) {
DdlPreparedPack.getStringLikerPack(kpsnRule.getPartNo(), "partNo", packBean);
}
@ -1040,10 +1022,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode);
if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())) {
if (!StringUtils.isEmpty(partScheduleBom.getPartNo())) {
DdlPreparedPack.getStringLikerPack(partScheduleBom.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())) {
if (!StringUtils.isEmpty(partScheduleBom.getItemPartNo())) {
DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean);
}
@ -1058,10 +1040,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode);
if (StringUtils.isNotEmpty(objectDao.getObjectCode())) {
if (!StringUtils.isEmpty(objectDao.getObjectCode())) {
DdlPreparedPack.getStringLikerPack(objectDao.getObjectCode(), "objectCode", packBean);
}
if (StringUtils.isNotEmpty(objectDao.getDaoClass())) {
if (!StringUtils.isEmpty(objectDao.getDaoClass())) {
DdlPreparedPack.getStringLikerPack(objectDao.getDaoClass(), "daoClass", packBean);
}
@ -1076,10 +1058,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())) {
if (!StringUtils.isEmpty(pcnSyncCfg.getObjectCode())) {
DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
}
if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())) {
if (!StringUtils.isEmpty(pcnSyncCfg.getPcnCode())) {
DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
}
if (null != pcnSyncCfg.getSyncType()) {
@ -1097,10 +1079,10 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode);
if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())) {
if (!StringUtils.isEmpty(workCellParamCfg.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
}
if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())) {
if (!StringUtils.isEmpty(workCellParamCfg.getParamCode())) {
DdlPreparedPack.getStringLikerPack(workCellParamCfg.getParamCode(), "paramCode", packBean);
}
@ -1115,7 +1097,7 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesWorkCellParam(MesWorkCellParam workCellParam, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParam, organizeCode);
if (StringUtils.isNotEmpty(workCellParam.getParamCode())) {
if (!StringUtils.isEmpty(workCellParam.getParamCode())) {
DdlPreparedPack.getStringLikerPack(workCellParam.getParamCode(), "paramCode", packBean);
}
if (null != workCellParam.getParamType()) {
@ -1136,7 +1118,7 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode);
if (StringUtils.isNotEmpty(workCellPoint.getWorkCellCode())) {
if (!StringUtils.isEmpty(workCellPoint.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean);
}
return packBean;
@ -1150,13 +1132,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesPLCConfigure(MesPLCConfigure plcConfigure, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(plcConfigure, organizeCode);
if (StringUtils.isNotEmpty(plcConfigure.getAreaCode())) {
if (!StringUtils.isEmpty(plcConfigure.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(plcConfigure.getAreaCode(), "areaCode", packBean);
}
if (StringUtils.isNotEmpty(plcConfigure.getWorkCenterCode())) {
if (!StringUtils.isEmpty(plcConfigure.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(plcConfigure.getWorkCellCode())) {
if (!StringUtils.isEmpty(plcConfigure.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCellCode(), "workCellCode", packBean);
}
return packBean;
@ -1172,13 +1154,13 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesNumberRule(MesNumberRule numberRule, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(numberRule, organizeCode);
if (StringUtils.isNotEmpty(numberRule.getRuleCode())) {
if (!StringUtils.isEmpty(numberRule.getRuleCode())) {
DdlPreparedPack.getStringLikerPack(numberRule.getRuleCode(), "ruleCode", packBean);
}
if (StringUtils.isNotEmpty(numberRule.getNumberRule())) {
if (!StringUtils.isEmpty(numberRule.getNumberRule())) {
DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean);
}
if (StringUtils.isNotEmpty(numberRule.getPrefix())) {
if (!StringUtils.isEmpty(numberRule.getPrefix())) {
DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean);
}
if (null != numberRule.getIsCycle()) {
@ -1244,7 +1226,7 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesButtonStatus(MesButtonStatus buttonStatus, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(buttonStatus, organizeCode);
if (StringUtils.isNotEmpty(buttonStatus.getButtonCode())) {
if (!StringUtils.isEmpty(buttonStatus.getButtonCode())) {
DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean);
}
packBean.setOrderByStr(buttonStatus.orderBy());
@ -1260,10 +1242,10 @@ public class MesHqlPack {
public static DdlPackBean getApprovalData(MesWorkOrder mesWorkOrder, String organizeCode) {
DdlPackBean packBean = MesHqlPack.getAllBaseData(organizeCode);
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean);
}
DdlPreparedPack.getNumEqualPack(MesEnumUtil.WORK_ORDER_APPROVAL_STATUS.WAIT_APPROVAL.getValue(), "approvalStatus", packBean);
@ -1271,4 +1253,5 @@ public class MesHqlPack {
DdlPreparedPack.getOrderByPack(new String[]{String.valueOf(CommonEnumUtil.ASC_OR_DESC.ASC.getValue())}, new String[]{"startTime", "shiftCode"}, packBean);
return packBean;
}
}

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

@ -0,0 +1,23 @@
package cn.estsh.i3plus.pojo.model.platform;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : 打印模板封装model
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-10-09 14:15
* @Modify:
**/
@Data
public class LabelTemplatePagerModel implements Serializable {
private static final long serialVersionUID = 8331125246534692455L;
private SysLabelTemplate labelTemplate;
private Pager pager;
}

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

@ -5,7 +5,6 @@ import cn.estsh.i3plus.pojo.softswitch.bean.*;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.Serializable;

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

@ -17,14 +17,18 @@ public class SuitParamModel {
/* 标签名称 */
private String tagName;
/* 标签 id 属性值 */
/* 标签 Class Path */
private String classPath;
/* 标签 调用的方法名称 */
private String methodName;
/* 标签 id 属性值 */
private String id;
/* 标签 name 属性值 */
private String name;
/* 标签唯一标识 */
private String pathKey;
/* 标签内容 */
private String value;
private String vaule;
/* 标签类型 Default:PARAM_VALUE_TYPE.STRING */
private Integer type; // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE

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

@ -7,9 +7,11 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
@ -37,6 +39,16 @@ public class SysLabelTemplate extends BaseBean {
@ApiParam(value ="模板名称")
private String templateName;
//枚举 CommonEnumUtil.SOFT_TYPE
@Column(name="TEMPLATE_SOFT_TYPE")
@ApiParam(value ="模板所属模块")
private Integer templateSoftType;
//枚举 CommonEnumUtil.SOFT_TYPE
@Column(name="TEMPLATE_GROUP_ID")
@ApiParam(value ="模板分组")
private Integer templateGroupId;
@Lob
@Column(name="TEMPLATE_CONTENT")
@ApiParam(value ="模板内容")

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

@ -65,5 +65,5 @@ public class SysLocaleResource extends BaseBean {
//系统自带需要有初始化表，只能修改value，无法删除。
@Column(name="is_system")
@ApiParam(value = "是否系统参数",example = "2")
private Integer isSystem = 2;
private Integer isSystem;
}

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

@ -4,11 +4,32 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule;
import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import cn.estsh.i3plus.pojo.platform.bean.SysFile;
import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.bean.SysTask;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
import cn.estsh.i3plus.pojo.platform.bean.SysTool;
import cn.estsh.i3plus.pojo.platform.bean.SysToolType;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@ -849,17 +870,19 @@ public class CoreHqlPack {
* @param sysLabelTemplate
* @return
*/
public static String packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {
DdlPackBean ddlPackBean = new DdlPackBean();
// hql拼接
HqlPack.getStringLikerPack(sysLabelTemplate.getTemplateName(),"templateName",result);
HqlPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",result);
DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean);
DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean);
DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateGroupId(), "templateGroupId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateSoftType(), "templateSoftType", ddlPackBean);
// 添加默认排序
HqlPack.getOrderDefault(sysLabelTemplate);
ddlPackBean.setOrderByStr(sysLabelTemplate.orderBy());
return result.toString();
return ddlPackBean;
}
public static DdlPackBean packBeanSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {

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

@ -69,6 +69,10 @@ public class BsSuitSchedule extends BaseBean {
@ApiParam(value = "任务周期表达式表达式")
private String taskCycleExecuteRdd;
@Column(name = "SUIT_PARAM")
@ApiParam(value = "适配参数")
private String suitParam;
@Column(name = "LAST_EXECUTE_DATE_TIME")
@ApiParam(value = "最后一次执行时间")
private String lastExecuteDateTime;

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

@ -42,7 +42,7 @@ public class AmpJisRec extends BaseBean{
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

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

@ -42,7 +42,7 @@ public class AmpStockCurrent extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;

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

@ -46,7 +46,7 @@ public class SapDocFgSum extends BaseBean {
@ApiParam("单位")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@ -75,7 +75,7 @@ public class SapDocFgSum extends BaseBean {
@ApiParam("子计量单位")
public String itemUnit;
@Column(name="ITEM_QTY")
@Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "子用量", example = "0")
public Double itemQty;

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

@ -45,7 +45,7 @@ public class WmsASNMasterDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@ -112,7 +112,7 @@ public class WmsASNMasterDetails extends BaseBean {
@ApiParam("供应商批次")
public String vendorLotNo;
@Column(name = "REC_QTY")
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已收数量", example = "0")
public Double recQty;

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

@ -43,7 +43,7 @@ public class WmsBom extends BaseBean {
@ApiParam(value = "计量单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量")
private Double qty;
@ -59,7 +59,7 @@ public class WmsBom extends BaseBean {
@ApiParam(value = "子计量单位")
private String itemUnit;
@Column(name = "ITEM_QTY")
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "子用量")
private Double itemQty;

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

@ -40,7 +40,7 @@ public class WmsBomTotal extends BaseBean {
@ApiParam("计量单位")
private String UNIT;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam("数量")
private Double qty;
@ -56,7 +56,7 @@ public class WmsBomTotal extends BaseBean {
@ApiParam(value = "子计量单位")
private String itemUnit;
@Column(name = "ITEM_QTY")
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "子用量")
private Double itemQty;

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

@ -61,7 +61,7 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("条码")
public String sn;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "库存数量", example = "0")
public Double qty;
@ -70,7 +70,7 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("单位")
public String unit;
@Column(name="FACT_QTY")
@Column(name="FACT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "实盘数量", example = "0")
public Double factQty;

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

@ -44,7 +44,7 @@ public class WmsCSOrderDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;

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

@ -66,11 +66,11 @@ public class WmsCheckFactRecord extends BaseBean {
@ApiParam("备注")
public String remark;
@Column(name="PLAN_QTY")
@Column(name="PLAN_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "应收数量", example = "0")
public Double planQty;
@Column(name="CHECK_QTY")
@Column(name="CHECK_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "抽点数量", example = "0")
public Double checkQty;

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

@ -66,7 +66,7 @@ public class WmsDocFgDetail extends BaseBean {
@ApiParam("BOM切换标识")
public String bomUpdate;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@ -91,7 +91,7 @@ public class WmsDocFgDetail extends BaseBean {
@ApiParam("子计量单位")
public String itemUnit;
@Column(name="ITEM_QTY")
@Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "子用量", example = "0")
public Double itemQty;

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

@ -46,7 +46,7 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@ -83,7 +83,7 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("目标库位代码")
public String destLocateNo;
@Column(name = "PRINT_QTY")
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "1")
private Double printQty;
@ -119,22 +119,22 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "操作原因")
private String remark;
@Column(name = "PICK_QTY")
@Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已拣货数量", example = "1")
private Double pickQty;
@Column(name = "OUT_QTY")
@Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已出库数量", example = "1")
private Double outQty;
@Column(name = "REC_QTY")
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
@Column(name = "MOVE_QTY")
@Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已移库数量", example = "1")
private Double moveQty;

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

@ -52,7 +52,7 @@ public class WmsDocMovementSn extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

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

@ -46,7 +46,7 @@ public class WmsFGInStock extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;

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

@ -59,15 +59,15 @@ public class WmsLineLocatePart extends BaseBean {
return isGeneratePicklist== null ? 0: this.isGeneratePicklist.intValue();
}
@Column(name = "PULL_QTY")
@Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "拉动数量")
private Double pullQty;
@Column(name = "Max")
@Column(name = "Max", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大值")
private Double max;
@Column(name = "Min")
@Column(name = "Min", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最小值")
private Double min;

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

@ -77,7 +77,7 @@ public class WmsLocate extends BaseBean {
@ApiParam(value = "最大包装数量", example = "-1")
private Integer maxPackageQty;
@Column(name = "MAX_PART_QTY")
@Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大零件数量", example = "-1")
private Double maxPartQty;
@ -93,7 +93,7 @@ public class WmsLocate extends BaseBean {
@ApiParam(value = "箱数", example = "-1")
private Integer boxQty;
@Column(name = "PART_QTY")
@Column(name = "PART_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "零件数", example = "-1")
private Double partQty;

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

@ -42,15 +42,15 @@ public class WmsLocatePart extends BaseBean {
@ApiParam(value = "物料名称")
private String partNameRdd;
@Column(name = "PULL_QTY")
@Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "拉动数量", example = "0")
private Double pullQty;
@Column(name = "MAX")
@Column(name = "MAX", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大值", example = "0")
private Double max;
@Column(name = "MIN")
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最小值", example = "0")
private Double min;

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

@ -24,7 +24,7 @@ import javax.persistence.*;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_MOVE_DETAILS", indexes = {
@Table(name = "WMS_MOVE_DETAILS", indexes = {
@Index(columnList = "PART_NO"),
@Index(columnList = "ORDER_NO"),
@Index(columnList = "ORGANIZE_CODE")
@ -33,94 +33,94 @@ import javax.persistence.*;
public class WmsMoveDetails extends BaseBean {
private static final long serialVersionUID = -5898637337319011710L;
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
@Column(name="ITEM")
@Column(name = "ITEM")
@ApiParam(value = "行号", example = "0")
public Integer item;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="VENDOR_NO")
@Column(name = "VENDOR_NO")
@ApiParam("供应商编号")
public String vendorNo;
@Column(name="CUST_NO")
@Column(name = "CUST_NO")
@ApiParam("客户编号")
public String custNo;
@Column(name="TRANS_QTY")
@Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
public Double getTransQty(){
public Double getTransQty() {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
@Column(name="REJECT_QTY")
@Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;
public Double getRejectQty(){
public Double getRejectQty() {
return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
}
@Column(name="UNIT")
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Column(name="SRC_WH_NO")
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
public String srcWhNo;
@Column(name="SRC_ZONE_NO")
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
public String srcZoneNo;
@Column(name="SRC_LOCATE_NO")
@Column(name = "SRC_LOCATE_NO")
@ApiParam("源库位代码")
public String srcLocateNo;
@Column(name="DEST_WH_NO")
@Column(name = "DEST_WH_NO")
@ApiParam("目标仓库代码")
public String destWhNo;
@Column(name="DEST_ZONE_NO")
@Column(name = "DEST_ZONE_NO")
@ApiParam("目标存储区代码")
public String destZoneNo;
@Column(name="DEST_LOCATE_NO")
@Column(name = "DEST_LOCATE_NO")
@ApiParam("目标库位代码")
public String destLocateNo;
/**
* 状态:1=创建,10=待处理,20=已处理
*/
@Column(name="ITEM_STATUS")
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
public Integer itemStatus;
@Column(name="REF_ITEM")
@Column(name = "REF_ITEM")
@ApiParam("关联单据行号")
public String refItem;
/**
* ASN,PO,SO
*/
@Column(name="REF_TYPE")
@Column(name = "REF_TYPE")
@ApiParam("关联单据类型")
public String refType;
@Column(name="REF_SRC")
@Column(name = "REF_SRC")
@ApiParam("关联单号")
public String refSrc;
@ -150,7 +150,7 @@ public class WmsMoveDetails extends BaseBean {
@Transient
@ApiParam("业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
private Integer busiTypeCode;
@Transient
@ -176,7 +176,7 @@ public class WmsMoveDetails extends BaseBean {
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public Integer lockVersion;
public Integer lockVersion;
@Transient
@ApiParam(value = "快照时间")
@ -200,20 +200,21 @@ public class WmsMoveDetails extends BaseBean {
return fPartName;
}*/
public WmsMoveDetails(){}
public WmsMoveDetails() {
}
public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
public WmsMoveDetails(String partNo, Long waitingCounts, Long finishedCounts) {
this.partNo = partNo;
this.waitingCounts = waitingCounts;
this.finishedCounts = finishedCounts;
}
public WmsMoveDetails(String partNo, double transQty){
public WmsMoveDetails(String partNo, double transQty) {
this.partNo = partNo;
this.transQty = transQty;
}
public WmsMoveDetails(String orderNo){
public WmsMoveDetails(String orderNo) {
this.orderNo = orderNo;
}
@ -225,8 +226,8 @@ public class WmsMoveDetails extends BaseBean {
return finishedCounts == null ? 0L : this.finishedCounts;
}
public WmsMoveDetails (String organizeCode,String partNo,String partNameRdd,String workCenterCode,String fPartNo,String fPartName,String unit,Double qty,
String createDateTime,String sn,String srcZoneNo){
public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty,
String createDateTime, String sn, String srcZoneNo) {
this.organizeCode = organizeCode;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
@ -241,11 +242,11 @@ public class WmsMoveDetails extends BaseBean {
}
public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,
Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode,
String createUser,String createDatetime,String modifyUser,String modifyDatetime){
public WmsMoveDetails(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, String transTypeCode
, String transTypeName, Integer itemStatus, String unit, String srcWhNo, String destWhNo,
String srcZoneNo, String destZoneNo, String srcLocateNo, String destLocateNo,
Double transQty, Double rejectQty, String refSrc, String vendorNo, String custNo, Integer busiTypeCode,
String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.organizeCode = organizeCode;
this.partNo = partNo;
this.orderNo = orderNo;
@ -269,7 +270,7 @@ public class WmsMoveDetails extends BaseBean {
this.busiTypeCode = busiTypeCode;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyDatetime =modifyDatetime;
this.modifyUser =modifyUser;
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
}

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

@ -83,7 +83,7 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("容器编号")
public String packAgeNo;
@Column(name = "SRC_QTY")
@Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "源数量", example = "0")
public Double srcQty;
@ -120,12 +120,12 @@ public class WmsMoveSn extends BaseBean {
@Transient
private Long finishedCounts;
@Column(name = "DEST_QTY")
@Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "目标数量", example = "0")
public Double destQty;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

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

@ -84,11 +84,11 @@ public class WmsMoveToERP extends BaseBean {
@ApiParam("客户编号")
public String custNo;
@Column(name="TRANS_QTY")
@Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@Column(name="REJECT_QTY")
@Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;
@ -142,7 +142,7 @@ public class WmsMoveToERP extends BaseBean {
@ApiParam("关联单位")
public String refUnit;
@Column(name="REF_QTY")
@Column(name="REF_QTY", columnDefinition = "decimal(18,8)")
@ApiParam("关联数量")
public Double refQty;

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

@ -50,7 +50,7 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("行号")
private Integer item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
private Double qty;
@ -67,28 +67,28 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("订单号")
private String orderNo;
@Column(name = "PRINT_QTY")
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "0")
private Double printQty;
//private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; }
@Column(name = "RC_QTY")
@Column(name = "RC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
private Double rcQty;
//private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; }
@Column(name = "PASS_QTY")
@Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检合格数量", example = "0")
private Double passQty;
//private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; }
@Column(name = "NG_QTY")
@Column(name = "NG_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检不合格数量", example = "0")
private Double ngQty;
@ -114,7 +114,7 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("状态")
private Integer itemStatus;
@Column(name = "SNP")
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam("标准包装")
private Double snp;

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

@ -41,11 +41,11 @@ public class WmsPackSn extends BaseBean {
@ApiParam(value = "物料名称")
private String partNameAdd;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam("数量")
private Double qty;
@Column(name = "SID")
@Column(name = "SID", columnDefinition = "decimal(18,8)")
@ApiParam("SID")
private Double sId;

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

@ -74,7 +74,7 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "采购单位")
private String buyUnit;
@Column(name = "BU2SU")
@Column(name = "BU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率1", example = "1")
private Double bu2su;
@ -82,11 +82,11 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "计价单位")
private String priceUnit;
@Column(name = "PU2SU")
@Column(name = "PU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率2", example = "1")
private Double pu2su;
@Column(name = "SNP")
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标准包装", example = "1")
private Double snp;
@ -95,11 +95,11 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "是否免检", example = "1")
private Integer iqc;
@Column(name = "MIN")
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最低库存", example = "1")
private Double min;
@Column(name = "MAX")
@Column(name = "MAX", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最高库存", example = "1")
private Double max;

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -46,6 +48,7 @@ public class WmsPartRelation extends BaseBean {
@Column(name = "ASSOCIATE_TYPE")
@ApiParam(value = "关联类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.PART_ASSOCIATE_TYPE.class, refForeignKey = "value", value = "description")
private Integer associateType;
}

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

@ -51,7 +51,7 @@ public class WmsPoSn extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@ -84,7 +84,7 @@ public class WmsPoSn extends BaseBean {
@ApiParam("组条码")
public String groupNo;
@Column(name="REC_QTY")
@Column(name="REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
public Double recQty;

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

@ -56,5 +56,9 @@ public class WmsProductReturnMovement implements Serializable{
@AnnoOutputColumn
private String planTime;
@ApiParam("移动类型")
@AnnoOutputColumn
public Integer moveType;
}

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

@ -42,7 +42,7 @@ public class WmsQCDetails extends BaseBean {
@ApiParam("行号")
public String item;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@ -67,17 +67,17 @@ public class WmsQCDetails extends BaseBean {
public String remark;
@Column(name = "FACT_QTY")
@Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "实检数量", example = "0")
public Double factQty;
@Column(name = "PASS_QTY")
@Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "合格数量", example = "0")
public Double passQty;
@Column(name = "REJECT_QTY")
@Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
public Double rejectQty;

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

@ -44,7 +44,7 @@ public class WmsShipping extends BaseBean {
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -44,7 +46,7 @@ public class WmsSnOperateRecord extends BaseBean {
@ApiParam(value = "库位代码")
private String locateNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量", example = "0")
private Double qty = 0d;
@ -70,6 +72,7 @@ public class WmsSnOperateRecord extends BaseBean {
@Column(name = "OPERATE_TYPE")
@ApiParam(value = "操作类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description")
private Integer operateType;
}

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

@ -61,7 +61,7 @@ public class WmsSnPrintRcd extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;

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

@ -60,12 +60,12 @@ public class WmsStockInitialize extends BaseBean {
@AnnoOutputColumn
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "可用数量", example = "0")
@AnnoOutputColumn
private Double qty = 0d;
@Column(name = "SNP")
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标准包装", example = "1")
@AnnoOutputColumn
private Double snp;

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

@ -79,47 +79,47 @@ public class WmsStockQuan extends BaseBean {
private WmsLocate wmsLocate;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "FAIL_QTY")
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
@Column(name = "SCRAP_QTY")
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;

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

@ -109,7 +109,7 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量", example = "0")
private Double qty = 0d;
@ -244,6 +244,18 @@ public class WmsStockSn extends BaseBean {
private String snapshotTime;
@Transient
@ApiParam(value = "模板编号")
private String templateNo;
@Transient
@ApiParam(value = "客户物料号")
private String customerPartNo;
@Transient
@ApiParam(value = "箱号")
private String boxNo;
@Transient
private Integer isSnapshot;
public WmsStockSn() {
@ -286,4 +298,15 @@ public class WmsStockSn extends BaseBean {
this.isDeleted = isDeleted;
this.isValid = isValid;
}
public WmsStockSn(Integer snStatus,String whNo,String locateNo,String partNo,String partNameRdd,String lotNo,Double qty){
this.snStatus=snStatus;
this.whNo = whNo;
this.locateNo = locateNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.lotNo = lotNo;
this.qty = qty;
}
}

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

@ -64,12 +64,12 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "1")
private Double qty;
@Column(name = "TRANS_QTY")
@Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "处理数量", example = "1")
private Double transQty;

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

@ -58,7 +58,7 @@ public class WmsTrans extends BaseBean{
@ApiParam(value ="交易状态",example = "1")
private Integer transStatus;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value ="需求数")
private Double qty;

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

@ -98,47 +98,47 @@ public class WmsTransQuan extends BaseBean {
@ApiParam(value = "错误信息")
private String errorMessage;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "FAIL_QTY")
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
@Column(name = "SCRAP_QTY")
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;

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

@ -58,7 +58,7 @@ public class WmsTransRcd extends BaseBean{
@ApiParam(value ="交易状态",example = "1")
private Integer transStatus;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value ="需求数")
private Double qty;

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

@ -66,12 +66,12 @@ public class WmsTransSn extends BaseBean {
@ApiParam("事务代码")
public String transCode;
@Column(name="QTY")
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "交易数量", example = "0")
public Double qty;
@Column(name="REJECT_QTY")
@Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格交易数量", example = "0")
public Double rejectQty;

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

@ -37,7 +37,7 @@ public class WmsUnitConvert extends BaseBean {
@ApiParam(value = "目标单位")
private String destUnitCode;
@Column(name = "UNIT_COEFFICIENT")
@Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率")
private Double unitCoefficient;

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

@ -63,7 +63,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
@ApiParam("客户编号")
public String custNo;
@Column(name="TRANS_QTY")
@Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@ -71,7 +71,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
@Column(name="REJECT_QTY")
@Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java
Unescape Escape View File

@ -89,7 +89,7 @@ public class WmsMoveSnSnapshot extends BaseBean {
@ApiParam("容器编号")
public String packAgeNo;
@Column(name = "SRC_QTY")
@Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "源数量", example = "0")
public Double srcQty;
@ -126,12 +126,12 @@ public class WmsMoveSnSnapshot extends BaseBean {
@Transient
private Long finishedCounts;
@Column(name = "DEST_QTY")
@Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "目标数量", example = "0")
public Double destQty;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;

18
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java
Unescape Escape View File

@ -87,47 +87,47 @@ public class WmsStockQuanSnapshot extends BaseBean {
private WmsLocate wmsLocate;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "FAIL_QTY")
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
@Column(name = "SCRAP_QTY")
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java
Unescape Escape View File

@ -116,7 +116,7 @@ public class WmsStockSnSnapshot extends BaseBean {
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "数量", example = "0")
private Double qty = 0d;

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

@ -0,0 +1,18 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
import org.springframework.stereotype.Repository;
/**
* @Description :供应商编码
* @Reference :
* @Author : libiwei
* @CreateDate : 2018-11-06 13:40
* @Modify:
**/
@Repository
public interface WmsBasVendorRepository extends BaseRepository<BasVendor,Long> {
}

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

@ -1533,19 +1533,13 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getNumNOEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result);
result.setOrderByStr(wmsStockSn.orderBy());
if(wmsStockSn.getPrinted()!= null){
if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result);
}
}
getStringBuilderPack(wmsStockSn, result);
return result;
}
@ -2279,7 +2273,7 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
//数量大于0
DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "qty", result);
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
@ -2378,8 +2372,7 @@ public class WmsHqlPack {
}
/**
/**
* 业务：库存查询封装
*
* @param wmsStockQuan
@ -2388,23 +2381,23 @@ public class WmsHqlPack {
public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
getStringBuilderPack(wmsRouting, result);
return result;
}
public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getInPack(wmsRoutingRule.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRoutingRule.getIsDeleted(), "isDeleted", result);
getStringBuilderPack(wmsRoutingRule, result);
@ -2433,7 +2426,7 @@ public class WmsHqlPack {
}
/**
* 接口映射分页查询条件
* 打印机管理信息分页查询条件
*
* @param wmsPrinterConfigure
* @return
@ -2448,4 +2441,22 @@ public class WmsHqlPack {
return result;
}
/**
* 待打印队列信息分页查询条件
*
* @param wmsPrintingQueue
* @return
*/
public static DdlPackBean packHqlwmsPrintingQueueByPrintNo(WmsPrintingQueue wmsPrintingQueue) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsPrintingQueue.getPrintNo(), "printNo", result);
DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result);
DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result);
getStringBuilderPack(wmsPrintingQueue, result);
return result;
}
}

Write Preview
Loading…
Cancel
Save