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

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

Browse Source
yun-zuoyi
jiajack 6 years ago
parent 3980e05d2b 7e4bcf5dff
commit a7450b71fc
65 changed files with 1228 additions and 368 deletions
Show Stats Download Patch File Download Diff File

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

@ -18,23 +18,45 @@ public class BaseFallBackBean {
// LOGGER.error("【微服出错，熔断】{}",cause.getCause());
// cause.printStackTrace();
/**
* 基本熔断信息封装方法
* @param cause 错误原因
* @return 基础结果类
*/
public BaseResultBean makeBaseFallBack(Throwable cause){
LOGGER.error("【熔断信息】{}",cause.getMessage());
LOGGER.error("【熔断原因】{}",cause.getCause());
return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。",cause);
LOGGER.error("【熔断信息】{}", cause.getMessage());
LOGGER.error("【熔断原因】{}", cause.getCause());
cause.printStackTrace();
return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。", cause);
}
public BaseResultBean makeBaseFallBack(String msg,Throwable cause){
LOGGER.error("【熔断信息】{}",cause.getMessage());
LOGGER.error("【熔断原因】{}",cause.getCause());
return BaseResultBean.buildBaseResultBean(false,cause.getMessage() + "，信息：" + msg);
/**
* 自定义熔断信息封装方法
* @param msg 错误提示
* @param cause 错误原因
* @return 基础结果类
*/
public BaseResultBean makeBaseFallBack(String msg, Throwable cause){
LOGGER.error("【熔断信息】{}", cause.getMessage());
LOGGER.error("【熔断原因】{}", cause.getCause());
cause.printStackTrace();
return BaseResultBean.buildBaseResultBean(false, cause.getMessage() + "，信息：" + msg);
}
/**
* 简化熔断信息方法
* @return 基础结果类
*/
public BaseResultBean makeBaseFallBack(){
return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。");
}
/**
* 自定义简化熔断方法
* @param msg 自定义信息
* @return 基础结果类
*/
public BaseResultBean makeBaseFallBack(String msg){
return BaseResultBean.buildBaseResultBean(false,msg);
return BaseResultBean.buildBaseResultBean(false, msg);
}
}

177
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
Unescape Escape View File

@ -1,12 +1,6 @@
package cn.estsh.i3plus.pojo.base.dynamic;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.google.common.base.CaseFormat;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -14,8 +8,6 @@ import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -32,14 +24,9 @@ public class DynamicEntity extends BaseBean implements Serializable {
public static final Logger LOGGER = LoggerFactory.getLogger(DynamicEntity.class);
public String tableName;
/*private String uri;
private String method;
private Object[] args;
private Object result;
private String operator;
private String appName;*/
private static final String ATTR_PREFIX = "$cglib_prop_";
public String tableName;
public List<String> propertyList;
public DynamicEntity(){
@ -71,67 +58,14 @@ public class DynamicEntity extends BaseBean implements Serializable {
*/
public void initDynamic() {
Field[] fields = this.getClass().getDeclaredFields();
Method setMethod = null;
String setMethodName,propName;
Object fieldVal = null;
for(Field f : fields) {
propName = f.getName().replace("$cglib_prop_", "");
if(!"LOGGER".equals(propName) && !"propertyList".equals(propName) && !"dynProperty".equals(propName)) {
this.getPropertyList().add(propName); //添加到属性list中
setMethodName = "set" + propName.substring(0,1).toUpperCase() + propName.substring(1);
f.setAccessible(true);
try {
fieldVal = f.get(this);
} catch (IllegalAccessException e) {
fieldVal = null;
}
if(fieldVal == null) {
if (f.getType() == Integer.class) {
fieldVal = 0;
} else if (f.getType() == Long.class) {
fieldVal = 0L;
} else if (f.getType() == Float.class) {
fieldVal = 0.0f;
} else if (f.getType() == Double.class) {
fieldVal = 0.0d;
} else if (f.getType() == String.class) {
fieldVal = "";
}else if (f.getType() == Character.class) {
fieldVal = "";
}else if (f.getType() == Boolean.class) {
fieldVal = true;
}else if (f.getType() == Byte.class) {
fieldVal = 0;
}else if (f.getType() == Date.class) {
fieldVal = new Date();
}else {
fieldVal = "";
}
}
try {
setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{f.getType()});
// System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal);
setMethod.invoke(this, fieldVal);
} catch (ClassCastException e) {
e.printStackTrace();
LOGGER.error("ClassCastException ：{}", setMethodName, e);
} catch (IllegalArgumentException e) {
e.printStackTrace();
LOGGER.error("IllegalArgumentException ：{}", setMethodName, e);
} catch (NoSuchMethodException e) {
LOGGER.error("没有方法：{}", setMethodName, e);
} catch (IllegalAccessException e) {
LOGGER.error("入参出错：{}:{}:{}", f, f.getType(), fieldVal, e);
} catch (InvocationTargetException e) {
LOGGER.error("方法返回出错：{}", setMethodName, e);
}catch (RuntimeException e) {
LOGGER.error("RuntimeException ：{}", setMethodName, e);
}catch (Exception e) {
LOGGER.error("Exception ：{}", setMethodName, e);
}
String propName = f.getName().replace(ATTR_PREFIX, "");
if(!"LOGGER".equals(propName) && !"ATTR_PREFIX".equals(propName)
&& !"propertyList".equals(propName) && !"dynProperty".equals(propName) ) {
// 添加到属性list中
this.getPropertyList().add(propName);
// 属性初始化
setDynProperty(propName,getDynProperty(propName));
}
}
}
@ -140,31 +74,13 @@ public class DynamicEntity extends BaseBean implements Serializable {
public String toString() {
String result = "{";
Object fieldVal = null;
Field[] fields = this.getClass().getDeclaredFields();
String fieldName;
for(Field f : fields) {
fieldName = f.getName().replace("$cglib_prop_", "");
if(!"LOGGER".equals(fieldName) && !"propertyList".equals(fieldName)) {
f.setAccessible(true);
fieldVal = new Object();
try {
fieldVal = f.get(this);
} catch (IllegalAccessException e) {
fieldVal = null;
}
if (fieldVal == null) {
if (f.getType() == Integer.class || f.getType() == Long.class) {
fieldVal = 0;
} else if (f.getType() == Float.class || f.getType() == Double.class) {
fieldVal = 0.0;
} else {
fieldVal = "";
}
}
String fieldName = f.getName().replace(ATTR_PREFIX, "");
if (!"LOGGER".equals(fieldName) && !"ATTR_PREFIX".equals(fieldName)
&& !"propertyList".equals(fieldName) && !"dynProperty".equals(fieldName)) {
result += "\"" + fieldName + "\":\"" + fieldVal + "\",";
result += "\"" + fieldName + "\":\"" + getDynProperty(fieldName) + "\",";
}
}
if(fields.length > 0) {
@ -187,7 +103,6 @@ public class DynamicEntity extends BaseBean implements Serializable {
/**
* 根据属性名，设置属性值
* //TODO wei.peng 设置为空时会无效
* @param propName
* @param val
* @throws InvocationTargetException
@ -195,12 +110,10 @@ public class DynamicEntity extends BaseBean implements Serializable {
* @throws NoSuchMethodException
*/
public void setDynProperty(String propName,Object val){
//初始化set方法
String setMethodName = "set" + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, propName);
//获取方法
Method setMethod = null;
String setMethodName = "set" + propName.substring(0,1).toUpperCase() + propName.substring(1);
try {
setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
val = getValue(propName,val);
Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
setMethod.invoke(this, val);
} catch (NoSuchMethodException e) {
LOGGER.error("没有方法：{}",setMethodName,e);
@ -211,23 +124,12 @@ public class DynamicEntity extends BaseBean implements Serializable {
}
}
/**
* 获取属性值
* @param propName
* @return
* @throws NoSuchMethodException
* @throws InvocationTargetException
* @throws IllegalAccessException
*/
public Object getDynProperty(String propName){
//初始化set方法
String setMethodName = "get" + propName.substring(0,1).toUpperCase() + propName.substring(1);
Object result = null;
try {
//获取方法
Method getMethod = this.getClass().getDeclaredMethod(setMethodName);
//实现方法
return getMethod.invoke(this);
result = getMethod.invoke(this);
} catch (NoSuchMethodException e) {
LOGGER.error("没有方法：{}:{}",setMethodName,propName,e);
} catch (IllegalAccessException e) {
@ -235,7 +137,7 @@ public class DynamicEntity extends BaseBean implements Serializable {
} catch (InvocationTargetException e) {
LOGGER.error("方法返回出错：{}",setMethodName,e);
}
return null;
return getValue(propName,result);
}
public List<String> getPropertyList() {
@ -245,4 +147,45 @@ public class DynamicEntity extends BaseBean implements Serializable {
public void setPropertyList(List<String> propertyList) {
this.propertyList = propertyList;
}
/**
* 获取默认值
* @param propName
* @param val
* @return
*/
public Object getValue(String propName,Object val){
if(val == null){
try {
Field field = this.getClass().getDeclaredField(ATTR_PREFIX + propName);
if (field.getType() == Integer.class) {
val = 0;
} else if (field.getType() == Long.class) {
val = 0L;
} else if (field.getType() == Float.class) {
val = 0.0f;
} else if (field.getType() == Double.class) {
val = 0.0d;
} else if (field.getType() == String.class) {
val = "";
}else if (field.getType() == Character.class) {
val = "";
}else if (field.getType() == Boolean.class) {
val = true;
}else if (field.getType() == Byte.class) {
val = 0;
}else if (field.getType() == Date.class) {
val = new Date();
}else {
val = "";
}
}catch (NoSuchFieldException e){
LOGGER.error("没有指定属性：{}:{}",propName,e);
}catch (SecurityException e){
LOGGER.error("获取属性安全错误：{}",propName,e);
}
}
return val;
}
}

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

@ -1055,7 +1055,99 @@ public class BlockFormEnumUtil {
return tmp;
}
public Object getPropertyVirtual(Object ... objs){
if(this.getValue() == STRING_SPLICE.getValue()){
return getPropertyVirtualString(objs);
}else if(this.getValue() == NUM_ADD.getValue()){
return getPropertyVirtualDoubleAdd(objs);
}else if(this.getValue() == NUM_LESS.getValue()){
return getPropertyVirtualDoubleLess(objs);
}else if(this.getValue() == NUM_MAKE.getValue()){
return getPropertyVirtualDoubleMake(objs);
}else if(this.getValue() == NUM_DIVISION.getValue()){
return getPropertyVirtualDoubleDivision(objs);
}
return objs;
}
private String getPropertyVirtualString(Object ... objs){
if(objs != null && objs.length > 0){
StringBuffer result = new StringBuffer();
for (Object o : objs) {
result.append(o == null ? "" : o.toString());
}
return result.toString();
}
return null;
}
private Double getPropertyVirtualDoubleAdd(Object ... objs){
if(objs != null && objs.length > 0){
Double result = new Double(0);
for (Object o : objs) {
try {
if(o != null){
result += Double.parseDouble(o.toString());
}
}catch (Exception e){
e.printStackTrace();
}
}
return result;
}
return null;
}
private Double getPropertyVirtualDoubleLess(Object ... objs){
if(objs != null && objs.length > 0){
Double result = new Double(0);
for (Object o : objs) {
try {
if(o != null){
result -= Double.parseDouble(o.toString());
}
}catch (Exception e){
e.printStackTrace();
}
}
return result;
}
return null;
}
private Double getPropertyVirtualDoubleMake(Object ... objs){
if(objs != null && objs.length > 0){
Double result = new Double(0);
for (Object o : objs) {
try {
if(o != null){
result *= Double.parseDouble(o.toString());
}
}catch (Exception e){
e.printStackTrace();
}
}
return result;
}
return null;
}
private Double getPropertyVirtualDoubleDivision(Object ... objs){
if(objs != null && objs.length > 0){
Double result = new Double(0);
for (Object o : objs) {
try {
if(o != null){
result /= Double.parseDouble(o.toString());
}
}catch (Exception e){
e.printStackTrace();
}
}
return result;
}
return null;
}
}
/**
@ -1813,4 +1905,111 @@ public class BlockFormEnumUtil {
}
}
/**
* 数据状态
* 1 启用
* 2 禁用
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_STATUS {
ENABLE(1, "启用", "fa fa-success cell-fa fa-check"),
DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle");
private int value;
private String name;
private String description;
DATA_STATUS() {
}
DATA_STATUS(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getName() {
return name;
}
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].getName();
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 按钮位置类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BUTTON_POSITION_TYPE {
FORM_METHOD(1, "FORM_METHOD", "表单功能"),
FORM_METHOD_DETAIL(2, "FORM_ETHOD_DETAIL", "表单功能明细");
private int value;
private String name;
private String description;
BUTTON_POSITION_TYPE(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getName() {
return name;
}
public static BUTTON_POSITION_TYPE valueOf(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

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

@ -521,6 +521,10 @@ public class CommonEnumUtil {
return value;
}
public String getValueStr() {
return value + "";
}
public String getDescription() {
return description;
}

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

@ -423,12 +423,14 @@ public class ImppEnumUtil {
* 用户消息类型
* 1.NOTICE：通知
* 2.STATION_LETTER：站内信
* 3.SWEB_NOTICE：SWEB通知
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_TYPE {
MAIL(1,"邮件","邮件"),
LETTER(2,"站内信","站内信");
LETTER(2,"站内信","站内信"),
SWEB_NOTICE(3,"SWEB通知","SWEB通知");
private int value;
private String name;
@ -1079,4 +1081,72 @@ public class ImppEnumUtil {
return tmp;
}
}
/**
* 附件来源
* 1.NOTICE：通知
* 2.STATION_LETTER：站内信
* 3.SWEB_NOTICE：SWEB通知
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FILE_ATTACH_SOURCE {
MAIL(1,"邮件","邮件"),
LETTER(2,"站内信","站内信"),
SWEB_NOTICE(3,"SWEB通知","SWEB通知");
private int value;
private String name;
private String description;
FILE_ATTACH_SOURCE() {
}
FILE_ATTACH_SOURCE(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getName() {
return name;
}
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].name;
}
}
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 String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -18,9 +18,9 @@ public class SwebEnumUtil {
public enum ORDER_MASTER_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "已发布"),
RECEIPT_FINISH(30, "已确认"),
SURE(30, "已确认"),
CLOSED(40, "已打印"),
CANCELLED(50, "已发货");
DELIVERY(50, "已发货");
private int value;
private String description;
@ -66,9 +66,9 @@ public class SwebEnumUtil {
public enum ORDER_DETAILS_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "已发布"),
RECEIPT_FINISH(30, "已确认"),
SURE(30, "已确认"),
CLOSED(40, "已打印"),
CANCELLED(50, "已发货");
DELIVERY(50, "已发货");
private int value;
private String description;
@ -107,4 +107,81 @@ public class SwebEnumUtil {
}
}
/**
* 包装类型枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PACKAGE_TYPE {
BOX(10, "BOX", "BOX（盒）"),
CARTON(20, "CARTON", "CARTON（箱）"),
PALLET(30, "PALLET", "PALLET（栈板）"),
CONTAINER(40, "PALLET", "PALLET（集装箱）");
private String code;
private String description;
int value;
PACKAGE_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;
}
}
/**
* 订单类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_TYPE {
CREATE(10, "标准包装"),
RECEIPT(20, "非标包装");
private int value;
private String description;
ORDER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static 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;
}
}
}

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

@ -656,7 +656,7 @@ public class WmsEnumUtil {
/**
* 作业任务状态
* 作业任务状态、移库单条码操作状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_INFO_STATUS {
@ -2031,4 +2031,38 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 单据是否指定条码
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_IS_SN {
IS_APPOINT_SN(1, "指定条码"), APPOINT_SN(2, "不指定条码");
private int value;
private String description;
ORDER_IS_SN(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -105,6 +105,15 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
int updateByProperties(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue);
/**
* 通过属性进行多个值更新
* @param propertyName
* @param propertyValue
*/
int updateByProperties(String propertyName, Object propertyValue,DdlPackBean packBean);
int updateByProperties(String[] propertyName, Object[] propertyValue,DdlPackBean packBean);
/**
* 通过多个属性进行单个值更新
* @param conditionName
* @param conditionValue

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

@ -5,8 +5,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
import com.alibaba.fastjson.JSONObject;
import com.mongodb.BasicDBObject;
import com.mongodb.Block;
import com.mongodb.client.FindIterable;
import com.mongodb.client.model.CountOptions;
import com.mongodb.client.model.Filters;
import com.mongodb.client.model.Sorts;
import org.apache.commons.lang3.StringUtils;
@ -21,6 +23,7 @@ import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
import org.springframework.data.mongodb.repository.support.SimpleMongoRepository;
@ -271,13 +274,9 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
FindIterable findIter = null;
if(bson == null) {
findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find()
.skip(pager.getStartRow())
.limit(pager.getPageSize());
findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find();
}else{
findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson)
.skip(pager.getStartRow())
.limit(pager.getPageSize());
findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson);
}
if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){
//排序
@ -286,8 +285,13 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
}else{
findIter.sort(Sorts.descending(orderByParam));
}
}else{
//根据id排序
findIter.sort(new BasicDBObject("_id", 1));
}
findIter.skip(pager.getStartRow()).limit(pager.getPageSize());
findIter.forEach(saveBlock);
return packObjectListFromDocument(dList);
}
@ -310,9 +314,7 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
dList.add(document);
}
};
FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find()
.skip(pager.getStartRow())
.limit(pager.getPageSize());
FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find();
if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){
//排序
if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){
@ -320,7 +322,11 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
}else{
findIter.sort(Sorts.descending(orderByParam));
}
}else{
//根据id排序
findIter.sort(new BasicDBObject("_id", 1));
}
findIter.skip(pager.getStartRow()).limit(pager.getPageSize());
findIter.forEach(saveBlock);
return packObjectListFromDocument(dList);
}

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

@ -222,6 +222,40 @@ 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);
}
@Override
public int updateByProperties(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) {
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++) {
sb.append(propertyName[i] + " = :p_" + propertyName[i] + ",");
}
sb.deleteCharAt(sb.length() - 1);
sb.append(" where 1=1 " + packBean.getWhereAppend());
Query query = entityManager.createQuery(sb.toString());
//更新值
for (int i = 0; i < propertyName.length; i++) {
query.setParameter("p_" + propertyName[i], propertyValue[i]);
}
//查询条件
for (String key : packBean.getHqlPreparedMap().keySet()) {
query.setParameter(key,packBean.getHqlPreparedMap().get(key));
}
return query.executeUpdate();
} else {
throw new IllegalArgumentException("参数值错误!,propertyName:" + propertyName + ",propertyValue:" + propertyValue);
}
}
@Override
public int updateByHqlWhere(String hqlWhere, String propertyName, Object propertyValue) {
return updateByHqlWhere(hqlWhere, new String[]{propertyName}, new Object[]{propertyValue});
}

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

@ -60,4 +60,8 @@ public class BfButton extends BaseBean {
@Column(name = "METHOD_CONTENT")
@ApiParam(value = "执行内容")
private String methodContent;
@Column(name = "BUTTON_DESCRIPTION")
@ApiParam(value = "按钮描述")
private String buttonDescription;
}

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

@ -38,6 +38,10 @@ public class BfElementPropertyVirtual extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name="PROPERTY_CODE")
@ApiParam(value ="类属性名称")
private String propertyCode;
@Column(name="PROPERTY_NAME")
@ApiParam(value ="元素名称")
private String propertyName;
@ -71,6 +75,10 @@ public class BfElementPropertyVirtual extends BaseBean {
private List<BfElementProperty> propertyList;
@Transient
@ApiParam(value = "虚拟属性列表")
private List<BfRefElementPropertyVirtualDetail> detailList;
@Transient
@ApiParam(value = "虚拟属性ID列表")
@JsonSerialize(using = ToStringSerializer.class)
private List<Long> propertyIdList;

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

@ -49,9 +49,9 @@ public class BfLayout extends BaseBean {
@ApiParam(value = "列数")
private Integer layoutColumnCount;
public Integer getLayoutColumnCount(){
public Integer getLayoutColumnCountValue(){
if(this.layoutColumnCount == null) {
return null;
return 0;
}
return layoutColumnCount.intValue();
}

7
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java
Unescape Escape View File

@ -52,6 +52,13 @@ public class BfLayoutRow extends BaseBean {
@ApiParam(value = "行所关联列数")
private Integer rowColNum;
public int getRowColNumValue(){
if(rowColNum == null){
return 0;
}
return rowColNum.intValue();
}
// 行所包含的列
@Transient
private List<BfLayoutColumn> bfLayoutColumns;

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

@ -55,6 +55,7 @@ public class BfMenu extends BaseBean {
@ApiParam(value ="菜单样式")
private String menuStyle;
//
@Column(name="MENU_TYPE")
@ApiParam(value ="菜单类型")
private Integer menuType;
@ -68,6 +69,10 @@ public class BfMenu extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
@Column(name="METHOD_NAME_RDD")
@ApiParam(value ="功能名称")
private String methodNameRdd;
@Column(name = "MENU_STATUS")
@ApiParam(value = "菜单状态")
private Integer menuStatus;

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

@ -35,6 +35,10 @@ public class BfMethodDetail extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
@Column(name="METHOD_NAME_RDD")
@ApiParam(value ="功能名称")
private String methodNameRdd;
@Column(name="layout_column_id")
@ApiParam(value ="布局列id")
@JsonSerialize(using = ToStringSerializer.class)

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

@ -38,6 +38,10 @@ public class BfRefMethodRole extends BaseBean {
@ApiParam(value = "表单功能名称")
private String methodNameRdd;
@Column(name = "METHOD_LAYOUT_NAME_RDD")
@ApiParam(value = "功能布局名称")
private String methodLayoutNameRdd;
@Column(name = "ROLE_ID")
@ApiParam(value = "角色id")
@JsonSerialize(using = ToStringSerializer.class)

108
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.form.sqlpack;
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.form.bean.*;
@ -124,15 +125,16 @@ public final class FormHqlPack {
* @param bfMenu 菜单目录
* @return hql
*/
public static String packHqlBfMenu(BfMenu bfMenu) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlBfMenu(BfMenu bfMenu) {
DdlPackBean result = new DdlPackBean();
HqlPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result);
HqlPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result);
HqlPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result);
result.append(bfMenu.orderBy());
DdlPreparedPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result);
DdlPreparedPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result);
DdlPreparedPack.getNumEqualPack(bfMenu.getMenuStatus(), "menuStatus", result);
DdlPreparedPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result);
result.setOrderByStr(bfMenu.orderBy());
return result.toString();
return result;
}
/**
@ -140,15 +142,31 @@ public final class FormHqlPack {
* @param bfMethod 表单功能查询条件
* @return hql
*/
public static String packHqlBfMethod(BfMethod bfMethod) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlBfMethod(BfMethod bfMethod) {
DdlPackBean result = new DdlPackBean();
HqlPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result);
HqlPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result);
HqlPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result);
result.append(bfMethod.orderBy());
DdlPreparedPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result);
DdlPreparedPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result);
DdlPreparedPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result);
result.setOrderByStr(bfMethod.orderBy());
return result.toString();
return result;
}
/**
* 表单功能明细复杂查询
* @param bfMethodDetail 表单功能明细查询条件
* @return hql
*/
public static DdlPackBean packHqlBfMethodDetail(BfMethodDetail bfMethodDetail) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(bfMethodDetail.getMethodDetailName(), "methodDetailName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfMethodDetail.getMethodId(), "layoutId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfMethodDetail.getIsDeleted(), "isDeleted", ddlPackBean);
ddlPackBean.setOrderByStr(bfMethodDetail.orderBy());
return ddlPackBean;
}
/**
@ -170,15 +188,63 @@ public final class FormHqlPack {
/**
* 表单按钮复杂查询
* @param bfButton 查询条件
* @return 查询条件
*/
public static String packHqlBfButton(BfButton bfButton){
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlBfButton(BfButton bfButton){
DdlPackBean ddlPackBean = new DdlPackBean();
HqlPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", result);
HqlPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", result);
HqlPack.getNumEqualPack(bfButton.getIsDeleted(), "isDeleted", result);
result.append(bfButton.orderBy());
DdlPreparedPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfButton.getIsDeleted(), "isDeleted", ddlPackBean);
ddlPackBean.setOrderByStr(bfButton.orderBy());
return result.toString();
return ddlPackBean;
}
/**
* 根据角色id查询关联功能
* @param roleIds 角色id
* @return 查询条件
*/
public static DdlPackBean packHqlBfRefMethodRoleByRoleIds(Long[] roleIds){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getInPackArray(roleIds, "roleId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
return ddlPackBean;
}
/**
* 按钮功能关系数据查询条件
* @param bfRefButtonMethod 查询条件
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfRefButtonMethod(BfRefButtonMethod bfRefButtonMethod) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonId(), "buttonId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionType(), "buttonPositionType", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionRefId(), "buttonPositionRefId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonNameRdd(), "buttonNameRdd", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonPositionRefNameRdd(), "buttonPositionRefNameRdd", ddlPackBean);
ddlPackBean.setOrderByStr(bfRefButtonMethod.orderBy());
return ddlPackBean;
}
/**
* 功能权限数据查询条件
* @param bfRefMethodRole 查询条件
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfRefMethodRole(BfRefMethodRole bfRefMethodRole) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getMethodId(), "methodId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getRoleId(), "roleId", ddlPackBean);
ddlPackBean.setOrderByStr(bfRefMethodRole.orderBy());
return ddlPackBean;
}
}

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

@ -0,0 +1,20 @@
package cn.estsh.i3plus.pojo.model.platform;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-04-13 15:27
* @Modify:
**/
@Data
public class MessagePagerModel {
private SysMessage sysMessage;
private Pager pager;
}

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

@ -0,0 +1,20 @@
package cn.estsh.i3plus.pojo.model.platform;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-04-13 15:27
* @Modify:
**/
@Data
public class RefUserMessagePagerModel {
private SysRefUserMessage sysRefUserMessage;
private Pager pager;
}

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

@ -0,0 +1,25 @@
package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 操作数据库表数据 参数封装
* @Reference :
* @Author : siliter
* @CreateDate : 2019-04-11 11:50
* @Modify:
**/
@Data
public class OperationDbModle{
@ApiParam(value = "DAO名称")
public String daoName;
@ApiParam(value = "数据操作实体")
public Object object;
// 10:新增，20：修改
@ApiParam(value = "数据库操作类型")
public int actionDbType;
}

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.ToString;
/**
* @Description : 收货扫描条码组件 参数封装
@ -11,6 +12,7 @@ import lombok.Data;
* @Modify:
**/
@Data
@ToString
public class TransSnModle extends BaseComponetsParam{
@ApiParam(value = "移动单号")

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

@ -0,0 +1,58 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 文件附件
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-04-11 16:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_FILE_ATTACH")
@Api(value="文件附件",description = "文件附件")
public class SysFileAttach extends BaseBean {
@Column(name="ATTACH_SOFT_TYPE")
@ApiParam(value ="附件所属模块")
private Integer attachSoftType;
@Column(name="ATTACH_SOURCE")
@ApiParam(value ="附件来源")
private Integer attachSource;
@Column(name="REF_ID")
@ApiParam(value ="关联id")
@JsonSerialize(using = ToStringSerializer.class)
private Long refId;
@Column(name="FILE_ID")
@ApiParam(value ="文件id")
@JsonSerialize(using = ToStringSerializer.class)
private Long fileId;
@Column(name="FILE_NAME_RDD")
@ApiParam(value ="文件名称冗余")
private String fileNameRdd;
@Column(name="FILE_PATH_RDD")
@ApiParam(value ="文件路径冗余")
private String filePathRdd;
}

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -9,73 +10,130 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Subselect;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description : 系统消息
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.689
* @Modify :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.689
* @Modify :
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_MESSAGE")
@Api(value="系统消息",description = "系统消息")
@Table(name = "SYS_MESSAGE")
@Api(value = "系统消息", description = "系统消息")
public class SysMessage extends BaseBean {
@Column(name="MESSAGE_TITLE")
@ApiParam(value ="消息标题" , access ="消息标题")
@Column(name = "MESSAGE_TITLE")
@ApiParam(value = "消息标题", access = "消息标题")
private String messageTitle;
@Column(name="MESSAGE_TYPE")
@ApiParam(value ="消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1")
@Column(name = "MESSAGE_SOFT_TYPE")
@ApiParam(value = "消息所属模块")
private Integer messageSoftType;
@Column(name = "MESSAGE_TYPE")
@ApiParam(value = "消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)", example = "-1")
private Integer messageType;
@Column(name="MESSAGE_TYPE_CONTENT")
@ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)" , example ="-1")
public int getMessageTypeValue() {
if(this.messageType == null){
return 0;
} else {
return this.messageType.intValue();
}
}
@Column(name = "MESSAGE_TYPE_CONTENT")
@ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1")
private Integer messageContentType;
@Column(name="MESSAGE_CONTENT",columnDefinition = "TEXT")
@ApiParam(value ="消息内容" , access ="消息内容")
@Column(name = "MESSAGE_CONTENT", columnDefinition = "TEXT")
@ApiParam(value = "消息内容", access = "消息内容")
private String messageContent;
@Column(name="MESSAGE_SENDER_ID")
@ApiParam(value ="发送者id" , example = "-1")
@Column(name = "MESSAGE_SENDER_ID")
@ApiParam(value = "发送者id", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long messageSenderId;
@Column(name="MESSAGE_SENDER_NAME_RDD")
@ApiParam(value ="发送者名称" )
@Column(name = "MESSAGE_SENDER_NAME_RDD")
@ApiParam(value = "发送者名称")
private String messageSenderNameRdd;
@Column(name="MESSAGE_RECEIVER_TYPE")
@ApiParam(value ="收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1")
@Column(name = "MESSAGE_RECEIVER_TYPE")
@ApiParam(value = "收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)", example = "-1")
private Integer messageReceiverType;
@Column(name="MESSAGE_RECEIVERS_ID")
@ApiParam(value ="收件者id" )
@Column(name = "MESSAGE_RECEIVERS_ID")
@ApiParam(value = "收件者id")
private String messageReceiversId;
@Column(name="MESSAGE_RECEIVERS_NAME_RDD")
@ApiParam(value ="接受者名称集合" )
@Column(name = "MESSAGE_RECEIVERS_NAME_RDD")
@ApiParam(value = "接受者名称集合")
private String messageReceiversNameRdd;
@Column(name="MESSAGE_SEND_TIME")
@ApiParam(value ="发送时间" )
@Column(name = "MESSAGE_SEND_TIME")
@ApiParam(value = "发送时间")
private String messageSendTime;
@Column(name="IS_URGENT")
@ApiParam(value ="是否紧急")
@Column(name = "IS_URGENT")
@ApiParam(value = "是否紧急")
private Integer isUrgent;
@Column(name="IS_SYSTEM")
@ApiParam(value ="是否系统邮件")
@Column(name = "IS_SYSTEM")
@ApiParam(value = "是否系统邮件")
private Integer isSystem;
@Transient
@ApiParam(value = "阅读统计")
@JsonSerialize(using = ToStringSerializer.class)
private Long readCount;
public SysMessage() {
}
public SysMessage(
Long id, String messageTitle, Integer messageSoftType, Integer messageType, Integer messageContentType,
String messageContent, Long messageSenderId, String messageSenderNameRdd, Integer messageReceiverType,
String messageReceiversId, String messageReceiversNameRdd, String messageSendTime, Integer isUrgent,
Integer isSystem, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
String modifyUser, String modifyDatetime, Long readCount) {
this.id = id;
this.messageTitle = messageTitle;
this.messageSoftType = messageSoftType;
this.messageType = messageType;
this.messageContentType = messageContentType;
this.messageContent = messageContent;
this.messageSenderId = messageSenderId;
this.messageSenderNameRdd = messageSenderNameRdd;
this.messageReceiverType = messageReceiverType;
this.messageReceiversId = messageReceiversId;
this.messageReceiversNameRdd = messageReceiversNameRdd;
this.messageSendTime = messageSendTime;
this.isUrgent = isUrgent;
this.isSystem = isSystem;
this.readCount = readCount;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
@Transient
@ApiParam(value = "附件集合")
private List<SysFileAttach> sysFileAttachList;
}

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -39,6 +40,10 @@ public class SysRefUserMessage extends BaseBean {
@ApiParam(value ="冗余消息标题")
private String messageTitleRdd;
@Column(name="MESSAGE_SOFT_TYPE")
@ApiParam(value ="消息所属模块")
private Integer messageSoftType;
@Column(name="MESSAGE_TYPE_RDD")
@ApiParam(value ="冗余消息类型")
private Integer messageTypeRdd;
@ -67,4 +72,12 @@ public class SysRefUserMessage extends BaseBean {
@Column(name="MESSAGE_STATUS")
@ApiParam(value = "消息状态")
private Integer messageStatus;
public int getMessageStatusValue() {
if(this.messageStatus == null){
return ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue();
} else {
return messageStatus.intValue();
}
}
}

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

@ -43,6 +43,10 @@ public class SysLogTaskTime extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long taskPlanId;
@Column(name = "TASK_SOFT_TYPE_RDD")
@ApiParam(value = "任务所属模块")
private Integer taskSoftTypeRdd;
@Column(name="TASK_CYCLE_NAME_RDD")
@ApiParam(value ="任务周期名称")
private String taskCycleNameRdd;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.wms.bean;
package cn.estsh.i3plus.pojo.platform.platbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.wms.bean;
package cn.estsh.i3plus.pojo.platform.platbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.wms.bean;
package cn.estsh.i3plus.pojo.platform.platbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLogData;
/**
* @Description : 作业日志参数(使用Mongodb)
* @Reference :
* @Author : siliter
* @Date : 2019-04-11 12:03:00
* @Modify :
**/
public interface WmsActionLogDataMongoRepository extends BaseMongoRepository<WmsActionLogData, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLogDetails;
/**
* @Description : 作业日志明细(使用Mongodb)
* @Reference :
* @Author : siliter
* @Date : 2019-04-11 12:03:00
* @Modify :
**/
public interface WmsActionLogDetailsMongoRepository extends BaseMongoRepository<WmsActionLogDetails, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLog;
/**
* @Description : 作业日志(使用Mongodb)
* @Reference :
* @Author : siliter
* @Date : 2019-04-11 12:03:00
* @Modify :
**/
public interface WmsActionLogMongoRepository extends BaseMongoRepository<WmsActionLog, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysFileAttach;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-04-12 19:15
* @Modify:
**/
public interface SysFileAttachRepository extends BaseRepository<SysFileAttach, Long> {
}

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

@ -292,22 +292,26 @@ public class CoreHqlPack {
* @param message
* @return
*/
public static String packHqlSysMessage(SysMessage message){
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlSysMessage(SysMessage message){
DdlPackBean ddlPackBean = new DdlPackBean();
// hql拼接
HqlPack.getStringLikerPack(message.getMessageTitle(),"messageTitle",result);
HqlPack.getStringLikerPack(message.getMessageContent(),"messageContent",result);
HqlPack.getNumEqualPack(message.getMessageType(),"messageType",result);
HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result);
HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false);
HqlPack.getNumEqualPack(message.getMessageSenderId(),"messageSenderId",result);
DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean);
DdlPreparedPack.getStringLikerPack(message.getMessageContent(), "messageContent", ddlPackBean);
DdlPreparedPack.getNumEqualPack(message.getMessageType(), "messageType", ddlPackBean);
DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd",
ddlPackBean);
DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd",
ddlPackBean);
DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean,
false, false);
DdlPreparedPack.getNumEqualPack(message.getMessageSenderId(), "messageSenderId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
// 添加默认排序
HqlPack.getOrderDefault(message);
ddlPackBean.setOrderByStr(message.orderBy());
return result.toString();
return ddlPackBean;
}
/**
@ -734,7 +738,9 @@ public class CoreHqlPack {
// hql拼接
HqlPack.getNumEqualPack(sysLabelTemplateParam.getTemplateId(), "templateId", result);
HqlPack.getStringEqualPack(sysLabelTemplateParam.getTemplateCode(), "templateCode", result);
HqlPack.getNumEqualPack(sysLabelTemplateParam.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(sysLabelTemplateParam.getIsDeleted(), "isDeleted", result);
HqlPack.getStringEqualPack(sysLabelTemplateParam.getOrganizeCode(), "organizeCode", result);
// 添加默认排序
HqlPack.getOrderDefault(sysLabelTemplateParam);

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

@ -0,0 +1,69 @@
package cn.estsh.i3plus.pojo.platform.sqlpack;
import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
import cn.estsh.i3plus.pojo.platform.platbean.*;
import com.mongodb.BasicDBObject;
import org.bson.conversions.Bson;
/**
* @Description : Bson对象封装
* @Reference :
* @Author : siliter
* @CreateDate : 2019-04-11 13:15
* @Modify:
**/
public class WmsBsonPack {
/**
* 作业日志复杂查询
*
* @param actionLog
* @return
*/
public static Bson packBsonByActionLog(WmsActionLog actionLog) {
Bson bson = new BasicDBObject();
bson = BsonPackTool.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", bson, false, false);
bson = BsonPackTool.getStringEqualPack(actionLog.getOrderNo(), "orderNo", bson);
bson = BsonPackTool.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", bson);
bson = BsonPackTool.getStringEqualPack(actionLog.getFixId(), "fixId", bson);
bson = BsonPackTool.getNumEqualPack(actionLog.getAgId(), "agId", bson);
bson = BsonPackTool.getNumEqualPack(actionLog.getActionStatus(), "actionStatus", bson);
bson = BsonPackTool.getStringEqualPack(actionLog.getAgNameC(), "agNameC", bson);
bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson);
bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson);
bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson);
return bson;
}
/**
* 作业日志明细复杂查询
*
* @param actionLogDetails
* @return
*/
public static Bson packBsonByActionLogDetails(WmsActionLogDetails actionLogDetails) {
Bson bson = new BasicDBObject();
bson = BsonPackTool.getNumEqualPack(actionLogDetails.getAlId(), "alId", bson);
bson = BsonPackTool.getStringEqualPack(actionLogDetails.getOrganizeCode(), "organizeCode", bson);
bson = BsonPackTool.getNumEqualPack(actionLogDetails.getValueType(), "valueType", bson);
bson = BsonPackTool.getNumEqualPack(actionLogDetails.getSeq(), "seq", bson);
bson = BsonPackTool.getNumEqualPack(actionLogDetails.getIsValid(), "isValid", bson);
bson = BsonPackTool.getNumEqualPack(actionLogDetails.getIsDeleted(), "isDeleted", bson);
return bson;
}
/**
* 调用组件日志复杂查询
*
* @param actionLogData
* @return
*/
public static Bson packBsonByActionLogData(WmsActionLogData actionLogData) {
Bson bson = new BasicDBObject();
bson = BsonPackTool.getNumEqualPack(actionLogData.getAldId(), "aldId", bson);
bson = BsonPackTool.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", bson);
bson = BsonPackTool.getNumEqualPack(actionLogData.getIsValid(), "isValid", bson);
bson = BsonPackTool.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", bson);
return bson;
}
}

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

