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

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

Browse Source
yun-zuoyi
crish 6 years ago
parent dd418f8b51 acd1e6cfb6
commit 7ee5312303
20 changed files with 508 additions and 32 deletions
Show Stats Download Patch File Download Diff File

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

@ -97,25 +97,25 @@ public abstract class BaseBean implements Serializable {
public String modifyDatetime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String createDateTimeStart;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
public String createDateTimeEnd;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String modifyDateTimeStart;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
public String modifyDateTimeEnd;

71
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java
Unescape Escape View File

@ -1,5 +1,16 @@
package cn.estsh.i3plus.pojo.base.codemaker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sun.management.VMManagement;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.NetworkInterface;
/**
* @Description : 使用SnowFlake，生成分布式ID
* @Reference : SnowFlake可以保证：
@ -11,13 +22,15 @@ package cn.estsh.i3plus.pojo.base.codemaker;
**/
public class SnowflakeIdMaker {
public static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeIdMaker.class);
private long workerId;
private long datacenterId;
private long sequence = 0L;
public SnowflakeIdMaker(){
this.workerId = 1;
this.datacenterId = 1;
this.workerId = getWorkerMacId();
this.datacenterId = getDatacenterPid();
this.sequence = 0L;
}
@ -89,6 +102,60 @@ public class SnowflakeIdMaker {
return timestamp;
}
/**
* 使用本机Mac 地址的HashCode 取摸 32
* @return
*/
private long getWorkerMacId() {
long result;
try {
InetAddress ia;
byte[] mac = null;
//获取本地IP对象
ia = InetAddress.getLocalHost();
//获得网络接口对象（即网卡），并得到mac地址，mac地址存在于一个byte数组中。
mac = NetworkInterface.getByInetAddress(ia).getHardwareAddress();
//下面代码是把mac地址拼装成String
StringBuffer sb = new StringBuffer();
for (int i = 0; i < mac.length; i++) {
if (i != 0) {
sb.append("-");
}
//mac[i] & 0xFF 是为了把byte转化为正整数
String s = Integer.toHexString(mac[i] & 0xFF);
sb.append(s.length() == 1 ? 0 + s : s);
}
//把字符串所有小写字母改为大写成为正规的mac地址并返回
result = sb.toString().toUpperCase().hashCode();
}catch (Exception e){
e.printStackTrace();
result = 31;
LOGGER.error("[SnowflakeIdMaker] 获取设备ID错误：{}",e.getMessage());
}
result = result + timeGen();
return result < 0 ? (0 - result) % 32 : result % 32;
}
private long getDatacenterPid() {
long result;
try {
RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean();
Field jvm = runtime.getClass().getDeclaredField("jvm");
jvm.setAccessible(true);
VMManagement mgmt = (VMManagement) jvm.get(runtime);
Method pidMethod = mgmt.getClass().getDeclaredMethod("getProcessId");
pidMethod.setAccessible(true);
result = (Integer) pidMethod.invoke(mgmt);
} catch (Exception e) {
result = 31;
}
result = result + timeGen();
return result < 0 ? (0 - result) % 32 : result % 32;
}
private long timeGen(){
return System.currentTimeMillis();
}

1
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java
Unescape Escape View File

@ -60,6 +60,7 @@ public class XStreamFactory {
}
});
xStream.setMode(XStream.NO_REFERENCES);
xStream.autodetectAnnotations(true);
return xStream;

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

