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

# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
yun-zuoyi
sky.meng 6 years ago
commit 8409025253

@ -1,38 +0,0 @@
package cn.estsh.i3plus.pojo.andon.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 : ANDON_
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2019-05-13 9:47
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_ACTION")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_动作")
public class AndonAction extends BaseBean {
@Column(name = "ACTION_CODE")
@ApiParam(value = "动作代码")
private String actionCode;
@Column(name = "ACTION_NAME")
@ApiParam(value = "动作名称")
private String actionName;
}

@ -28,19 +28,21 @@ import javax.persistence.Table;
@Api("ANDON_呼叫原因")
public class AndonAlarmCause extends BaseBean {
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码")
private String acCode;
@Column(name = "PARENT_AC_CODE")
@ApiParam(value = "父阶原因代码")
private String parentAcCode;
@Column(name = "AC_NAME")
@ApiParam(value = "呼叫原因描述")
private String acName;
@Column(name = "PARENT_AC_CODE")
@ApiParam(value = "父阶原因代码")
private String parentAcCode;
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
}

@ -1,38 +0,0 @@
package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan
* @CreateDate : 2019-05-10 17:16
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_ALARM_TYPE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯类型")
public class AndonAlarmType extends BaseBean {
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@Column(name = "ALARM_NAME")
@ApiParam(value = "安灯类型名称")
private String alarmName;
}

@ -1,38 +0,0 @@
package cn.estsh.i3plus.pojo.andon.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 : ANDON_
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2019-05-31 9:47
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_IMPORTANCE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_事件现象")
public class AndonImportance extends BaseBean {
@Column(name = "IMPORTANCE_CODE")
@ApiParam(value = "重要等级代码")
private String importanceCode;
@Column(name = "IMPORTANCE_NAME")
@ApiParam(value = "重要等级名称")
private String importanceName;
}

@ -274,6 +274,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "安灯子类型代码")
private String alarmDetailCode;
@Column(name = "ALARM_DETAIL_NAME_RDD")
@ApiParam(value = "安灯子类型名称")
private String alarmDetailNameRdd;
@Column(name = "EPM_CODE")
@ApiParam(value = "事件现象代码")
private String epmCode;

@ -1,38 +0,0 @@
package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan
* @CreateDate : 2019-05-10 17:16
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_RESPONSE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯通知方式")
public class AndonResponse extends BaseBean {
@Column(name = "RESPONSE_CODE")
@ApiParam(value = "通知方式代码")
private String responseCode;
@Column(name = "RESPONSE_NAME")
@ApiParam(value = "通知方式名称")
private String responseName;
}

@ -1,38 +0,0 @@
package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan
* @CreateDate : 2019-05-10 17:16
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_STATUS")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯状态")
public class AndonStatus extends BaseBean {
@Column(name = "STATUS_CODE")
@ApiParam(value = "状态代码")
private String statusCode;
@Column(name = "STATUS_NAME")
@ApiParam(value = "状态名称")
private String statusName;
}

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAction;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : ANDON_
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2019-05-13 11:05
* @Modify:
**/
@Repository
public interface IAndonActionRepository extends BaseRepository<AndonAction, Long> {
}

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :()
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:27
* @Modify:
**/
@Repository
public interface IAndonAlarmTypeRepository extends BaseRepository<AndonAlarmType,Long> {
}

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonImportance;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : ANDON_
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-31 11:05
* @Modify:
**/
@Repository
public interface IAndonImportanceRepository extends BaseRepository<AndonImportance, Long> {
}

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :()
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:27
* @Modify:
**/
@Repository
public interface IAndonResponseRepository extends BaseRepository<AndonResponse,Long> {
}

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonStatus;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :()
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:27
* @Modify:
**/
@Repository
public interface IAndonStatusRepository extends BaseRepository<AndonStatus,Long> {
}