@ -95,4 +95,8 @@ public class SwebPurchaseOrder extends BaseBean {
@Column(name = "REF_ORDER_NO")
@ApiParam(value = "关联单号")
public String refOrderNo;
@Column(name = "EXPECTED_TIME")
@ApiParam(value = "预计到货时间")
public String expectedTime;
}

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

@ -130,9 +130,9 @@ public class SwebPurchaseOrderDetails extends BaseBean {
@ApiParam("是否为钢卷料")
private Integer IS_STEEL;
@Column(name = "REC_TIME")
@Column(name = "EXPECTED_TIME")
@ApiParam(value = "预计到货日期")
public String recTime;
public String expectedTime;
@Column(name = "REMARK")
@ApiParam("备注")

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

@ -80,7 +80,7 @@ public class SwebPurchaseOrderSn extends BaseBean {
@Column(name = "CHECK_CODE")
@ApiParam(value = "检验编号")
public String CHECK_CODE;
public String checkCode;
@Column(name = "STOVE_NO")
@ApiParam(value = "炉批号")

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

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.sweb.modelbean;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : 供应商登录用户模型
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-12 13:13
* @Modify:
**/
@Data
@AllArgsConstructor
public class SwebLoginUserModel implements Serializable {
@ApiParam(value = "用户名")
private String userName;
@ApiParam(value = "密码")
private String password;
@ApiParam(value = "获取图片密码的唯一凭证")
private String uniqueId;
@ApiParam(value = "ip地址")
private String ip;
}

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

@ -24,10 +24,10 @@ public class SwebPOForPubListEnterModel extends BaseBean {
public Integer orderType;
@ApiParam(value = "预计到货日期开始日期")
public String recTimeStart;
public String expectedTimeStart;
@ApiParam(value = "预计到货日期结束日期")
public String recTimeEnd;
public String expectedTimeEnd;
@ApiParam(value = "零件号")
private String partNo;

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

@ -20,7 +20,7 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam("单据号")
public String orderNo;
private String orderNo;
@Column(name = "PART_NO")
@ApiParam(value = "零件号")

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

@ -18,8 +18,8 @@ import java.util.List;
public class SwebPOForPubListResultModel extends BaseBean {
@ApiParam(value = "拆分请求时间数量列表", example = "1")
public List<String> reqTimeList;
private List<String> reqTimeList;
@ApiParam(value = "分页列表", example = "1")
public ListPager<SwebPOForPubListResultItemModel> pageList;
private ListPager<SwebPOForPubListResultItemModel> pageList;
}

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

@ -64,7 +64,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result);
DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result);
DdlPreparedPack.timeBuilder(model.getRecTimeStart(), model.getRecTimeEnd(), "recTime", result, false);
DdlPreparedPack.timeBuilder(model.getExpectedTimeStart(), model.getExpectedTimeEnd(), "expectedTime", result, false);
// 封装有效状态和删除状态
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);