@ -833,7 +833,7 @@ public class BlockFormEnumUtil {
TEXT(200, "TEXT", "文本"),
NUMBER(210, "NUMBER", "数字"),
PASSWORD(230, "PASSWORD", "密码"),
DATE_TIME(300, "DATE", "日期"),
DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN),
// DATE(300, "DATE", "日期(yyyy-MM-dd)"),
// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
// ELEMENT(700, "DICT_SELECT", "元素"),
@ -847,10 +847,22 @@ public class BlockFormEnumUtil {
private String code;
private String description;
private PROPERTY_CONTROL_TYPE(int value, String code, String description) {
/**
* 默认查询关系
*/
private SQL_WHERE defaultWhere;
PROPERTY_CONTROL_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) {
this.value = value;
this.code = code;
this.description = description;
this.defaultWhere = defaultWhere;
}
public int getValue() {
@ -865,6 +877,10 @@ public class BlockFormEnumUtil {
return description;
}
public SQL_WHERE getDefaultWhere() {
return defaultWhere;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -2476,7 +2492,6 @@ public class BlockFormEnumUtil {
}
public static SQL_WHERE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];

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

@ -1030,6 +1030,57 @@ public class CommonEnumUtil {
}
}
/**
* 变量类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BASIS_TYPE {
INT(1, "int"),
DOUBLE(2, "double"),
LONG(3, "long"),
FLOAT(4, "float"),
CHAR(5, "char"),
BOOLEAN(6,"boolean"),
BYTE(7, "byte"),
SHORT(8, "short");
private int value;
private String description;
private BASIS_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
// 数据有效的静态常量
public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue();

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

@ -3189,4 +3189,57 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 盘点差异类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INVENTORY_DIFFERENCE_TYPE {
INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"),
INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢");
private int value;
private String code;
private String description;
INVENTORY_DIFFERENCE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

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

@ -150,7 +150,12 @@ public class DdlPreparedPack {
} else {
order[i] = "desc";
}
sqlStr += " model." + columnName[i] + " " + order[i].toString() + ",";
if(columnName[i].indexOf(" model.") == -1){
sqlStr += " model." + columnName[i];
}else{
sqlStr += columnName[i];
}
sqlStr += " " + order[i].toString() + ",";
}
}
@ -506,4 +511,24 @@ public class DdlPreparedPack {
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
}
}
/**
* 转换排序列
* @param columnName 列名
* @param basisType 基本类型
* @see CommonEnumUtil.BASIS_TYPE
* @return
*/
public static String getOrderColConvertType(String columnName,int basisType){
String name =" model." + columnName;
if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) {
name = " cast(" + name+ " as integer)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()){
name = " cast(" + name+ " as double)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()){
name = " cast(" + name+ " as long)";
}
return name;
}
}

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