@ -127,8 +127,8 @@ public class AndonHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result);
DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
// DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
// DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(andonAlarmCause, result);
return result;
@ -394,65 +394,99 @@ public class AndonHqlPack {
public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
// DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
getStringBuilderPack(andonAlarmDetailType, result);
return result;
}
//
// /**
// * 安灯类型查询条件封装
// * @param andonAlarmType
// * @return
// */
// public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
// DdlPackBean result = new DdlPackBean();
//
// getStringBuilderPack(andonAlarmType, result);
//
// return result;
// }
/**
*
* @param andonAlarmType
* ANDON
* @param andonResponseObject
* @return
*/
public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
public static DdlPackBean packAndonResponseObject(AndonResponseObject andonResponseObject){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result);
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result);
DdlPreparedPack.getStringLikerPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
getStringBuilderPack(andonAlarmType, result);
getStringBuilderPack(andonResponseObject, result);
return result;
}
/**
*
* @param andonStatus
* ANDON_
* @param andonEventCause
* @return
*/
public static DdlPackBean packAndonStatus(AndonStatus andonStatus) {
public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) {
DdlPackBean result = new DdlPackBean();
getStringBuilderPack(andonStatus, result);
getStringBuilderPack(andonEventCause, result);
return result;
}
/**
* ANDON
* @param andonResponse
* ANDON_
* @param haltType
* @return
*/
public static DdlPackBean packAndonResponse(AndonResponse andonResponse){
public static DdlPackBean packAndonHaltType(AndonHaltType haltType) {
DdlPackBean result = new DdlPackBean();
getStringBuilderPack(haltType, result);
getStringBuilderPack(andonResponse, result);
return result;
}
/**
* ANDON_
* @param eventPhenoMenon
* @return
*/
public static DdlPackBean packAndonEventPhenoMenon(AndonEventPhenoMenon eventPhenoMenon) {
DdlPackBean result = new DdlPackBean();
getStringBuilderPack(eventPhenoMenon, result);
return result;
}
/**
* ANDON
* @param andonResponseObject
* ANDON_
* @param eventPhenoMenon
* @return
*/
public static DdlPackBean packAndonResponseObject(AndonResponseObject andonResponseObject){
public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result);
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result);
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
getStringBuilderPack(eventPhenoMenon, result);
getStringBuilderPack(andonResponseObject, result);
return result;
}
/**
* ANDON_ PLC
* @param plc
* @return
*/
public static DdlPackBean packAndonPLC(AndonPLC plc) {
DdlPackBean result = new DdlPackBean();
getStringBuilderPack(plc, result);
return result;
}