9
modules/i3plus-pojo-wms/pom.xml
Unescape Escape View File

@ -18,10 +18,11 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>i3plus.platform</groupId>-->
<!--<artifactId>i3plus-platform-common</artifactId>-->
<!--</dependency>-->
<!-- <dependency>-->
<!-- <groupId>i3plus.platform</groupId>-->
<!-- <artifactId>i3plus-platform</artifactId>-->
<!-- <version>1.0-DEV-SNAPSHOT</version>-->
<!-- </dependency>-->
</dependencies>

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

@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -22,6 +23,7 @@ import java.util.List;
* @Modify:
**/
@Data
@ToString
@Entity
@DynamicInsert
@DynamicUpdate

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

@ -35,6 +35,10 @@ public class WmsActionModuleParam extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
public Long amID;
@Column(name = "METHOD_NAME")
@ApiParam("组件执行方法名称")
public String methodName;
@Column(name = "PARAM_CODE")
@ApiParam("参数编码")
public String paramCode;

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

@ -91,5 +91,5 @@ public class WmsCSFactTrans extends BaseBean {
@Column(name="REMARK")
@ApiParam(value = "备注")
public String reMark;
public String remark;
}

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

@ -52,7 +52,7 @@ public class WmsCSOrderMaster extends BaseBean {
@Column(name = "REMARK")
@ApiParam("备注")
public String reMark;
public String remark;
@Column(name = "IS_INVENTORY")
@ApiParam(value = "是否允许清点", example = "1")

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

@ -160,6 +160,18 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("前端表格编辑使用")
private Boolean isSet = false;
@Transient
@ApiParam("生产日期")
public String dateCode;
@ApiParam(value = "散件移库输入移库数量")
@Transient
public Double inputMoveQty;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
}
public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); }
@ -167,4 +179,6 @@ public class WmsDocMovementDetails extends BaseBean {
public Double getPickQty() {return pickQty == null ? 0L : this.pickQty.doubleValue(); }
public Double getActualQty() {return actualQty == null ? 0L : this.actualQty.doubleValue(); }
}

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