@ -70,12 +70,12 @@ public class MesBom extends BaseBean {
@Column(name = "EFF_START_TIME")
@ApiParam(value = "生效时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private String effStartTime;
@Column(name = "EFF_END_TIME")
@ApiParam(value = "失效时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private String effEndTime;
public double getQtyVal() {

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

@ -49,7 +49,7 @@ public class MesPcnSyncCfg extends BaseBean {
private Integer syncFrequency;
@Column(name="SYNC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value ="同步时间")
private String syncTime;
@ -62,7 +62,7 @@ public class MesPcnSyncCfg extends BaseBean {
private Integer syncType;
@Column(name="LAST_SYNC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value ="上一同步时间")
private String lastSyncTime;

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

@ -94,24 +94,24 @@ public class MesPlanOrder extends BaseBean {
/********************** 冗余字段 *********************************/
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
public String startTimeStart;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
public String startTimeEnd;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
public String endTimeStart;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
public String endTimeEnd;

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -191,6 +192,11 @@ public class MesWorkOrder extends BaseBean {
return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values());
}
@Transient
@ApiParam("mes生产工单页面按钮控制")
private MesWorkOrderButtonModel workOrderButtonModel;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

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

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Author: wangjie
* @CreateDate: 2019/8/21 9:19 AM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("mes生产工单页面按钮控制model")
public class MesWorkOrderButtonModel implements Serializable {
@ApiParam("修改按钮")
private boolean updateButton;
@ApiParam("按配置修改按钮")
private boolean updateButton4Config;
@ApiParam("下达按钮")
private boolean transmitButton;
@ApiParam("测试动态下达按钮")
private boolean dynamicTransmitButton4Test;
@ApiParam("启动按钮")
private boolean startUpButton;
@ApiParam("暂停按钮")
private boolean suspendButton;
@ApiParam("撤销按钮")
private boolean revokeButton;
@ApiParam("关闭按钮")
private boolean closeButton;
}

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

@ -60,7 +60,6 @@ public class SuitCoreModel {
/**
* 适配器套件
*/
@XStreamOmitField
private BsSuitCase bsSuitCase;
/**
@ -100,7 +99,7 @@ public class SuitCoreModel {
// 设置套件代码
this.suitCaseCode = bsSuitCase.getSuitCaseCode();
// 设置默认
this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.FAIL.getCode();
this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
// 设置默认
this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
// 设置默认

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

@ -34,6 +34,10 @@ public class SysTask extends BaseBean {
@ApiParam(value ="名称")
private String name;
@Column(name="TASK_CODE")
@ApiParam(value ="任务代码")
private String taskCode;
// 软件类型 CommonEnumUtil.SOFT_TYPE
@Column(name="TASK_SOFT_TYPE")
@ApiParam(value = "软件类型")
@ -47,6 +51,10 @@ public class SysTask extends BaseBean {
@ApiParam(value ="任务类名")
private String taskClass;
@Column(name="IS_SYSTEM")
@ApiParam(value ="是否是系统job")
private String isSystem;
@Column(name="TASK_DESCRIPTION")
@ApiParam(value ="任务描述" , access ="任务描述")
private String taskDescription;

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

@ -34,9 +34,9 @@ public class BsParamAdapter extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long suitCaseId;
@Column(name = "SUIT_CASE_NAME")
@Column(name = "SUIT_CASE_NAME_RDD")
@ApiParam(value = "适配套件名称")
private String suitCaseName;
private String suitCaseNameRdd;
@Column(name = "SUIT_CASE_CODE")
@ApiParam(value = "适配套件代码")

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

@ -9,6 +9,7 @@ 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;
@ -38,9 +39,31 @@ public class BsSuitSchedule extends BaseBean {
@ApiParam(value = "适配套件名称")
private String suitCaseNameRdd;
@Column(name = "EXECUTE_CRON")
@ApiParam(value = "执行时间表达式")
private String executeCron;
@Column(name = "SCHEDULE_NAME")
@ApiParam(value = "任务名称")
private String scheduleName;
@Column(name = "SCHEDULE_GROUP_NAME")
@ApiParam(value = "任务组名称")
private String scheduleGroupName;
@Column(name = "TASK_PLAN_ID")
@ApiParam(value = "任务计划id")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskPlanId;
@Column(name = "TASK_CYCLE_ID")
@ApiParam(value = "任务周期id")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskCycleId;
@Column(name = "TASK_CYCLE_NAME_RDD")
@ApiParam(value = "任务周期名称")
private String taskCycleName;
@Column(name = "TASK_CYCLE_EXECUTE_RDD")
@ApiParam(value = "任务周期表达式表达式")
private String taskCycleExecuteRdd;
@Column(name = "LAST_EXECUTE_DATE_TIME")
@ApiParam(value = "最后一次执行时间")

102
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
Unescape Escape View File

@ -3,9 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
import cn.estsh.i3plus.pojo.softswitch.bean.*;
import org.apache.commons.lang3.StringUtils;
/**
@ -110,4 +108,102 @@ public class SoftSwitchHqlPack {
return ddlPackBean;
}
/**
* 数据适配转换规则查询条件封装
* @param bsParamAdapter 数据适配转换规则
* @return
*/
public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean);
ddlPackBean.setOrderByStr(bsParamAdapter.orderBy());
return ddlPackBean;
}
/**
* 数据适配装换规则唯一校验
* @param bsParamAdapter 数据适配转换规则
* @return
*/
public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamId(), "suitParamId", ddlPackBean);
return ddlPackBean;
}
/**
* 定时适配任务查询条件封装
* @param bsSuitSchedule 查询条件
* @return
*/
public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getTaskCycleId(),"taskCycleId",ddlPackBean);
ddlPackBean.setOrderByStr(bsSuitSchedule.orderBy());
return ddlPackBean;
}
/**
* 定时适配任务唯一校验
* @param bsSuitSchedule
* @return
*/
public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean);
return ddlPackBean;
}
/**
* 安全证书查询条件分页
* @param bsSslKey 查询条件
* @return
*/
public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyType(),"keyType",ddlPackBean);
ddlPackBean.setOrderByStr(bsSslKey.orderBy());
return ddlPackBean;
}
/**
* 安全证书唯一校验
* @param bsSslKey
* @return
*/
public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean);
return ddlPackBean;
}
}

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

