diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java new file mode 100644 index 0000000..94ed7aa --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -0,0 +1,145 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import javafx.scene.text.Font; + +import java.util.HashMap; + +/** + * @Description : hql脚本封装类 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-03-29 15:57 + * @Modify: + **/ +public class DdlPackBean { + + /** + * String 为属性及条件 + * example： and name = :name + * and num > :num or ..... + * Object 为属性值 + * example: 值 + * + * dao层将map进行解封，hql部分直接添加key值，然后再进行value赋值 + */ + private HashMap hqlPreparedMap; + + //是否是hql + private boolean isHql; + + //手动hql，尽量避免直接传参，使用？代替 + private String hqlAppend; + + //where后跟着的hql/sql + private StringBuilder whereAppend; + + //排序内容 + private String orderByStr; + + //需要拼接的hql + private StringBuilder sb = null; + + public DdlPackBean(){ + this.isHql = true; + sb = new StringBuilder(); + whereAppend = new StringBuilder(); + } + + public DdlPackBean(boolean isHql){ + this.isHql = isHql; + sb = new StringBuilder(); + whereAppend = new StringBuilder(); + } + + public boolean isHql() { + return isHql; + } + + public void setHql(boolean hql) { + isHql = hql; + } + + public String getOrderByStr() { + return orderByStr; + } + + public void setOrderByStr(String orderByStr) { + this.orderByStr = orderByStr; + } + + public String getHqlAppend() { + return hqlAppend; + } + + public void setHqlAppend(String hqlAppend) { + this.hqlAppend = hqlAppend; + } + + public String getWhereAppend() { + return whereAppend.toString(); + } + + public void setWhereAppend(String whereAppend) { + this.whereAppend = new StringBuilder(whereAppend); + } + + public HashMap getHqlPreparedMap() { + return hqlPreparedMap; + } + + /** + * 添加查询条件 + * @param hql + * @param val + */ + public void addColumnQuery(String column,String hql,Object val){ + if(hqlPreparedMap == null){ + hqlPreparedMap = new HashMap<>(); + } + if(column != null && val != null) { + hqlPreparedMap.put(column, val); + } + + whereAppend.append(hql); + } + + /** + * 需要查询属性的数量 + * @return + */ + public int getColumnSize(){ + return hqlPreparedMap.size(); + } + + /** + * 获取包含hql的最终的ddl + * @return + */ + public String getPackedHqlAll(){ + if(hqlAppend != null){ + sb.append(hqlAppend); + } + if(whereAppend != null){ + sb.append(whereAppend); + } + if(orderByStr != null){ + sb.append(orderByStr); + } + System.out.println("===" + sb.toString()); + return sb.toString(); + } + + /** + * 获取最终的ddl + * @return + */ + public String getPackedHql(){ + if(whereAppend != null){ + sb.append(whereAppend); + } + if(orderByStr != null){ + sb.append(orderByStr); + } + return sb.toString(); + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 0231497..ac21b0b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -176,7 +176,7 @@ public class DynamicEntity extends BaseBean implements Serializable { try { setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{f.getType()}); - System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal); +// System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal); setMethod.invoke(this, fieldVal); } catch (ClassCastException e) { e.printStackTrace(); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 672767d..11363f8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; -import javafx.scene.chart.Chart; - -import java.util.Date; /** * @Description : 模块表单枚举类 @@ -1572,9 +1569,9 @@ public class BlockFormEnumUtil { * 表单功能明细 触发效果信息 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TRIGGER_EFFECT { + public enum BUTTON_TRIGGER_EFFECT { DIALOG(10, "DIALOG", "弹出窗口"), - WINDOW_NEW(20, "NEW_WINDOW", "新开窗口"), + NEW_WINDOW(20, "NEW_WINDOW", "新开窗口"), SQL(30, "SQL", "执行SQL"), CLASS_METHOD(40, "CLASS_METHOD", "执行类方法"); @@ -1582,7 +1579,7 @@ public class BlockFormEnumUtil { private String name; private String description; - TRIGGER_EFFECT(int value, String name, String description) { + BUTTON_TRIGGER_EFFECT(int value, String name, String description) { this.value = value; this.name = name; this.description = description; @@ -1600,7 +1597,7 @@ public class BlockFormEnumUtil { return name; } - public static TRIGGER_EFFECT valueOf(int val) { + public static BUTTON_TRIGGER_EFFECT valueOf(int val) { for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ResourceEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ResourceEnumUtil.java index 1a7d0cd..f6481e7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ResourceEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ResourceEnumUtil.java @@ -22,7 +22,8 @@ public class ResourceEnumUtil { NUM_NOT_EQUAL("10007", "字符值不相同"), STRING_NOT_EQUAL("10008", "数字值不相同"), OVER_SIZE("10009", "长度超出"), - NOT_ZERO("10010", "不能为0"); + NOT_ZERO("10010", "不能为0"), + CLOUD_CRAP("10011", "无法使用服务"); private String code; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java new file mode 100644 index 0000000..47cee30 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -0,0 +1,110 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : sweb枚举类 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-02 20:21 + * @Modify: + **/ +public class SwebEnumUtil { + + /** + * 单据主表状态(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_MASTER_STATUS { + CREATE(10, "新建"), + RECEIPT(20, "已发布"), + RECEIPT_FINISH(30, "已确认"), + CLOSED(40, "已打印"), + CANCELLED(50, "已发货"); + + private int value; + private String description; + + ORDER_MASTER_STATUS(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; + } + } + + /** + * 订单明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_DETAILS_STATUS { + CREATE(10, "新建"), + RECEIPT(20, "已发布"), + RECEIPT_FINISH(30, "已确认"), + CLOSED(40, "已打印"), + CANCELLED(50, "已发货"); + + private int value; + private String description; + + ORDER_DETAILS_STATUS(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; + } + } + +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index afc39d4..a7bf29d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -80,7 +80,6 @@ public class WmsEnumUtil { } - /** * 主表信息 单据类型 */ @@ -584,60 +583,37 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LINK_ORDER_TYPE { - ASN(10, "ASN", "ASN"), - PO(20, "PO", "PO"), - SO(30, "SO", "SO"), - MOVE(40, "MOVE", "MOVE"), - IN_STOCK(50, "IN_STOCK", "IN_STOCK"), - SHIPPING(60, "SHIPPING", "SHIPPING"), - QC(70, "QC", "QC"), - CS(80, "CS", "CS"); - private int value; - private String code; + ASN("ASN", "ASN"), + PO("PO", "PO"), + SO("SO", "SO"), + MOVE("MOVE", "MOVE"), + IN_STOCK("IN_STOCK", "IN_STOCK"), + SHIPPING("SHIPPING", "SHIPPING"), + QC("QC", "QC"), + CS("CS", "CS"); + private String value; private String description; - LINK_ORDER_TYPE(int value, String code, String description) { + LINK_ORDER_TYPE(String value, 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; + return value; } - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; + public String getValue() { + return value; } - public static LINK_ORDER_TYPE codeOf(String code) { - int tmp = 1; + public static LINK_ORDER_TYPE codeOf(String value) { for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { + if (values()[i].value.equals(value)) { return values()[i]; } } @@ -720,7 +696,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_STATUS { - CREATE(10,"创建"), + CREATE(10, "创建"), QUALITY_CONTROL(20, "质检中"), PRE_INSTOCK(30, "待入库"), INSTOCKED(40, "入库"), diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index cbedf52..8ac9fdc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.base.jpa.dao; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.common.Pager; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.NoRepositoryBean; @@ -39,6 +40,7 @@ public interface BaseRepository extends JpaReposito /** * 执行ql语句 + * hql写法：update obj set name = ？，问号舒徐需要和list顺序一致 * @param qlString 基于jpa标准的ql语句 * @param values ql中的T参数值,单个参数值或者多个参数值 * @return 返回执行后受影响的数据个数 @@ -47,6 +49,7 @@ public interface BaseRepository extends JpaReposito /** * 执行ql语句 + * hql写法：update obj set name = :name * @param qlString 基于jpa标准的ql语句 * @param params key表示ql中参数变量名，value表示该参数变量值 * @return 返回执行后受影响的数据个数 @@ -55,6 +58,7 @@ public interface BaseRepository extends JpaReposito /** * 执行ql语句，可以是更新或者删除操作 + * hql写法：update obj set name = ？，问号舒徐需要和list顺序一致 * @param qlString 基于jpa标准的ql语句 * @param values ql中的T参数值 * @return 返回执行后受影响的数据个数 @@ -65,11 +69,11 @@ public interface BaseRepository extends JpaReposito /** * 强删除 */ - public void deleteById(ID id); - public int deleteByProperty(String propName, Object propValue); - public int deleteByPropertyIn(String propName, Object[] propValues); - public int deleteByIds(ID[] ids); - public int deleteByProperties(String[] propNames, Object[] objValues); + void deleteById(ID id); + int deleteByProperty(String propName, Object propValue); + int deleteByPropertyIn(String propName, Object[] propValues); + int deleteByIds(ID[] ids); + int deleteByProperties(String[] propNames, Object[] objValues); /** * 通过多单属性进行单个值更新 @@ -78,7 +82,7 @@ public interface BaseRepository extends JpaReposito * @param propertyName * @param propertyValue */ - public int updateByProperties(String conditionName, Object conditionValue, String propertyName, Object propertyValue); + int updateByProperties(String conditionName, Object conditionValue, String propertyName, Object propertyValue); /** * 通过单个属性进行多个值更新 @@ -87,7 +91,7 @@ public interface BaseRepository extends JpaReposito * @param propertyName * @param propertyValue */ - public int updateByProperties(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue); + int updateByProperties(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue); /** * 通过多个属性进行单个值更新 @@ -96,7 +100,7 @@ public interface BaseRepository extends JpaReposito * @param propertyName * @param propertyValue */ - public int updateByProperties(String[] conditionName, Object[] conditionValue, String propertyName, Object propertyValue); + int updateByProperties(String[] conditionName, Object[] conditionValue, String propertyName, Object propertyValue); /** * 通过多个属性进行多个值更新 @@ -105,7 +109,7 @@ public interface BaseRepository extends JpaReposito * @param propertyName 更新属性名称 * @param propertyValue 更新属性值 */ - public int updateByProperties(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue); + int updateByProperties(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue); /** * 根据 hqlWhere 批量修改制定字段 @@ -114,7 +118,7 @@ public interface BaseRepository extends JpaReposito * @param propertyValue 修改后的值 * @return */ - public int updateByHqlWhere(String hqlWhere,String propertyName, Object propertyValue); + int updateByHqlWhere(String hqlWhere,String propertyName, Object propertyValue); /** * 批量修改数据熟悉 @@ -123,98 +127,135 @@ public interface BaseRepository extends JpaReposito * @param propertyValue 修改后的值 * @return */ - public int updateByHqlWhere(String hqlWhere,String[] propertyName, Object[] propertyValue); + int updateByHqlWhere(String hqlWhere,String[] propertyName, Object[] propertyValue); - public T getById(long id); + T getById(long id); - public List list(); + List list(); - public List list(final String hql); + List list(final String hql); - public List listPager(Pager pager); + List listPager(Pager pager); - public List findByPage(final String hql, final int offset,final int pageSize); + List findByPage(final DdlPackBean packBean, final int offset, final int pageSize); - public List findByPage(final String hql, final Object[] values, final int offset, final int pageSize); + /** + * @param hql hql入参需要用问号代替 + * @param values 按照入参问号的顺序进行赋值 + * @param offset + * @param pageSize + * @return + */ + List findByPage(final String hql, final Object[] values, final int offset, final int pageSize); + + List findByProperty(String propertyName, Object value); + + List findByProperty(String[] propertyNames, Object[] values); + + List findByProperty(String propertyName, Object value,String orderByStuff); - public List findByProperty(String propertyName, Object value); + List findByProperty(String[] propertyNames, Object[] values,String orderByStuff); - public List findByProperty(String[] propertyNames, Object[] values); + T getByProperty(String propertyName, Object value); - public List findByProperty(String propertyName, Object value,String orderByStuff); + T getByProperty(String[] propertyNames, Object[] values); - public List findByProperty(String[] propertyNames, Object[] values,String orderByStuff); + int listCount(); - public T getByProperty(String propertyName, Object value); + int findByPropertyCount(String propertyName, Object value); - public T getByProperty(String[] propertyNames, Object[] values); + int findByPropertyCount(String[] propertyNames, Object[] values); - public int listCount(); + List findByPropertyPage(String propertyName, Object value,String orderByStuff,Pager pager); - public int findByPropertyCount(String propertyName, Object value); + List findByPropertyPage(String[] propertyNames, Object[] values,String orderByStuff,Pager pager); - public int findByPropertyCount(String[] propertyNames, Object[] values); + @Deprecated + List findByHql(String hql); - public List findByPropertyPage(String propertyName, Object value,String orderByStuff,Pager pager); + @Deprecated + List findByHqlWhere(String hqlWhere); - public List findByPropertyPage(String[] propertyNames, Object[] values,String orderByStuff,Pager pager); + List findByHqlWhere(DdlPackBean packBean); - public List findByHql(String hql); + List findByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values,String orderByStuff); - public List findByHqlWhere(String hqlWhere); + int findByHqlWhereCount(String hqlWhere,String[] propertyNames, Object[] values); - public List findByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values,String orderByStuff); + List findByHqlWherePage(String hqlWhere, Pager pager,String[] propertyNames, Object[] values,String orderByStuff); - public int findByHqlWhereCount(String hqlWhere,String[] propertyNames, Object[] values); + @Deprecated + List findByHqlWherePage(String hqlWhere, Pager pager); - public List findByHqlWherePage(String hqlWhere, Pager pager,String[] propertyNames, Object[] values,String orderByStuff); + List findByHqlWherePage(DdlPackBean packBean, Pager pager); - public List findByHqlWherePage(String hqlWhere, Pager pager); + @Deprecated + int findByHqlWhereCount(String hqlWhere); - public int findByHqlWhereCount(String hqlWhere); + int findByHqlWhereCount(DdlPackBean packBean); - public int findByHqlCount(String hql); + int findByHqlCount(String hql); - public int findByHqlCount(String hql,String[] paramName,Object[] paramValue); + int findByHqlCount(String hql,String[] paramName,Object[] paramValue); - public List findByHqlPage(String hql, Pager pager); + @Deprecated + List findByHqlPage(String hql, Pager pager); - public List findByHqlPage(String hql, Pager pager,String[] paramName,Object[] paramValue); + List findByHqlPage(DdlPackBean packBean, Pager pager); - public List findBySql(String sql); + List findByHqlPage(String hql, Pager pager,String[] paramName,Object[] paramValue); - public List findBySql(String sql,Class entity); + @Deprecated + List findBySql(String sql); - public List findBySqlPage(String sql,Pager pager); + @Deprecated + List findBySql(String sql,Class entity); - public List findBySqlPage(String sql,Class entity,Pager pager); + @Deprecated + List findBySqlPage(String sql,Pager pager); - public int executeSql(String sql); + @Deprecated + List findBySqlPage(String sql,Class entity,Pager pager); - public int findBySqlCount(String sql); + @Deprecated + int executeSql(String sql); - public double findBySqlSumDouble(String sql,String columnName); + @Deprecated + int findBySqlCount(String sql); - public double findByHqlDouble(String hql); + @Deprecated + double findBySqlSumDouble(String sql,String columnName); - public long findByHqlLong(String hql); + @Deprecated + double findByHqlDouble(String hql); - public List findByHqlTopWhere(String hqlWhere,int topNum); + double findByHqlDouble(DdlPackBean packBean); - public List findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager); + @Deprecated + long findByHqlLong(String hql); + + long findByHqlLong(DdlPackBean packBean); + + @Deprecated + List findByHqlTopWhere(String hqlWhere,int topNum); + + List findByHqlTopWhere(DdlPackBean packBean,int topNum); + + @Deprecated + List findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager); /********************** 多表联查，返回Object[]数组根据hql查询翻页信息 开始 ****************************/ - public List findByHqlObjects(String hql); + List findByHqlObjects(String hql); - public List findByHqlObjects(String hql,String[] paramName,Object[] paramValue); + List findByHqlObjects(String hql,String[] paramName,Object[] paramValue); - public List findByHqlPageObjects(String hql, Pager pager); + List findByHqlPageObjects(String hql, Pager pager); - public List findByHqlPageObjects(String hql, Pager pager,String[] paramName,Object[] paramValue); + List findByHqlPageObjects(String hql, Pager pager,String[] paramName,Object[] paramValue); - public List findBySqlObjList(String sql); + List findBySqlObjList(String sql); - public List findBySqlObjListByPager(String sql,Pager pager); + List findBySqlObjListByPager(String sql,Pager pager); /****************** 部分业务处理 *******************/ @@ -222,49 +263,52 @@ public interface BaseRepository extends JpaReposito * 弱删除 * @return count */ - public int deleteWeaklyById(ID id,String username); - public int deleteWeaklyByIds(Long[] ids,String username) ; - public int deleteWeaklyByProperty(String propName, Object propValue,String username); - public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username); - public int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username); + int deleteWeaklyById(ID id,String username); + int deleteWeaklyByIds(Long[] ids,String username) ; + int deleteWeaklyByProperty(String propName, Object propValue,String username); + int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username); + int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username); /** * 更新启用禁用 * @return count */ - public int updateValidStatusById(ID id,int status,String username); - public int updateValidStatusByIds(Long[] ids,int status,String username) ; - public int updateValidStatusByProperty(String propName, Object propValue,int status,String username); - public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username); - public int updateValidStatusByProperties(String[] propNames, Object[] objValues,int status,String username); + int updateValidStatusById(ID id,int status,String username); + int updateValidStatusByIds(Long[] ids,int status,String username) ; + int updateValidStatusByProperty(String propName, Object propValue,int status,String username); + int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username); + int updateValidStatusByProperties(String[] propNames, Object[] objValues,int status,String username); + + boolean isExitByProperty(String propertyName, Object value); - public boolean isExitByProperty(String propertyName, Object value); + boolean isExitByProperty(String[] propertyNames, Object[] values); - public boolean isExitByProperty(String[] propertyNames, Object[] values); + boolean isExitByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values); - public boolean isExitByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values); + boolean isExitByHqlWhere(String hqlWhere); - public boolean isExitByHqlWhere(String hqlWhere); + @Deprecated + boolean isExitByHql(String hql); - public boolean isExitByHql(String hql); + boolean isExitByHql(DdlPackBean packBean); - public boolean isExitByHql(String hql,String[] paramName,Object[] paramValue); + boolean isExitByHql(String hql,String[] paramName,Object[] paramValue); - public boolean isExitBySql(String sql); + boolean isExitBySql(String sql); - public double findSumByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + double findSumByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); - public double findSumByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + double findSumByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); - public double findAvgByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + double findAvgByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); - public double findAvgByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + double findAvgByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); - public double findMaxByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + double findMaxByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); - public double findMaxByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + double findMaxByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); - public double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); - public double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 5509994..3024c67 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1,5 +1,6 @@ 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.jpa.dao.BaseRepository; @@ -277,11 +278,23 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public List findByPage(String hql, int offset, int pageSize) { - return entityManager.createQuery("from " + persistentClass.getName()) - .setFirstResult(offset) - .setMaxResults(pageSize) - .getResultList(); + public List findByPage(DdlPackBean packBean, int offset, int pageSize) { + Query query = null; + String ddl = "from " + persistentClass.getName() + " where 1=1 " +packBean.getPackedHql(); + + if(packBean.isHql()){ + query = entityManager.createQuery(ddl); + }else{ + query = entityManager.createNativeQuery(ddl); + } + + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter(key,packBean.getHqlPreparedMap().get(key)); + } + + return query.setFirstResult(offset) + .setMaxResults(pageSize) + .getResultList(); } @Override @@ -523,11 +536,13 @@ public class BaseRepositoryImpl extends SimpleJpaRep } } + @Deprecated @Override public List findByHql(String hql) { return entityManager.createQuery(hql).getResultList(); } + @Deprecated @Override public List findByHqlWhere(String hqlWhere) { StringBuffer queryString = new StringBuffer(); @@ -541,9 +556,22 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public List findByHqlWhere(DdlPackBean packBean) { + Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + + " as model where 1=1 " + packBean.getPackedHql()); + + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + + return query.getResultList(); + } + + @Override public List findByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values, String orderByStuff) { if(propertyNames.length != values.length){ - throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -638,6 +666,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } } + @Deprecated @Override public List findByHqlWherePage(String hqlWhere, Pager pager) { if(pager.getTotalRows() > 0) { @@ -658,6 +687,25 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public List findByHqlWherePage(DdlPackBean packBean, Pager pager) { + if(pager.getTotalRows() > 0) { + Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + + " as model where 1=1 " + packBean.getPackedHql()); + + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + + return query.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + }else{ + return new ArrayList(); + } + } + + @Deprecated + @Override public int findByHqlWhereCount(String hqlWhere) { StringBuffer queryString = new StringBuffer(); queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -674,6 +722,24 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public int findByHqlWhereCount(DdlPackBean packBean) { + StringBuffer queryString = new StringBuffer(); + queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + + " as model where 1=1 " + packBean.getPackedHql()); + + Query query = entityManager.createQuery(queryString.toString(), Long.class); + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + try{ + Long count = (Long) query.getSingleResult(); + return count == null ? 0 : count.intValue(); + }catch(NoResultException e){ + return 0; + } + } + + @Override public int findByHqlCount(String hql) { try{ Long count = entityManager.createQuery(hql,Long.class).getSingleResult(); @@ -709,9 +775,27 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return entityManager.createQuery(queryString.toString()) - .setFirstResult(pager.getStartRow()) - .setMaxResults(pager.getPageSize()) - .getResultList(); + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + }else{ + return new ArrayList(); + } + } + + @Override + public List findByHqlPage(DdlPackBean packBean, Pager pager) { + if(pager.getTotalRows() > 0){ + Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + + " as model where 1=1 " + packBean.getPackedHql()); + + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + + return query.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); }else{ return new ArrayList(); } @@ -808,6 +892,22 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public double findByHqlDouble(DdlPackBean packBean) { + try{ + Query query = entityManager.createQuery(packBean.getPackedHqlAll(),Double.class); + + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + + Double result = (Double) query.getSingleResult(); + return result == null ? 0 : result; + }catch(NoResultException e){ + return 0; + } + } + + @Override public long findByHqlLong(String hql) { try{ return entityManager.createQuery(hql,Long.class).getSingleResult(); @@ -817,6 +917,22 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public long findByHqlLong(DdlPackBean packBean) { + try{ + Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + + " as model where 1=1 " + packBean.getPackedHql(),Long.class); + + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + + return (long) query.getSingleResult(); + }catch(NoResultException e){ + return 0; + } + } + + @Override public List findByHqlTopWhere(String hqlWhere, int topNum) { StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -828,6 +944,17 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public List findByHqlTopWhere(DdlPackBean packBean, int topNum) { + Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + + " as model where 1=1 " + packBean.getPackedHql()); + + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + return query.setFirstResult(0).setMaxResults(topNum).getResultList(); + } + + @Override public List findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) { if(pager.getTotalRows() > 0) { StringBuffer queryString = new StringBuffer(); @@ -840,7 +967,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep queryString.append(" " + orderByStuff); - return entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + return entityManager.createQuery(queryString.toString()) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); }else{ return new ArrayList(); } @@ -912,7 +1042,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep */ private T innerSave(T item) { try { - if(item==null)return null; + if(item ==null) { + return null; + } Class clazz = item.getClass(); //获取主键 @@ -1119,6 +1251,11 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public boolean isExitByHql(DdlPackBean packBean) { + return findByHqlWhereCount(packBean) > 0; + } + + @Override public boolean isExitByHql(String hql, String[] paramName, Object[] paramValue) { return findByHqlCount(hql) > 0; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java new file mode 100644 index 0000000..cecaee4 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -0,0 +1,450 @@ +package cn.estsh.i3plus.pojo.base.tool; + +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.Date; +import java.util.List; + +/** + * @Description : 数据库脚本封装方法，封装成预加载hql，HqlPack仅限用于一些特定的sql，可能造成性能低下 + * example： name = :name + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-03-29 + * @Modify: + **/ +public class DdlPreparedPack { + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL对象 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, + DdlPackBean packBean, boolean isShowTime) { + if (startDate == null || startDate.trim().length() == 0) { + startDate = "1900-01-01"; + } else { + startDate = startDate.trim(); + } + if (isShowTime && startDate.trim().length() <= 11) { + startDate += " 00:00:00"; + } + if (endDate == null || endDate.trim().length() == 0) { + endDate = "2100-01-01"; + } else { + endDate = endDate.trim(); + } + if (isShowTime && endDate.trim().length() <= 11) { + endDate += " 23:59:59"; + } + + packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, startDate); + packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, endDate); + } + + /** + * 封装日期 + * + * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL + * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String date, String columnName, DdlPackBean packBean, Boolean showTaday, boolean isShowTime) { + if (date != null && date.trim().length() > 0) { + String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); + if (date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))) { + //只有一个逗号 + date = ""; + } + + String[] time = date.split(","); + if (time.length == 1) { + //只有开始日期，没有结束日期 + 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))) { + if (time[0] == null || time[0].trim().length() == 0) { + time[0] = "1900-01-01"; + } else { + time[0] = time[0].trim(); + } + if (isShowTime && time[0].trim().length() <= 11) { + time[0] += " 00:00:00"; + } + if (time[1] == null || time[1].trim().length() == 0) { + time[1] = "2100-01-01"; + } else { + time[1] = time[1].trim(); + } + if (isShowTime && time[1].trim().length() <= 11) { + time[1] += " 23:59:59"; + } + packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, time[0]); + packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, time[1]); + } else { + if (showTaday) { + if (isShowTime) { + packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, today + " 00:00:00"); + packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, today + " 23:59:59"); + } else { + packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, today); + packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, today); + } + } + } + } + } + + + /** + * 封装日期 + * + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param packBean 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, + DdlPackBean packBean, boolean isShowTime) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (date == null || date.trim().length() == 0) { + date = sdf.format(new Date()); + } + 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); + return; + } else if (date.trim().length() <= 11) { + date += " 00:00:00"; + } + packBean.addColumnQuery(null," and '" + date + "' between model." + startColumnName + + " and model." + endColumnName, null); + } + + /** + * 封装String对象成order by排序 + * + * @param columnName 列名 + * @param packBean + */ + public static void getOrderByPack(Object order[], String[] columnName, DdlPackBean packBean) { + String sqlStr = ""; + String orderByStr = ""; + for (int i = 0; i < order.length; i++) { + if (order[i] != null && order[i].toString().trim().length() > 0) { + if (Integer.parseInt(order[i].toString()) == 1) { + order[i] = "asc"; + } else { + order[i] = "desc"; + } + sqlStr += " model." + columnName[i] + " " + order[i].toString() + ","; + } + } + + if (sqlStr.length() > 0 && sqlStr.lastIndexOf(",") == sqlStr.length() - 1) { + sqlStr = sqlStr.substring(0, sqlStr.length() - 1); + orderByStr = " order by " + sqlStr; + } + + packBean.setOrderByStr(orderByStr); + } + + /** + * 对象默认排序 + */ + public static void getOrderDefault(BaseBean bean) { + if (bean != null && StringUtils.isBlank(bean.getOrderByParam())) { + bean.setOrderByParam("modifyDatetime"); + bean.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + } + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + 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 + "%"); + } + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + 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 + "%"); + } + } + + /** + * 封装String对象成like语句(右侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + 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 + "%"); + } + } + + /** + * 封装String对象成like语句(左侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + 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); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + 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); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + 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); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + 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); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + 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); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + 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); + } + } + + /** + * 封装double对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + 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); + } + } + + /** + * 封装double对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + 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); + } + } + + /** + * 封装long或者int的整数对象成equal语句(不等于) + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumNOEqualPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, data); + } + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPack(String data, String columnName, DdlPackBean packBean) { + if (data != null && data.trim().length() > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + } + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getOrInPack(String data, String columnName, DdlPackBean packBean) { + if (data != null && data.trim().length() > 0) { + packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackString(Object[] data, String columnName, DdlPackBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackString(List data, String columnName, DdlPackBean packBean) { + if (data != null && data.size() > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInOrPackString(String data, String columnName, DdlPackBean packBean) { + if (data != null && data.trim().length() > 0) { + //判断最后一位是不是逗号 + if (data.lastIndexOf(",") != (data.length() - 1)) { + data += ","; + } + String[] dataArray = data.substring(0, data.length() - 1).split(","); + data = ""; + for (int i = 0; i < dataArray.length; i++) { + if (i == dataArray.length - 1) { + data += "'" + dataArray[i] + "'"; + } else { + data += "'" + dataArray[i] + "',"; + } + } + packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackString(String data, String columnName, DdlPackBean packBean) { + if (data != null && data.trim().length() > 0) { + //判断最后一位是不是逗号 + if (data.lastIndexOf(",") != (data.length() - 1)) { + data += ","; + } + String[] dataArray = data.substring(0, data.length() - 1).split(","); + data = ""; + for (int i = 0; i < dataArray.length; i++) { + if (i == dataArray.length - 1) { + data += "'" + dataArray[i] + "'"; + } else { + data += "'" + dataArray[i] + "',"; + } + } + packBean.addColumnQuery(columnName," and." + columnName + " not in (:m_" + columnName + ")", data); + } + } + + /** + * 封装not in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPack(String data, String columnName, DdlPackBean packBean) { + if (data != null && data.trim().length() > 0) { + packBean.addColumnQuery(columnName," and." + columnName + " not in (:m_" + columnName + ")", data); + } + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index 802e693..0e8af5f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -7,6 +7,13 @@ import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; import java.util.Date; +/** + * @Description : + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-10-13 18:17 + * @Modify: + **/ public class HqlPack { /** @@ -165,11 +172,9 @@ public class HqlPack { * 对象默认排序 */ public static void getOrderDefault(BaseBean bean) { - if(bean != null){ - if(StringUtils.isBlank(bean.getOrderByParam())){ - bean.setOrderByParam("modifyDatetime"); - bean.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); - } + if(bean != null && StringUtils.isBlank(bean.getOrderByParam())){ + bean.setOrderByParam("modifyDatetime"); + bean.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); } } @@ -279,7 +284,7 @@ public class HqlPack { * @param result */ public static void getNumEqualPackForZero(Object data,String columnName, StringBuffer result) { - if (data != null && Long.parseLong(data.toString()) >= 0) { + if (data != null && Long.parseLong(data.toString()) > 0) { data = getSafeParam(data); result.append(" and model."+columnName+" = " + data + ""); } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index 7b20d71..bc8a73b 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -9,7 +9,6 @@ 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; @@ -26,31 +25,39 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_BUTTON") -@Api(value="表单按钮",description = "表单按钮") +@Table(name = "BF_BUTTON") +@Api(value = "表单按钮", description = "表单按钮") public class BfButton extends BaseBean { - @Column(name="BUTTON_NAME") - @ApiParam(value ="按钮名称") + @Column(name = "BUTTON_NAME") + @ApiParam(value = "按钮名称") private String buttonName; - // 枚举:BlockFormEnumUtil.TRIGGER_EFFECT - @Column(name="TRIGGER_MODE") - @ApiParam(value ="触发方式") + // 枚举:BlockFormEnumUtil.BUTTON_TRIGGER_EFFECT + @Column(name = "TRIGGER_MODE") + @ApiParam(value = "触发方式") private Integer triggerMode; + public Integer getTriggerMode() { + if (triggerMode == null) { + return null; + } else { + return triggerMode.intValue(); + } + } + // 关联表单功能表id - @Column(name="METHOD_ID") - @ApiParam(value ="表单功能id") + @Column(name = "METHOD_ID") + @ApiParam(value = "表单功能id") @JsonSerialize(using = ToStringSerializer.class) private Long methodId; - @Column(name="METHOD_NAME_RDD") - @ApiParam(value ="表单功能名称") + @Column(name = "METHOD_NAME_RDD") + @ApiParam(value = "表单功能名称") private String methodNameRdd; // 执行类方法,sql,脚本 - @Column(name="METHOD_CONTENT") - @ApiParam(value ="执行内容") + @Column(name = "METHOD_CONTENT") + @ApiParam(value = "执行内容") private String methodContent; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index fbedb77..9cb8bbc 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -52,6 +52,20 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="数据对象类型") private Integer objectColumnType; + // 字段长度 + @ApiParam(value = "字段长度") + @Column(name="OBJECT_COLUMN_PRECISION") + private Integer objectColumnPrecision; + + // 字段精确长度 + @ApiParam(value = "字段精确长度") + @Column(name="OBJECT_COLUMN_SCALE") + private Integer objectColumnScale; + + @Column(name="OBJECT_COLUMN_TYPE_NAME") + @ApiParam(value ="数据对象类型名称") + private String objectColumnTypeName; + @Column(name="PROPERTY_NAME") @ApiParam(value ="类属性名称") private String propertyName; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 428758e..c03a7c4 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -164,4 +164,19 @@ public final class FormHqlPack { return result.toString(); } + + /** + * 表单按钮复杂查询 + * @param bfButton 查询条件 + */ + public static String packHqlBfButton(BfButton bfButton){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", result); + HqlPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", result); + HqlPack.getNumEqualPack(bfButton.getIsDeleted(), "isDeleted", result); + result.append(bfButton.orderBy()); + + return result.toString(); + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java deleted file mode 100644 index efc83a4..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package cn.estsh.i3plus.pojo.mes; - - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify: - **/ -@Entity -@Table(name="machine_factory") -@Api("工厂") -public class MachineFactory extends BaseBean { - - @Column(name="factory_code") - @ApiParam("工厂代码") - private String factoryCode; - - @Column(name="factory_name") - @ApiParam("工厂名称") - private String factoryName; - - public MachineFactory() { - } - - public MachineFactory(String factoryCode, String factoryName) { - this.factoryCode = factoryCode; - this.factoryName = factoryName; - } - - public String getFactoryCode() { - return factoryCode; - } - - public void setFactoryCode(String factoryCode) { - this.factoryCode = factoryCode; - } - - public String getFactoryName() { - return factoryName; - } - - public void setFactoryName(String factoryName) { - this.factoryName = factoryName; - } - - @Override - public String toString() { - return "MachineFactory{" + - "factoryCode='" + factoryCode + '\'' + - ", factoryName='" + factoryName + '\'' + - ", id=" + id + - ", createDate='" + createDatetime + '\'' + - ", modifyDate='" + modifyDatetime + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java deleted file mode 100644 index a2e02f2..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.estsh.i3plus.pojo.mes; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify:: - **/ -public class WorkPlan { - private String desc; - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java new file mode 100644 index 0000000..411b45c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_AREA") +@Api("生产区域") +public class MesArea extends BaseBean { + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String areaName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java new file mode 100644 index 0000000..b2df5e6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工序 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROCESS") +@Api("工序") +public class MesProcess extends BaseBean { + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "PROCESS_NAME") + @ApiParam("工序名称") + private String processName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java new file mode 100644 index 0000000..d66c490 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :产品类流程配置表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_ROUTE_CFG") +@Api("产品类流程配置表") +public class MesProdRouteCfg extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java new file mode 100644 index 0000000..8056e07 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :产品流程配置操作参数表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_ROUTE_OPT_PARAM") +@Api("产品流程配置操作参数表") +public class MesProdRouteOptParam extends BaseBean { + @Column(name = "PROD_ROUTE_CFG_ID") + @ApiParam("产品流程ID") + private Long prodRouteCfgId; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name = "PARAM_CODE") + @ApiParam("工步参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("工步参数值") + private String paramValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java new file mode 100644 index 0000000..fedd8d0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :流程表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE") +@Api("流程表") +public class MesRoute extends BaseBean { + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_NAME") + @ApiParam("流程名称") + private String routeName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java new file mode 100644 index 0000000..0434ff5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :流程工序关系 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE_PROCESS") +@Api("流程工序关系") +public class MesRouteProcess extends BaseBean { + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "NEXT_PROCESS") + @ApiParam("下一工序") + private String nextProcess; + + @Column(name = "REPAIR_PROCESS") + @ApiParam("维修工序") + private String repairProcess; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Column(name = "IS_NECESSARY") + @ApiParam("是否必须") + private Integer isNecessary; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java new file mode 100644 index 0000000..64027fc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工序工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE_PROCESS_CELL") +@Api("工序工作单元对照") +public class MesRouteProcessCell extends BaseBean { + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java new file mode 100644 index 0000000..b75e800 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :流程工序工步关系 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE_PROCESS_STEP") +@Api("流程工序工步关系") +public class MesRouteProcessStep extends BaseBean { + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name = "PARAM_CODE") + @ApiParam("工步参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("工步参数值") + private String paramValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java new file mode 100644 index 0000000..7d08328 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工步 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STEP") +@Api("工步") +public class MesStep extends BaseBean { + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_NAME") + @ApiParam("工步名称") + private String stepName; + + @Column(name = "STEP_TEXT") + @ApiParam("工步描述") + private String stepText; + + @Column(name = "STEP_TYPE") + @ApiParam("工步类型") + private String stepType; + + @Column(name = "STEP_OBJECT") + @ApiParam("工步对象") + private String stepObject; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java new file mode 100644 index 0000000..fae3126 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工步参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STEP_PARAM") +@Api("工步参数") +public class MesStepParam extends BaseBean { + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_ATTRIBUTE") + @ApiParam("参数属性") + private String paramAttribute; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java new file mode 100644 index 0000000..9a42ad8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL") +@Api("工作单元") +public class MesWorkCell extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java new file mode 100644 index 0000000..e293fe0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工作中心 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CENTER") +@Api("工作中心") +public class MesWorkCenter extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "ERP_WORK_CENTER") + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @Column(name = "WORK_VER") + @ApiParam("工作版本") + private String workVer; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java new file mode 100644 index 0000000..f21c31f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java @@ -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.MesArea; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java new file mode 100644 index 0000000..620b24c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessRepository.java @@ -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.MesProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java new file mode 100644 index 0000000..4c21991 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteCfgRepository.java @@ -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.MesProdRouteCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java new file mode 100644 index 0000000..51a8c39 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdRouteOptParamRepository.java @@ -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.MesProdRouteOptParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteOptParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java new file mode 100644 index 0000000..468d495 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessCellRepository.java @@ -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.MesRouteProcessCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java new file mode 100644 index 0000000..2f7b0aa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessRepository.java @@ -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.MesRouteProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java new file mode 100644 index 0000000..4391f26 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteProcessStepRepository.java @@ -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.MesRouteProcessStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java new file mode 100644 index 0000000..a7e0fc9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRouteRepository.java @@ -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.MesRoute; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java new file mode 100644 index 0000000..c29cda0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepParamRepository.java @@ -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.MesStepParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java new file mode 100644 index 0000000..30726eb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepRepository.java @@ -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.MesStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java new file mode 100644 index 0000000..8ea9b89 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java @@ -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.MesWorkCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java new file mode 100644 index 0000000..bf89b2a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java @@ -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.MesWorkCenter; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCenterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/i3plus-pojo-model.iml b/modules/i3plus-pojo-model/i3plus-pojo-model.iml index 97807fd..97faa2e 100644 --- a/modules/i3plus-pojo-model/i3plus-pojo-model.iml +++ b/modules/i3plus-pojo-model/i3plus-pojo-model.iml @@ -35,6 +35,7 @@ + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java new file mode 100644 index 0000000..d39de03 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.form; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 数据操作Model + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-04-02 13:34 + * @Modify: + **/ +@Data +public class ElementFormModel { + + //外键关联数据对象主键 + @ApiParam(value = "元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementId; + + @ApiParam(value = "操作参数") + private String entity; + +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java index a420d5e..7eadec2 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -40,6 +41,7 @@ public class SwebPackage extends BaseBean { @ApiParam("上级包装编号") public String parentPackageNo; + @ColumnDefault("0") @Column(name="PACKAGE_QTY") @ApiParam(value = "包装件数", example = "1") public Integer packageQty; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java index 144cf36..6143e86 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -44,6 +45,7 @@ public class SwebProcurementPlanOrderDetails extends BaseBean { @Column(name = "UNIT") private String unit; + @ColumnDefault("0") @ApiParam("标准包装") @Column(name = "SNP_QTY") private Double snpQty; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java index 800016a..5f2434f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,9 +29,13 @@ import javax.persistence.Table; @Api("订单修改日志记录表") public class SwebPurchaseChangeLog extends BaseBean { - @Column(name = "ORDER_ITEM_NO") + @Column(name = "ORDER_NO") @ApiParam("单据明细编号") - public String orderItemNo; + public String orderNo; + + @ApiParam(value = "零件号") + @Column(name = "PART_NO") + private String partNo; @ApiParam(value = "订单当前状态") @Column(name = "ITEM_STATUS") @@ -38,6 +43,7 @@ public class SwebPurchaseChangeLog extends BaseBean { @Column(name = "QTY") @ApiParam("零件数量") + @ColumnDefault("0") public Double qty; @Column(name = "REMARK") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 0eb0740..1c0f96d 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -81,7 +81,7 @@ public class SwebPurchaseOrder extends BaseBean { public String deliveryTime; @Column(name = "REC_TIME") - @ApiParam(value = "交货时间") + @ApiParam(value = "收货时间") public String recTime; @Column(name = "IS_SYN") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 4935cf0..70f8a1c 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -155,9 +155,9 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam(value = "行号", example = "0") private Integer itemNo; - @Column(name = "COMFIRM_TIME") + @Column(name = "CONFIRM_TIME") @ApiParam(value = "确认时间") - public String comfirmTime; + public String confirmTime; @Column(name = "DELIVERY_TIME") @ApiParam(value = "交货时间") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java new file mode 100644 index 0000000..7abfb33 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseChangeLog; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 查看订单明细修改历史 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-02 13:13 + * @Modify: + **/ +@Data +public class SwebPODetailsUpdateHistoryModel extends BaseBean { + + @ApiParam("单据号") + private String orderNo; + + @ApiParam("供应商编号") + private String vendorCode; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "订单数量") + private Double refQty; + + @ApiParam(value = "确认到货数量") + private Double confirmQty; + + @ApiParam(value = "变更列表") + private ListPager history; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java new file mode 100644 index 0000000..6d17e46 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 待发布订单列表输入模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-02 13:13 + * @Modify: + **/ +@Data +public class SwebPOForPubListEnterModel extends BaseBean { + + @ApiParam("单据号") + private String orderNo; + + @ApiParam("供应商编号") + private String vendorCode; + + @ApiParam(value = "订单类型", example = "1") + public Integer orderType; + + @ApiParam(value = "预计到货日期开始日期") + public String recTimeStart; + + @ApiParam(value = "预计到货日期结束日期") + public String recTimeEnd; + + @ApiParam(value = "零件号") + private String partNo; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java new file mode 100644 index 0000000..4f28ae4 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.ColumnDefault; + +import javax.persistence.Column; +import java.util.List; +import java.util.Map; + +/** + * @Description : 待发布订单列表输出模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-02 13:13 + * @Modify: + **/ +@Data +public class SwebPOForPubListResultModel extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam("单据号") + public String orderNo; + + @Column(name = "PART_NO") + @ApiParam(value = "零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "单位") + @Column(name = "UNIT") + private String unit; + + @ApiParam(value = "订单状态", example = "1") + @Column(name = "ITEM_STATUS") + private Integer itemStatus; + + @ApiParam(value = "订单类型", example = "1") + @Column(name = "ORDER_TYPE") + public Integer orderType; + + @ApiParam(value = "时间数量列表", example = "1") + public List> timeList; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 0468770..6f9eb24 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -1,10 +1,11 @@ package cn.estsh.i3plus.pojo.sweb.sqlpack; 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 cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.base.tool.SqlPack; -import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.sweb.bean.*; +import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; /** @@ -18,27 +19,81 @@ public class SwebHqlPack { /** * 通用封装isValid、isDeleted等参数 + * * @param bean * @param hqlStr * @return */ - private static String buildHql(BaseBean bean, StringBuffer hqlStr){ + private static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } // 封装有效状态和删除状态 - SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); - SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); - return hqlStr.toString(); + Integer isValid = bean.getIsValid(); + //默认查有效数据 + if (isValid != null && isValid != 0) { + DdlPreparedPack.getNumEqualPack(isValid, "isValid", hqlStr); + } else { + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", hqlStr); + } + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + return hqlStr; } - public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder){ - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); - HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); - return buildHql(purchaseOrder,result); + public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); + return buildHql(purchaseOrder, result); + } + + public static DdlPackBean getPackageWhereHql(SwebPackage swebPackage) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); + DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); + return buildHql(swebPackage, result); } + + public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); + 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.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return buildHql(model, result); + } + + public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); + return buildHql(swebProcurementPlanOrder, result); + } + + public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); + return buildHql(swebProcurementPlanOrderDetails, result); + } + + public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); + return buildHql(vendorRel, result); + } + + /*public static String getPurchaseOrderDetailsWhereHql(SwebPurchaseOrderDetails swebPurchaseOrderDetails) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(swebPurchaseOrderDetails.getOrderNo(), "orderNo", result); + return buildHql(swebPurchaseOrderDetails, result); + }*/ } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index edbb890..10ea661 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -43,7 +43,7 @@ public class WmsCSOrderMaster extends BaseBean { public Integer orderType; @Column(name = "ORDER_STATUS") - @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中 30-盘点完成 40-已解冻 50-已关闭)", example = "1") + @ApiParam(value = "状态 (10-创建 20-开启盘点 30-盘点中 40-盘点完成 50-已解冻 60-已关闭)", example = "1") public Integer orderStatus; @Column(name = "ACTION_PERSENT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 2639206..d367a24 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -163,4 +163,8 @@ public class WmsDocMovementDetails extends BaseBean { public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); } + + public Double getPickQty() {return pickQty == null ? 0L : this.pickQty.doubleValue(); } + + public Double getActualQty() {return actualQty == null ? 0L : this.actualQty.doubleValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 036230c..1c3e91f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -71,4 +71,20 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + + @Transient + @ApiParam("源库位代码") + public String srcLocateNo; + + @Transient + @ApiParam("生产日期") + public String dateCode; + + @ApiParam(value = "散件移库输入移库数量") + @Transient + public Double inputMoveQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index f5eabd7..6b60984 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -96,19 +96,19 @@ public class WmsLocate extends BaseBean { private Double partQty; public Integer getMaxPackageQty() { - return this.maxPackageQty == null ? 0 : this.maxPackageQty; + return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); } public Double getMaxPartQty() { - return this.maxPartQty == null ? 0 : this.maxPartQty; + return this.maxPartQty == null ? 0 : this.maxPartQty.doubleValue(); } public Integer getBoxQty() { - return this.boxQty == null ? 0 : this.boxQty; + return this.boxQty == null ? 0 : this.boxQty.intValue(); } public Double getPartQty() { - return this.partQty == null ? 0 : this.partQty; + return this.partQty == null ? 0 : this.partQty.doubleValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index bb0d888..1225c80 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -56,6 +56,10 @@ public class WmsLocatePart extends BaseBean{ @ApiParam(value = "是否生成领料单", example = "2") private Integer isGeneratePicklist; + public Double getMix() { + return this.min == null ? 0 : this.min; + } + public Integer getIsGeneratePicklist() { return this.isGeneratePicklist == null ? 0 : this.isGeneratePicklist; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 4e5bc8c..32a91fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -57,10 +57,18 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "处理数量", example = "0") public Double transQty; + public Double getTransQty(){ + return this.transQty == null ? 0 : this.transQty.doubleValue(); + } + @Column(name="REJECT_QTY") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; + public Double getRejectQty(){ + return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); + } + @Column(name="UNIT") @ApiParam("单位") public String unit; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 089b84c..15a11c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -170,6 +170,10 @@ public class WmsStockSn extends BaseBean { @Transient public Double inputNCQty; + @ApiParam(value = "前端散件表格是否编辑") + @Transient + public Boolean isSet = false; + public WmsStockSn(){} public WmsStockSn(String partNo){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 51f5e00..8cdee66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1,13 +1,16 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; 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 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 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; @@ -27,6 +30,7 @@ public class WmsHqlPack { public static String packInParams(String colnumName, String[] params) { StringBuffer sb = new StringBuffer(); HqlPack.getInPackString(String.join(",", params), colnumName, sb); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_PART.IS_ADJUST.getValue(), "snControl", sb); return sb.toString(); } @@ -36,16 +40,37 @@ public class WmsHqlPack { * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + HqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } // 封装有效状态和删除状态 - SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); - SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + HqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); return hqlStr.toString(); } @@ -96,17 +121,20 @@ public class WmsHqlPack { * @param orderNos * @return */ - public static String packWmsOrderDetailsByOrderNos(String colName, List orderNos) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsOrderDetailsByOrderNos(String colName, List orderNos) { + DdlPackBean packBean = new DdlPackBean(); StringBuffer orderNoStr = new StringBuffer(); for (int i = 0; i < orderNos.size(); i++) { orderNoStr.append("'" + orderNos.get(i) + "',"); } orderNoStr.deleteCharAt(orderNoStr.length() - 1); - result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() + - " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + - " and model.orderNo in (" + orderNoStr + ")" + " order by model." + colName + ",model.orderNo"); - return result.toString(); + DdlPreparedPack.getInPack(orderNoStr.toString(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, + new String[]{colName, "orderNo"}, packBean); + return packBean; } /** @@ -162,8 +190,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", - WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart", result); + WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""), "poStatus", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); @@ -312,17 +340,17 @@ public class WmsHqlPack { * @param wmsTransType * @return */ - public static String packHqlWmsTransType(WmsTransType wmsTransType) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTransType(WmsTransType wmsTransType) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); - HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); - HqlPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); + DdlPreparedPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); + DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); getStringBuilderPack(wmsTransType, result); - return result.toString(); + return result; } /** @@ -701,6 +729,7 @@ public class WmsHqlPack { /** * 根据条件查询打印机队列信息封装类 + * * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ @@ -723,6 +752,7 @@ public class WmsHqlPack { /** * 盘点库位 条件封装 + * * @param wmsCSLocate * @return */ @@ -739,6 +769,7 @@ public class WmsHqlPack { /** * 盘点物料 条件封装 + * * @param wmsCSPart * @return */ @@ -757,6 +788,7 @@ public class WmsHqlPack { /** * 盘点存储区 条件封装 + * * @param wmsCSZone * @return */ @@ -773,6 +805,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ @@ -799,6 +832,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsTempOrderLock 责任区分配信息 * @return 责任区分配信息 */ @@ -917,6 +951,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表唯一性查询 + * * @param wmsMoveMaster * @return */ @@ -934,6 +969,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表分页查询 + * * @param wmsMoveMaster * @return */ @@ -950,6 +986,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单明细表分页查询 + * * @param wmsMoveDetails * @return */ @@ -980,6 +1017,7 @@ public class WmsHqlPack { /** * 内部单据：库存移动单条码信息分页查询 + * * @param wmsMoveSn * @return */ @@ -1032,8 +1070,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "", - WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result); - HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result); + WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""), "orderStatus", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); //单号 HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsQCMaster, result); @@ -1090,6 +1128,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); + HqlPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); getStringBuilderPack(wmsCSOrderMaster, result); @@ -1137,19 +1176,19 @@ public class WmsHqlPack { * @param wmsActionStepCall * @return */ - public static String packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); - HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); - HqlPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result); getStringBuilderPack(wmsActionStepCall, result); - HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - return result.toString(); + return result; } /** @@ -1158,15 +1197,15 @@ public class WmsHqlPack { * @param wmsActionStepType * @return */ - public static String packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + DdlPreparedPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); getStringBuilderPack(wmsActionStepType, result); - return result.toString(); + return result; } /** @@ -1175,15 +1214,15 @@ public class WmsHqlPack { * @param wmsActionStep * @return */ - public static String packHqlWmsActionStep(WmsActionStep wmsActionStep) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStep(WmsActionStep wmsActionStep) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); + DdlPreparedPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); getStringBuilderPack(wmsActionStep, result); - return result.toString(); + return result; } /** @@ -1192,15 +1231,14 @@ public class WmsHqlPack { * @param wmsActionModuleParam * @return */ - public static String packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); - HqlPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); + DdlPreparedPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + DdlPreparedPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); getStringBuilderPack(wmsActionModuleParam, result); - - return result.toString(); + return result; } /** @@ -1209,49 +1247,51 @@ public class WmsHqlPack { * @param wmsActionModule * @return */ - public static String packHqlWmsActionModule(WmsActionModule wmsActionModule) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionModule(WmsActionModule wmsActionModule) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); - HqlPack.getNumEqualPack(wmsActionModule.getId(), "id", result); - HqlPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); + DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); getStringBuilderPack(wmsActionModule, result); - return result.toString(); + return result; } /** * 作业流程分页查询 * @return */ - public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 agDescC;agNameC - HqlPack.getStringLikerPack(wmsActionGroup.getAgNameC(), "agNameC", result); - HqlPack.getStringLikerPack(wmsActionGroup.getAgDescC(), "agDescC", result); + DdlPreparedPack.getStringLikerPack(wmsActionGroup.getAgNameC(), "agNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionGroup.getAgDescC(), "agDescC", result); getStringBuilderPack(wmsActionGroup, result); - return result.toString(); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, result); + + return result; } /** * 作业流程明细分页查询 * @return */ - public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsActionGroupDetails.getAgId(), "agId", result); + DdlPreparedPack.getNumEqualPack(wmsActionGroupDetails.getAgId(), "agId", result); getStringBuilderPack(wmsActionGroupDetails, result); - HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - return result.toString(); + return result; } /** @@ -1260,13 +1300,13 @@ public class WmsHqlPack { * @param wmsActionLogData * @return */ - public static String packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); getStringBuilderPack(wmsActionLogData, result); - return result.toString(); + return result; } /** @@ -1275,15 +1315,15 @@ public class WmsHqlPack { * @param wmsActionStepCallParam * @return */ - public static String packHqlWmsActionStepCallParam(WmsActionStepCallParam wmsActionStepCallParam) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStepCallParam(WmsActionStepCallParam wmsActionStepCallParam) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result); - HqlPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result); - HqlPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result); getStringBuilderPack(wmsActionStepCallParam, result); - return result.toString(); + return result; } /** @@ -1291,33 +1331,33 @@ public class WmsHqlPack { * @param wmsActionLog * @return */ - public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionLog(WmsActionLog wmsActionLog) { + DdlPackBean result = new DdlPackBean(); if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), + DdlPreparedPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), "startTime", result, true); } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), + DdlPreparedPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), "endTime", result, true); } // 作业流程编号 - HqlPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); + DdlPreparedPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); // 作业流程名称 - HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); // 单据编号 - HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); // 设备编号 - HqlPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); + DdlPreparedPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); // 交易类型代码 - HqlPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); // 流程状态 - HqlPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); + DdlPreparedPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); getStringBuilderPack(wmsActionLog, result); - return result.toString(); + return result; } /** @@ -1325,21 +1365,21 @@ public class WmsHqlPack { * @param wmsActionLogDetails * @return */ - public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { + DdlPackBean result = new DdlPackBean(); //作业流程id（对应作业记录明细里自增的id） - HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); + 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); - HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - return result.toString(); + return result; } /** @@ -1460,6 +1500,7 @@ public class WmsHqlPack { /** * 根据权限数据拼查询任务详情sql + * * @param groupDataAuth * @return */ @@ -1498,14 +1539,15 @@ public class WmsHqlPack { /** * 给定字段动态in sql + * * @param columnName * @param vals * @return */ - public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List vals) { + public static String packHqlAndIn(WmsTaskInfo bean, String columnName, List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); - HqlPack.getInPackString(data,columnName,result); + HqlPack.getInPackString(data, columnName, result); HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result); getStringBuilderPack(bean, result); return result.toString(); @@ -1513,6 +1555,7 @@ public class WmsHqlPack { /** * 根据条件查询dataAuth + * * @param wmsDataAuth * @return */ @@ -1533,6 +1576,7 @@ public class WmsHqlPack { /** * 根据条件查询任务明细信息 + * * @param taskDetails * @return */ @@ -1580,6 +1624,7 @@ public class WmsHqlPack { /** * 根据条件查询系统配置信息 + * * @param wmsConfig * @return */