@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -28,6 +29,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_MOVEMENT_MASTER")
@Api("移库单表")
@ToString
public class WmsDocMovementMaster extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam(value = "移库单单号")
@ -110,9 +112,13 @@ public class WmsDocMovementMaster extends BaseBean {
private String desrAreaNo;
@Column(name = "IS_PART")
@ApiParam(value = "是否散件")
@ApiParam(value = "是否散件", example = "1")
private Integer isPart;
@Column(name = "IS_SN")
@ApiParam(value = "是否指定条码", example = "1")
private Integer isSn;
@Transient
@ApiParam(value = "发运单号")
private String shipOrderNo;
@ -120,4 +126,8 @@ public class WmsDocMovementMaster extends BaseBean {
@Transient
@ApiParam(value = "打印时间")
private String printDate;
public Integer getIsSn() {
return isSn == null ? 0 : this.getIsSn();
}
}

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

@ -58,10 +58,10 @@ public class WmsDocMovementSn extends BaseBean {
public String unit;
/**
* 状态:同库存条码状态一致
* 状态：操作状态
*/
@Column(name="SN_STATUS")
@ApiParam(value = "状态", example = "10")
@ApiParam(value = "操作状态", example = "10")
public Integer snStatus;
@Column(name="SN")

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

@ -67,7 +67,7 @@ public class WmsFGInStock extends BaseBean {
@Column(name="REMARK")
@ApiParam("备注")
public String reMark;
public String remark;
/**
* 来源：MNU=手工,MES=MES接口

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

@ -111,4 +111,7 @@ public class WmsLocate extends BaseBean {
return this.partQty == null ? 0 : this.partQty.doubleValue();
}
public Integer getLocateType() {
return this.locateType== null ? 0 : this.locateType.intValue();
}
}

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

@ -41,7 +41,7 @@ public class WmsMoveMaster extends BaseBean {
@Column(name = "REMARK")
@ApiParam("备注")
public String reMark;
public String remark;
@Column(name = "TRANS_TYPE_CODE")
@ApiParam(value = "交易类型代码")

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

@ -26,11 +26,11 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_PO_MASTER")
@Table(name = "WMS_DOC_PO_MASTER")
@Api("PO主表信息")
public class WmsPOMaster extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@ -38,7 +38,7 @@ public class WmsPOMaster extends BaseBean {
* 单据类型:
* 1 REG=原物料采购,10 SUB=委外采购,20 TAR=多角贸易采购,30 TAP=多角代采购
*/
@Column(name="PO_TYPE")
@Column(name = "PO_TYPE")
@ApiParam("单据类型")
public String poType;
@ -46,26 +46,26 @@ public class WmsPOMaster extends BaseBean {
* 状态:1=新建,10=收货中,20=收货完成,
* 30=入库中,40=入库完成,90=已关闭,91=已取消
*/
@Column(name="PO_STATUS")
@Column(name = "PO_STATUS")
@ApiParam(value = "状态", example = "1")
public Integer poStatus;
@Column(name="VENDOR_NO")
@Column(name = "VENDOR_NO")
@ApiParam("供应商编号")
public String vendorNo;
@Column(name="VERSION")
@Column(name = "VERSION")
@ApiParam("版本")
public String version;
/**
* 单据来源：1 MNU=手工,2 ERP=ERP接口
*/
@Column(name="SRC")
@Column(name = "SRC")
@ApiParam("单据来源")
public String src;
@Column(name="IS_ASN")
@Column(name = "IS_ASN")
@ApiParam("是否有ASN")
public String isAsn;
@ -76,11 +76,11 @@ public class WmsPOMaster extends BaseBean {
@ApiParam("供应商名称")
private String vendorName;
@Column(name="IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
@Column(name = "IS_TASK")
@ApiParam(value = "是否生成任务", example = "1")
public Integer isTask;
@Column(name="IS_PART")
@Column(name = "IS_PART")
@ApiParam(value = "是否散件", example = "1")
public Integer isPart;
@ -103,4 +103,8 @@ public class WmsPOMaster extends BaseBean {
@Transient
@ApiParam(value = "发货日期")
private String sendDate;
@Column(name = "IS_SN")
@ApiParam(value = "是否生成条码", example = "1")
public Integer isSn;
}

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

@ -105,7 +105,7 @@ public class WmsPOMasterDetails extends BaseBean {
@Column(name = "SNP")
@ApiParam("标准包装")
public String snp;
public Integer snp;
/**
* 是否免费:0=计费,1=免费

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

@ -64,7 +64,7 @@ public class WmsShopping extends BaseBean {
@Column(name="REMARK")
@ApiParam("备注")
public String reMark;
public String remark;
@Column(name="SRC")
@ApiParam("单据来源")

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

@ -42,7 +42,7 @@ public class WmsSnPrint extends BaseBean {
@Column(name="REMARK")
@ApiParam("备注")
public String reMark;
public String remark;
/**
* 状态:0=创建,5=待处理,10=已处理

42
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java
Unescape Escape View File

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.wms.engine.rule;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 业务规则持久化实体类
*
* @author Rock.Yu
* @since 2019-04-16 09:27
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Table(name = "DROOLS_RULE_PERSISTENCE")
@Api("系统动态业务规则")
public class EngineRulePersistence extends BaseBean {
// 规则调用的唯一编号，例如：WMS_RECEIVE_0001
@Column(name = "RULE_NO", length = 50)
private String ruleNo;
// 规则的中文名称
@Column(name = "RULE_NAME", length = 50)
private String ruleName;
// 规则的具体内容
@Column(name = "RULE_CONTENT", columnDefinition = "TEXT")
private String ruleContent;
// 规则的描述，包含规则的用法，参数说明等
@Column(name = "RULE_REMARK", length = 2000)
private String ruleRemark;
}

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

@ -0,0 +1,22 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
import org.springframework.stereotype.Repository;
/**
* @Description : 规则引擎持久化类
* @Reference :
* @Author : Rock.Yu
* @CreateDate : 2019-04-16 09:53
* @Modify:
**/
@Repository
public interface IEngineRulePersistenceRepository extends BaseRepository<EngineRulePersistence, Long> {
/**
* 按照规则编号查询规则实体
* @param ruleNo 规则编号
* @return 规则实体
*/
EngineRulePersistence findByRuleNo(String ruleNo);
}

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

@ -7,10 +7,26 @@ import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @Description : 脚本引擎持久化类
* @Reference :
* @Author : Rock.Yu
* @CreateDate : 2019-04-16 09:53
* @Modify:
**/
@Repository
public interface IEngineScriptPersistenceDao extends BaseRepository<EngineScriptPersistence, Long> {
public interface IEngineScriptPersistenceRepository extends BaseRepository<EngineScriptPersistence, Long> {
/**
* 按照脚本编号查询脚本实体对象
* @param scriptNo 脚本编号
* @return 脚本实体对象
*/
EngineScriptPersistence findByScriptNo(String scriptNo);
/**
* 查找所有的脚本语言类型
* @return 数据库中已经存在的脚本语言类型
*/
@Query("select t.languageType from EngineScriptPersistence t group by t.languageType")
List findGroupByLanguageType();
}

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

@ -1,17 +0,0 @@
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.WmsActionLogData;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface WmsActionLogDataRepository extends BaseRepository<WmsActionLogData, Long> {
}

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

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogDetails;
import org.springframework.stereotype.Repository;
/**
* @Description : 作业记录明细
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-23 14:03
* @Modify:
**/
@Repository
public interface WmsActionLogDetailsRepository extends BaseRepository<WmsActionLogDetails, Long> {
}

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

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsActionLog;
import org.springframework.stereotype.Repository;
/**
* @Description : 作业记录表
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-23 14:02
* @Modify:
**/
@Repository
public interface WmsActionLogRepository extends BaseRepository<WmsActionLog, Long> {
}

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

@ -6,12 +6,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.base.tool.SqlPack;
import cn.estsh.i3plus.pojo.wms.bean.*;
import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
import com.alibaba.fastjson.JSONObject;
import com.google.common.base.Strings;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
@ -687,7 +685,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsFGInStock.getUnit(), "unit", result);
HqlPack.getStringEqualPack(wmsFGInStock.getSn(), "sn", result);
HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result);
HqlPack.getStringLikerPack(wmsFGInStock.getReMark(), "reMark", result);
HqlPack.getStringLikerPack(wmsFGInStock.getRemark(), "remark", result);
HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result);
HqlPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result);
HqlPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result);
@ -917,6 +915,7 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
HqlPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
@ -1306,20 +1305,6 @@ public class WmsHqlPack {
return result;
}
/**
* 作业记录参数信息 查询条件封装
*
* @param wmsActionLogData
* @return
*/
public static DdlPackBean packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result);
getStringBuilderPack(wmsActionLogData, result);
return result;
}
/**
* 作业步骤调用参数信息 查询条件封装
@ -1339,62 +1324,6 @@ public class WmsHqlPack {
}
/**
* 作业记录 查询条件封装
* @param wmsActionLog
* @return
*/
public static DdlPackBean packHqlWmsActionLog(WmsActionLog wmsActionLog) {
DdlPackBean result = new DdlPackBean();
if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) {
DdlPreparedPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(),
"startTime", result, true);
} else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) {
DdlPreparedPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(),
"endTime", result, true);
}
// 作业流程编号
DdlPreparedPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result);
// 作业流程名称
DdlPreparedPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result);
// 单据编号
DdlPreparedPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result);
// 设备编号
DdlPreparedPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result);
// 交易类型代码
DdlPreparedPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result);
// 流程状态
DdlPreparedPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result);
getStringBuilderPack(wmsActionLog, result);
return result;
}
/**
* 作业记录明细 查询条件封装
* @param wmsActionLogDetails
* @return
*/
public static DdlPackBean packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) {
DdlPackBean result = new DdlPackBean();
//作业流程id（对应作业记录明细里自增的id）
DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result);
DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result);
DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result);
DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result);
DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result);
getStringBuilderPack(wmsActionLogDetails, result);
DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result);
return result;
}
/**
* PO订单条码表 分页查询
*
* @param wmsPoSn
@ -1656,8 +1585,8 @@ public class WmsHqlPack {
*/
public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
getStringBuilderPack(wmsDocMovementSn, result);

Write Preview
Loading…
Cancel
Save