@ -90,15 +90,14 @@ public class AndonEnumUtil {
* 10-20-
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IS_ALARM_STATUS{
public enum ALARM_STATUS {
YES(10,"需要按灯"),
ON(20,"不需要按灯");
private int value;
private String description;
IS_ALARM_STATUS(int value, String description) {
ALARM_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -128,7 +127,6 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_BUSI_FLAG{
ALARM_FLAG("10","安灯呼叫标识"),
USER_CODE("20","用户工号"),
READ_FLAG("30", "安灯读取状态"),
@ -158,8 +156,7 @@ public class AndonEnumUtil {
* 1-2-3-
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_FLAG{
public enum ANDON_ACTION_TAG {
CALL(1,"10","呼叫"),
SIGN(2,"20","响应"),
RESOLVE(3,"30","解决"),
@ -171,7 +168,7 @@ public class AndonEnumUtil {
private String code;
private String description;
ALARM_FLAG(int value,String code, String description) {
ANDON_ACTION_TAG(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -198,37 +195,7 @@ public class AndonEnumUtil {
}
}
/**
*
* 10 = 20 = 30 = 40 = 50 = 60 = 70 =
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_ACTION_FLAG{
CALL_ACTION("10","呼叫动作"),
SIGN_ACTION("20","签到动作"),
RESOLVE_ACTION("30", "解决动作"),
CANCEL_ACTION("40", "撤销动作"),
COMMIT_ACTION("50","提交动作"),
PASS_ACTION("60","审批动作"),
SHIFG_CALL_ACTION("70", "转呼动作");
private String value;
private String description;
ANDON_ACTION_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
*
@ -236,7 +203,6 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_PRIORITY{
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级");
@ -268,52 +234,14 @@ public class AndonEnumUtil {
}
}
/**
*
* 10 - 20 - 30 - 40 -
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_LEVEL{
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级"),
FOUTH(40,"四级");
private int value;
private String description;
NOTICE_LEVEL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* ANDONMM= QM= EQ= GY= JC=
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_CODE{
public enum ALARM_TYPE {
PART("PART_ALARM","物料"),
QUALITY("QUALITY_ALARM","质量"),
EQUIP("EQUMENT_ALARM","设备"),
@ -323,7 +251,7 @@ public class AndonEnumUtil {
private String value;
private String description;
ALARM_CODE(String value, String description) {
ALARM_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
@ -352,7 +280,6 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROD_ORG_LEVEL{
LEVEL_ONE(1,"一级目录"),
LEVEL_TWO(2,"二级目录"),
LEVEL_THREE(3,"三级目录"),
@ -391,7 +318,6 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOP_LINE_FLAG{
STOP("1","停止产线"),
RESTART("0","启动产线");
@ -417,15 +343,124 @@ public class AndonEnumUtil {
* 10-20-
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_WAYS{
public enum NOTICE_MESSAGE_SEND_TYPE {
SMS("10","短信"),
EMAIL("20","邮箱");
private String value;
private String description;
NOTICE_WAYS(String value, String description) {
NOTICE_MESSAGE_SEND_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
*
* 10 - 20 - 30 - 40 -
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_MESSAGE_SEND_LEVEL {
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级"),
FOUTH(40,"四级");
private int value;
private String description;
NOTICE_MESSAGE_SEND_LEVEL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
* <per>
* <br/> 10 =
* <br/> 20 =
* <br/> 30 =
* <br/> 40 =
* <br/> 50 =
* <br/> 60 =
* <br/> 70 =
* </per>
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_ACTION_FLAG{
CALL_ACTION("10","呼叫动作"),
SIGN_ACTION("20","签到动作"),
RESOLVE_ACTION("30", "解决动作"),
CANCEL_ACTION("40", "撤销动作"),
COMMIT_ACTION("50","提交动作"),
PASS_ACTION("60","审批动作"),
SHIFG_CALL_ACTION("70", "转呼动作");
private String value;
private String description;
ANDON_ACTION_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
*
* <per>
* <br/> 10 =
* <br/> 20 =
* <br/> 30 =
* <br/> 40 =
* </per>
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_IMPORTANCE_LEVEL{
FIRST_LEVEL("10","一级"),
SECOND_LEVEL("20","二级"),
THIRD_LEVEL("30","三级"),
FORTH_LEVEL("40","四级");
private String value;
private String description;
ANDON_IMPORTANCE_LEVEL(String value,String description) {
this.value = value;
this.description = description;
}

@ -0,0 +1,302 @@
package cn.estsh.i3plus.pojo.base.util;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-06-13 20:35
* @Modify:
**/
public interface BaseRedis {
/**
*
* @param key
* @param seconds ()
* @return
*/
boolean expire(String key,long seconds);
/**
* key
* @param key null
* @return () 0
*/
long getExpire(String key);
/**
* key
* @param key
* @return true false
*/
boolean hasKey(String key);
/**
*
* @param key
*/
void deleteKey(String ... key);
//============================String=============================
/**
*
* @param key
* @return
*/
Object getObject(Object key);
/**
*
* @param key
* @param value
* @return true false
*/
boolean putObject(String key,Object value);
/**
*
* @param key
* @param value
* @param time () time0 time0
* @return true false
*/
boolean putObject(String key,Object value,long time);
/**
*
* @param key
* @param delta (0)
* @return
*/
long incr(String key, long delta);
/**
*
* @param key
* @param delta (0)
* @return
*/
long decr(String key, long delta);
//================================Map=================================
/**
* HashGet
* @param key null
* @param item null
* @return
*/
Object getHash(String key,String item);
/**
* hashKey
* @param key
* @return
*/
Map<Object,Object> getHashMap(String key);
/**
* HashSet
* @param key
* @param map
* @return true false
*/
boolean putHashMap(String key, Map<?,?> map);
/**
* HashSet
* @param key
* @param map
* @param time ()
* @return true false
*/
boolean putHashMap(String key, Map<?,?> map, long time);
/**
* hash,
* @param key
* @param item
* @param value
* @return true false
*/
boolean putHash(String key,String item,Object value) ;
/**
* hash,
* @param key
* @param item
* @param value
* @param time () :hash,
* @return true false
*/
boolean putHash(String key,String item,Object value,long time) ;
/**
* hash
* @param key null
* @param item 使 null
*/
void deleteHash(String key, Object... item);
/**
* hash
* @param key null
* @param item null
* @return true false
*/
boolean checkKey(String key, String item);
/**
* hash ,
* @param key
* @param item
* @param by (0)
* @return
*/
double hincr(String key, String item,double by);
/**
* hash
* @param key
* @param item
* @param by (0)
* @return
*/
double hdecr(String key, String item,double by);
//============================set=============================
/**
* keySet
* @param key
* @return
*/
Set<Object> getSet(String key);
/**
* valueset,
* @param key
* @param value
* @return true false
*/
boolean hasKeySet(String key,Object value);
/**
* set
* @param key
* @param values
* @return
*/
void putSet(String key, Object...values);
/**
* set
* @param key
* @param time ()
* @param values
* @return
*/
void putSetAndTime(String key,long time,Object...values);
/**
* set
* @param key
* @return
*/
long getSetSize(String key);
/**
* value
* @param key
* @param values
* @return
*/
void removeSet(String key, Object ...values);
//===============================list=================================
/**
* key
* @param keyPattern
* @return
*/
Set<String> getKeysSet(String keyPattern);
/**
* list
* @param key
* @param start
* @param end 0 -1
* @return
*/
List getList(String key, long start, long end);
/**
* list
* @param key
* @return
*/
long getListSize(String key);
/**
* list
* @param key
* @param index index>=0 0 1 index<0-1-2
* @return
*/
Object getIndex(String key,long index);
/**
* list
* @param key
* @param value
* @return
*/
boolean putList(String key, Object value);
/**
* list
* @param key
* @param value
* @param time ()
* @return
*/
boolean putList(String key, Object value, long time);
/**
* list
* @param key
* @param value
* @return
*/
boolean putList(String key, List<Object> value) ;
/**
* list
* @param key
* @param value
* @param time ()
* @return
*/
boolean putList(String key, List<Object> value, long time);
/**
* list
* @param key
* @param index
* @param value
* @return
*/
boolean updateIndexList(String key, long index,Object value);
/**
* Nvalue
* @param key
* @param count
* @param value
* @return
*/
void removeList(String key,long count,Object value);
}

@ -104,6 +104,10 @@ public class WmsActionLogDetails extends BaseBean {
@ApiParam(value = "回显组件方法ID", example = "1")
private Long showAmId;
@Column(name = "AGD_ID")
@ApiParam(value = "作业流程明细ID", example = "1")
private Long agdId;
public Long getAsId() {
if (asId != null) {
return asId.longValue();

@ -0,0 +1,81 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : ASN
* @Reference :
* @Author : amy
* @CreateDate : 2019-06-17 10:50
* @Modify:
**/
@Data
@Api(value = "ASN计划", description = "ASN计划")
public class SapAsn extends SapBase {
@ApiParam(value = "ASN号")
@AnnoOutputColumn
private String zasnno;
@ApiParam(value = "供应商代码")
@AnnoOutputColumn
private String lifnr;
@ApiParam(value = "ASN item")
@AnnoOutputColumn
private Double zrnum;
@ApiParam(value = "物料编码")
@AnnoOutputColumn
private String matnr;
@ApiParam(value = "数量")
@AnnoOutputColumn
private Double zcnNum;
@ApiParam(value = "计量单位")
@AnnoOutputColumn
private String unit;
@ApiParam(value = "特殊采购标识")
@AnnoOutputColumn
private String pstyp;
@ApiParam(value = "计划交货日期")
@AnnoOutputColumn
private String zdate;
@ApiParam(value = "计划交货时间")
@AnnoOutputColumn
private String zcjsj;
@ApiParam(value = "工厂代码")
@AnnoOutputColumn
private String werks;
@ApiParam(value = "收货库存地点")
@AnnoOutputColumn
private String lgort;
@ApiParam(value = "凭证标识")
@AnnoOutputColumn
private String zdoc;
@ApiParam(value = "状态", example = "U")
@AnnoOutputColumn
private String zstasI;
@ApiParam(value = "条码信息")
@AnnoOutputColumn
private String ztxm;
@ApiParam(value = "道口")
@AnnoOutputColumn
private String zdk;
}

@ -0,0 +1,71 @@
package cn.estsh.i3plus.pojo.wms.bean;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.UUID;
/**
* @Description : sap
* @Reference :
* @Author : amy
* @CreateDate : 2019-06-17 16:21
* @Modify:
**/
@Data
public class SapBase {
@ApiParam(value = "处理人", example = "-1")
private String actusr = "导入";
@ApiParam(value = "SID", example = "-1")
private String sid = UUID.randomUUID().toString() + UUID.randomUUID().toString();
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiParam(value = "接收数据日期", example = "-1")
private String recymd;
@JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "接收数据时间", example = "-1")
private String rechms;
@ApiParam(value = "同步标志", example = "-1")
private String synflg = "Y";
@ApiParam(value = "同步日期", example = "-1")
private String synymd;
@ApiParam(value = "同步时间", example = "-1")
private String synhms;
@ApiParam(value = "处理标志", example = "-1")
private String actflg = "Y";
@ApiParam(value = "处理日期", example = "-1")
private String actymd;
@ApiParam(value = "处理时间", example = "-1")
private String acthms;
@ApiParam(value = "状态标志", example = "-1")
private String staflg;
@ApiParam(value = "顺序号", example = "-1")
private Integer seq;
@ApiParam(value = "GUID", example = "-1")
private String guid;
public String getSynymdTime() {
SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD");
return format.format(new Date());
}
public String getSynhmsTime() {
SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss");
return format.format(new Date());
}
}

@ -0,0 +1,149 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import java.util.UUID;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2019-06-13 13:42
* @Modify:
**/
@Data
@Api(value="要货计划",description = "要货计划")
public class SapDspo {
@ApiParam(value = "SA编号或PO号",example = "1")
@AnnoOutputColumn
private String ebeln;
@ApiParam(value = "版本",example = "-1")
@AnnoOutputColumn
private String revno;
@ApiParam(value = "SAitem或PO item",example = "-1")
@AnnoOutputColumn
private Integer evrtp;
@ApiParam(value = "供应商代码",example = "-1")
@AnnoOutputColumn
private String lifnr;
@ApiParam(value = "物料编码",example = "-1")
@AnnoOutputColumn
private String matnr;
@ApiParam(value = "计量单位",example = "-1")
@AnnoOutputColumn
private String unit;
@ApiParam(value = "数量",example = "-1")
@AnnoOutputColumn
private Double zdevNum;
@ApiParam(value = "特殊采购标识",example = "-1")
@AnnoOutputColumn
private String pstyp;
@ApiParam(value = "计划交货日期",example = "-1")
@AnnoOutputColumn
private String zdate;
@ApiParam(value = "计划交货时间",example = "-1")
@AnnoOutputColumn
private String zcjsj;
@ApiParam(value = "工厂代码",example = "-1")
@AnnoOutputColumn
private String werks;
@ApiParam(value = "收货库存地点",example = "-1")
@AnnoOutputColumn
private String lgort;
@ApiParam(value = "凭证标识",example = "-1")
@AnnoOutputColumn
private String zpzps;
@ApiParam(value = "状态",example = "-1")
@AnnoOutputColumn
private String zstas;
@ApiParam(value = "状态",example = "-1")
@AnnoOutputColumn
private String loekz;
@ApiParam(value = "最小包装数量",example = "-1")
@AnnoOutputColumn
private Double bstrf;
@ApiParam(value = "条码已打印的数量",example = "-1")
@AnnoOutputColumn
private Double prnnum;
//公共字段 ++++++++++++++++++++++++++++++++++++++++++
@ApiParam(value = "处理人",example = "-1")
@AnnoOutputColumn
private String actusr = "导入";
@ApiParam(value = "SID",example = "-1")
@AnnoOutputColumn
private String sid = UUID.randomUUID().toString()+UUID.randomUUID().toString();
/*@ApiParam(value = "接收数据日期",example = "-1")
@AnnoOutputColumn
private String recymd;
@ApiParam(value = "接收数据时间",example = "-1")
@AnnoOutputColumn
private String rechms;
@ApiParam(value = "同步标志",example = "-1")
@AnnoOutputColumn
private String synflg;*/
@ApiParam(value = "同步日期",example = "-1")
@AnnoOutputColumn
private String synymd;
@ApiParam(value = "同步时间",example = "-1")
@AnnoOutputColumn
private String synhms;
/*@ApiParam(value = "处理标志",example = "-1")
@AnnoOutputColumn
private String actflg;*/
@ApiParam(value = "处理日期",example = "-1")
@AnnoOutputColumn
private String actymd;
@ApiParam(value = "处理时间",example = "-1")
@AnnoOutputColumn
private String acthms;
@ApiParam(value = "状态标志",example = "-1")
@AnnoOutputColumn
private String staflg;
@ApiParam(value = "顺序号",example = "-1")
@AnnoOutputColumn
private Integer seq;
@ApiParam(value = "GUID",example = "-1")
@AnnoOutputColumn
private String guid;
}

@ -85,4 +85,20 @@ public class WmsASNMaster extends BaseBean {
@Transient
@ApiParam(value = "发货日期")
private String sendDate;
@Transient
@ApiParam(value = "工厂名称")
public String organizeName;
@Transient
@ApiParam("联系人")
private String vendorOwner;
@Transient
@ApiParam("邮箱")
private String vendorEmail;
@Transient
@ApiParam("供应商名称")
private String vendorName;
}

@ -122,5 +122,21 @@ public class WmsASNMasterDetails extends BaseBean {
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public int lockVersion;
public transient int lockVersion;
@Transient
@ApiParam("实收数量")
private Double rcQty;
@Transient
@ApiParam("ASN条码总箱数")
public Integer totalBoxes;
@Transient
@ApiParam("差异")
public Double difference;
@Transient
@ApiParam("标准包装")
public Double snp;
}

@ -15,7 +15,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Description :
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-22 9:33

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.wms.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 : jimmy.zeng
* @CreateDate : 2019-06-17 12:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_CS_ADJUST_RANGE")
@Api("盘点调差范围信息")
public class WmsCSAdjustRange extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("单号")
public String orderNo;
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
@Column(name="IS_ADJUST")
@ApiParam(value = "调整标识", example = "1")
public Integer isAdjust;
}

@ -82,6 +82,10 @@ public class WmsCSOrderMaster extends BaseBean {
@ApiParam(value = "是否散件")
private Integer isPart;
@Column(name = "YEAR")
@ApiParam("年度")
public String year;
public Integer getIsInventoryVal() {
return this.isInventory == null ? 0 :this.isInventory.intValue();
}

@ -0,0 +1,67 @@
package cn.estsh.i3plus.pojo.wms.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 : jimmy.zeng
* @CreateDate : 2019-06-17 11:57
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_CS_RANGE")
@Api("盘点范围信息")
public class WmsCSRange extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("单号")
public String orderNo;
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "ZONE_NO")
@ApiParam("存储区编号")
public String zoneNo;
@Column(name = "LOCATE_NO")
@ApiParam("库位编号")
public String locateNo;
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
public WmsCSRange(){}
public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
this.zoneNo = zoneNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
}
}

@ -197,5 +197,5 @@ public class WmsDocMovementDetails extends BaseBean {
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public int lockVersion;
public transient int lockVersion;
}

@ -120,27 +120,27 @@ public class WmsDocMovementMaster extends BaseBean {
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
public String AssignSrcWhNo;
public String assignSrcWhNo;
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
public String AssignSrcZoneNo;
public String assignSrcZoneNo;
@Column(name = "DEST_WH_NO")
@ApiParam("目标仓库代码")
public String AssignDestWhNo;
public String assignDestWhNo;
@Column(name = "DEST_ZONE_NO")
@ApiParam("目标存储区代码")
public String AssignDestZoneNo;
public String assignDestZoneNo;
@Column(name = "PLAN_DATE")
@ApiParam(value = "计划日期")
private String AssignPlanDate;
private String assignPlanDate;
@Column(name = "PLAN_TIME")
@ApiParam(value = "计划时间")
private String AssignPlanTime;
private String assignPlanTime;
@Transient
@ApiParam(value = "发运单号")

@ -0,0 +1,76 @@
package cn.estsh.i3plus.pojo.wms.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 : yerik.shi
* @CreateDate : 2019-06-11
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_LINE_LOCATE_PART")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="线边库物料信息",description = "线边库物料信息")
public class WmsLineLocatePart extends BaseBean {
@Column(name="LOCATE_NO")
@ApiParam(value ="库位代码")
private String locateNo;
@Column(name="PART_NO")
@ApiParam(value = "物料编码")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam(value = "物料名称")
private String partNameRdd;
public Double getPullQty() {
return pullQty == null ? 0D : this.pullQty.doubleValue();
}
public Double getMax() {
return max== null ? 0D : this.max.doubleValue();
}
public Double getMin() {
return min== null ? 0D : this.min.doubleValue();
}
public Integer getIsGeneratePicklist() {
return isGeneratePicklist== null ? 0: this.isGeneratePicklist.intValue();
}
@Column(name = "PULL_QTY")
@ApiParam(value = "拉动数量")
private Double pullQty;
@Column(name = "Max")
@ApiParam(value = "最大值")
private Double max;
@Column(name = "Min")
@ApiParam(value = "最小值")
private Double min;
@Column(name = "IS_GENERATE_PICKLIST")
@ApiParam(value = "是否生成领料单")
private Integer isGeneratePicklist;
}

@ -107,4 +107,16 @@ public class WmsPOMaster extends BaseBean {
@Column(name = "IS_SN")
@ApiParam(value = "是否生成条码", example = "1")
public Integer isSn;
@Transient
@ApiParam(value = "工厂名称")
public String organizeName;
@Transient
@ApiParam("联系人")
private String vendorOwner;
@Transient
@ApiParam("邮箱")
private String vendorEmail;
}

@ -34,6 +34,11 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("物料编码")
public String partNo;
@Column(name = "BOX_QTY" )
@ColumnDefault("0")
@ApiParam(value ="箱数", example = "0")
public Integer boxQty;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@ -136,5 +141,14 @@ public class WmsPOMasterDetails extends BaseBean {
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public int lockVersion;
public transient int lockVersion;
@Transient
@ApiParam("PO条码总箱数")
public Integer totalBoxes;
@Transient
@ApiParam("差异")
public Double difference;
}

@ -117,9 +117,13 @@ public class WmsPart extends BaseBean {
@Column(name="PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
public String prodCfgTypeCode;
private String prodCfgTypeCode;
@Column(name="PROD_CFG_TYPE_NAME")
@ApiParam("项目名称")
public String prodCfgTypeName;
private String prodCfgTypeName;
@Column(name="OUT_CLOSE_FLAG")
@ApiParam("項目结算标识")
private String outCloseFlag;
}

@ -115,4 +115,8 @@ public class WmsPoSn extends BaseBean {
@Transient
@ApiParam(value = "条码")
public String sn;
@Transient
@ApiParam(value = "工厂名称")
public String organizeName;
}

@ -84,5 +84,5 @@ public class WmsQCDetails extends BaseBean {
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public int lockVersion;
public transient int lockVersion;
}

@ -117,6 +117,11 @@ public class WmsStockQuan extends BaseBean {
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
@Column(name = "SCRAP_QTY")
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}
@ -149,6 +154,10 @@ public class WmsStockQuan extends BaseBean {
return this.lockQty == null ? 0 : this.lockQty;
}
public Double getScrapQty() {
return this.scrapQty == null ? 0 : this.scrapQty;
}
public WmsStockQuan() {
}
@ -168,7 +177,7 @@ public class WmsStockQuan extends BaseBean {
this.consignQty = consignQty;
this.lockQty = lockQty;
}
public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) {
public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
this.qty = qty;
this.failQty = failQty;
this.holdQty = holdQty;
@ -177,5 +186,6 @@ public class WmsStockQuan extends BaseBean {
this.freezeQty = freezeQty;
this.consignQty = consignQty;
this.lockQty = lockQty;
this.scrapQty = scrapQty;
}
}

@ -196,6 +196,10 @@ public class WmsStockSn extends BaseBean {
@Transient
public String labelNo;
@Transient
@ApiParam(value = "工厂名称")
public String organizeName;
public WmsStockSn(){}
public WmsStockSn(String partNo){

@ -61,8 +61,4 @@ public class WmsTransType extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long tmId;
@Column(name = "OP_TYPE_ID")
@ApiParam(value = "作业类型编号", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long opTypeId;
}

@ -47,7 +47,7 @@ public class WmsZones extends BaseBean {
private String zoneName;
@Column(name = "PARENT_ZONE_NO")
@ApiParam(value = "父级存储区", example ="1")
@ApiParam(value = "父级存储区", example ="-1")
private String parentZoneNo;
@Column(name = "IS_SON_NODE")

@ -28,9 +28,15 @@ public class MappingItem {
*/
public String destName;
/**
*
*
* 1=
*/
public String defaultValue;
public Integer destPk;
/**
*
* 使 #date, #time, #guid, #Q.warehouse(#zone)
*/
public Object defaultValue;
@Override
public String toString() {
@ -38,6 +44,7 @@ public class MappingItem {
+ this.srcName + ", destBeanName:"
+ this.destBeanName + ", destName"
+ this.destName + ", defaultValue:"
+ this.defaultValue;
+ this.defaultValue + ", destPk:"
+ this.destPk;
}
}

@ -0,0 +1,26 @@
package cn.estsh.i3plus.pojo.wms.dbinterface;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UpdateSyncItem {
/**
*
*/
public String columnName;
/**
*
*
* #sap_date, #sap_time, #guid
*/
public String updateValue;
}

@ -39,33 +39,34 @@ public class WmsInterfaceDataMapper extends BaseBean {
/**
*
*/
@Column(name = "SCR_DATA_SOURCE", length = 50)
@Column(name = "SRC_DATA_SOURCE", length = 50)
public String dataSource;
/**
*
*/
@Column(name = "SCR_TABLE_NAME", length = 50)
@Column(name = "SRC_TABLE_NAME", length = 50)
public String srcTableName;
/**
*
*/
@Column(name = "SCR_ORDER_BY", length = 50)
@Column(name = "SRC_ORDER_BY", length = 50)
public String srcOrderBy;
/**
*
*/
@Column(name = "SCR_WHERE", length = 255)
public String scrWhere;
@Column(name = "SRC_WHERE", length = 255)
public String srcWhere;
/**
*
* SYNFLG=Y,SYNDATE={Date}
* SYNFLG=Y,SYNDATE={#XX}
* 使 #sap_date, #sap_time, #date, #time, #guid
*/
@Column(name = "SCR_UPDATE_SYNC", length = 255)
@Column(name = "SRC_UPDATE_SYNC", length = 255)
public String srcUpdateSync;
/**
*
*/
@Column(name = "SCR_PK_COLUMNS", length = 255)
@Column(name = "SRC_PK_COLUMNS", length = 255)
public String srcPkColumns;
/**
* ()...
@ -88,4 +89,11 @@ public class WmsInterfaceDataMapper extends BaseBean {
*/
@Column(name = "DEST_COLUMN_MAPPING", length = 5000)
public String destColumnMapping;
/**
*
* SAP2WMS, WMS2SAP, MES2WMS
*/
@Column(name = "GROUP_NAME")
public String groupName;
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsCSAdjustRange;
/**
* @Description : ()
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2019-06-17 15:13
* @Modify:
**/
public interface WmsCSAdjustRangeRepository extends BaseRepository<WmsCSAdjustRange, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsCSRange;
/**
* @Description : ()
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2019-06-17 15:12
* @Modify:
**/
public interface WmsCSRangeRepository extends BaseRepository<WmsCSRange, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsLineLocatePart;
/**
* @Description : 线
* @Reference :
* @Author : yerik.shi
* @CreateDate : 2019-06-12
* @Modify:
**/
public interface WmsLineLocatePartRepository extends BaseRepository<WmsLineLocatePart, Long> {
}

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart;
public interface WmsVendorPartRepository extends BaseRepository<WmsVendorPart, Long>{
}

@ -1223,8 +1223,8 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result);
DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result);
getStringBuilderPack(wmsActionStepType, result);
DdlPreparedPack.getNumEqualPack(wmsActionStepType.getIsValid(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result;
}
@ -1271,14 +1271,14 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsActionModule(WmsActionModule wmsActionModule) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
// 查询参数封装
DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result);
DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result);
DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result);
DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result);
getStringBuilderPack(wmsActionModule, result);
DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result;
}
@ -1444,48 +1444,72 @@ public class WmsHqlPack {
* @param groupDataAuth
* @return
*/
public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc) {
public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
DdlPackBean result = new DdlPackBean();
int i = 1;
Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
//拼sql
entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
String key = map.getKey();
List<WmsDataAuth> valueList = map.getValue();
List<String> vList = valueList.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList());
String data = String.join(",", vList);
if (StringUtils.isNotBlank(data)) {
List<Map> mapList = JSONObject.parseArray(data, Map.class);
if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", key)) {
for (Map whNoItem : mapList) {
// 拼接仓库查询sql
DdlPreparedPack.getStringEqualPackOr(whNoItem.get("WH_CODE").toString(), "destWhNo", result);
}
packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result);
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) {
for (Map locateNoItem : mapList) {
// 拼接库位查询sql
DdlPreparedPack.getStringEqualPackOr(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result);
}
packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result);
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) {
for (Map zoneNoItem : mapList) {
// 拼接存储区查询sql
DdlPreparedPack.getStringEqualPackOr(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result);
}
packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result);
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
for (Map partNoItem : mapList) {
// 拼接物料查询sql
DdlPreparedPack.getStringEqualPackOr(partNoItem.get("PART_NO").toString(), "partNo", result);
}
packMutilConditionHql(mapList, "PART_NO", "partNo", result);
}
}
}
String hqlString = " and ( 1=1 " + result.getPackedHql() + ") ";
result.setWhereAppend(hqlString);
// 通用数据拼接
getStringBuilderPack(new WmsDataAuth(), result);
WmsDataAuth wmsDataAuth = new WmsDataAuth();
wmsDataAuth.setOrganizeCode(organizeCode);
getStringBuilderPack(wmsDataAuth, result);
return result;
}
/**
* List<Map> HQL
* @param mapList
* @param keyName
* @param columnName
* @param packBean
*/
private static void packMutilConditionHql(List<Map> mapList, String keyName,
String columnName, DdlPackBean packBean) {
Integer index = 1;
for (Map item : mapList) {
packBean.addColumnQuery(columnName," or model." +
columnName + " = :m_" + columnName + (index++).toString(),
item.get(keyName).toString());
}
}
/**
* in sql
*
* @param columnName
@ -1754,4 +1778,71 @@ public class WmsHqlPack {
return result;
}
/**
* 线
*
* @param wmsLineLocatePart
* @return
*/
public static DdlPackBean packHqlWmsLineLocatePart(WmsLineLocatePart wmsLineLocatePart) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getPartNameRdd(), "partNameRdd", result);
getStringBuilderPack(wmsLineLocatePart, result);
return result;
}
/**
*
*
* @param wmsTaskSrc
* @return
*/
public static DdlPackBean packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result);
getStringBuilderPack(wmsTaskSrc, result);
return result;
}
/**
*
*
* @param wmsVendorPart
* @return
*/
public static DdlPackBean packHqlWmsVendorPart(WmsVendorPart wmsVendorPart) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsVendorPart.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringLikerPack(wmsVendorPart.getPartNo(), "partNo", result);
getStringBuilderPack(wmsVendorPart, result);
return result;
}
/**
*
*
* @param wmsCSRange
* @return
*/
public static DdlPackBean packHqlWmsCSRange(WmsCSRange wmsCSRange) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsCSRange.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSRange.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
getStringBuilderPack(wmsCSRange, result);
return result;
}
}

Loading…
Cancel
Save