@ -116,6 +116,13 @@ public class WmsCSOrderDetails extends BaseBean {
@ApiParam("源单位")
public String srcUnit;
/**
* 差异类型：10：盘平，20：盘亏，30盘赢
*/
@Transient
@ApiParam("差异类型")
public String differenceType;
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}

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

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 领料单模板
* @Reference :
* @author: amy.liu
* @date: 2019/8/19 17:10
* @Modify:
*/
@Data
@Api(value="领料单模板",description = "领料单模板")
public class WmsPickingMovement extends BaseBean {
private static final long serialVersionUID = 2167743108452607620L;
@ApiParam(value = "领料单号")
@AnnoOutputColumn
private String orderNo;
@ApiParam(value = "物料编码")
@AnnoOutputColumn
private String partNo;
@ApiParam(value = "领料数量")
@AnnoOutputColumn
private Double qty;
@ApiParam(value = "源存储区")
@AnnoOutputColumn
private String srcZoneNo;
@ApiParam(value = "目标存储区")
@AnnoOutputColumn
private String destZoneNo;
@ApiParam(value = "目标库位")
@AnnoOutputColumn
private String destLocateNo;
@ApiParam(value = "工厂")
@AnnoOutputColumn
private String factory;
}

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

@ -124,7 +124,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getCreateUser(), "createUser", result);
DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(),
wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true);
getStringBuilderPack(wmsDocMovementDetails, result);
@ -165,6 +165,7 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCreateUser(),"createUser",packBean);
getStringBuilderPack(wmsDocMovementMaster, packBean);
@ -172,6 +173,24 @@ public class WmsHqlPack {
}
/**
* 移库单号集合查询条件封装
* @param orderNoList
* @param organizeCode
* @return
*/
public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList,String organizeCode) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
return packBean;
}
/**
* PO订单主表信息 分页查询
*
* @param wmsPOMaster
@ -187,7 +206,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
DdlPreparedPack.getStringLikerPack(wmsPOMaster.getCreateUser(), "createUser", result);
DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),wmsPOMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
getStringBuilderPack(wmsPOMaster, result);
return result;
@ -572,6 +592,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
DdlPreparedPack.getStringLikerPack(wmsASNMaster.getCreateUser(), "createUser", result);
DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(),wmsASNMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
getStringBuilderPack(wmsASNMaster, result);
@ -602,6 +624,9 @@ public class WmsHqlPack {
//单据来源
DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result);
DdlPreparedPack.getStringLikerPack(wmsShipping.getCreateUser(), "createUser", result);
DdlPreparedPack.timeBuilder(wmsShipping.getCreateDateTimeStart(),wmsShipping.getCreateDateTimeEnd(),"createDatetime",result,true);
getStringBuilderPack(wmsShipping, result);
getStringBuilderPack(wmsShipping, result);
return result;
@ -688,6 +713,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCreateUser(), "createUser", result);
DdlPreparedPack.timeBuilder(wmsFGInStock.getCreateDateTimeStart(),wmsFGInStock.getCreateDateTimeEnd(),"createDatetime",result,true);
getStringBuilderPack(wmsFGInStock, result);
@ -2051,8 +2078,8 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"item"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{
DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
getStringBuilderPack(wmsCSRange, result);
return result;

Write Preview
Loading…
Cancel
Save