Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
yun-zuoyi
汪云昊 6 years ago
commit 3b46d242a7

@ -260,6 +260,10 @@ public class AndonManageQueue extends BaseBean {
private List<Object> statusList;
@Transient
@ApiParam(value = "查询条件ANDON状态")
private List<Object> typeList;
@Transient
@ApiParam(value = "比例", example = "0")
private Double proportion;

@ -271,11 +271,13 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result);
DdlPreparedPack.getInPackList(andonManageQueue.getStatusList(), "statusCode", result); // 只有安灯任务管理特殊用途
DdlPreparedPack.getInPackArray(obj, "statusCode", result);
DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途
DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
@ -285,7 +287,8 @@ public class AndonHqlPack {
// 根据优先级倒序,序号升序排序
// DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
// new String[]{"priorityLevel", "seq"}, result);
result.setOrderByStr(andonManageQueue.orderBy());
result.setOrderByStr(andonManageQueue.orderBy());
return result;
}

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import io.swagger.annotations.Api;
@ -21,7 +22,7 @@ import java.util.List;
**/
@Data
@Api("订单基类")
public class BaseOrder extends BaseAPS {
public class BaseOrder extends BaseCode {
@Column(name="COUNT")
@ApiParam(value ="数量")
private Double count;

@ -15,6 +15,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.lang.reflect.Method;
import java.sql.JDBCType;
/**
* @Description :
@ -75,6 +76,10 @@ public class FieldInfo extends BaseCode {
@ApiParam(value ="主键标识")
private Boolean mainKey;
@Column(name="JDBC_TYPE")
@ApiParam(value ="数据库类型")
private JDBCType jdbcType;
@JsonIgnore
private transient Class<? extends BaseBean> clazz;
@JsonIgnore

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -36,4 +38,7 @@ public class Inventory extends BaseOrder {
@ApiParam(value ="多余量")
private Double excessCount;
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}
}

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -43,4 +45,8 @@ public class PurchaseOrder extends BaseOrder {
@Column(name="EXCESS_COUNT")
@ApiParam(value ="多余量")
private Double excessCount;
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}
}

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -40,4 +42,8 @@ public class SalesOrder extends BaseOrder {
@Column(name="CALC_LEAD_TIME")
@ApiParam(value ="提前期计算值")
private String calcLeadTime;
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}
}

@ -243,7 +243,7 @@ public class BeanRelationUtil {
*
* @param packName
*/
private static List<Class<?>> loadClass(String packName) {
public static List<Class<?>> loadClass(String packName) {
List<Class<?>> clses = new ArrayList<>();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
String strFile = packName.replaceAll("\\.", "/");

@ -2,6 +2,6 @@
<Class name="ImportProject">
<Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
</Relation>
<Relation field="Details" name="ImportDetail" reverset="Project" type="ONE_TO_MULTI" owner="true">
<Relation field="Details" name="ImportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -134,7 +134,7 @@ public abstract class BaseBean implements Serializable {
String result = "";
if (orderByParam!=null&&orderByParam.trim().length()>0) {
result = " order by " + orderByParam;
if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
if(ascOrDesc!= null && ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
result += " asc";
}else{
result += " desc";

@ -15,7 +15,7 @@ import java.lang.reflect.Field;
/**
* @Description : Xml
* DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm
* DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-7-23 5:58

@ -114,7 +114,7 @@ public class BlockSoftSwitchEnumUtil {
/* WebService */
SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
// CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
/* 数据源 */
@ -124,6 +124,14 @@ public class BlockSoftSwitchEnumUtil {
CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"),
SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120001,"Client REST服务端适配器"),
/* Socket */
SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"),
CLIENT_SOCKET_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.SOCKET,110001,"Socket Client Hello测试服务"),
/* MQ */
SERVER_MQ_RABBIT_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.MQ,250001,"RabbitMQ Server Hello测试服务"),
CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"),
/* FTP */
CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,15001,"Client FTP客户端适配器");

@ -350,14 +350,16 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_CENTER_RUNNING_STATUS {
RUNNING(1, "开线"),
STOPPED(2, "停线");
RUNNING(1, "start", "开线"),
STOPPED(2, "stop", "停线");
private int value;
private String code;
private String description;
WORK_CENTER_RUNNING_STATUS(int value, String description) {
WORK_CENTER_RUNNING_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -365,6 +367,10 @@ public class MesPcnEnumUtil {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
@ -378,6 +384,16 @@ public class MesPcnEnumUtil {
}
return tmp;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
}
/**
@ -386,10 +402,10 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WC_CHECK_TYPE {
PERSON(10, "person", "人"),
EQUIPMENT(20, "equipment", "机"),
MATERIAL(30, "material", "料"),
ROUTE(40, "route", "法"),
PERSON(10, "people", "人"),
EQUIPMENT(20, "equipments", "设备"),
MATERIAL(30, "materials", "料"),
ROUTE(40, "routes", "工艺"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
private int value;
@ -423,6 +439,16 @@ public class MesPcnEnumUtil {
}
return tmp;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
}
/**
@ -498,4 +524,442 @@ public class MesPcnEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EQP_CONNECT_TYPE {
PLC(10, "PLC"),
DB(20, "DB"),
OTHER(30,"OTHER");
private int value;
private String description;
EQP_CONNECT_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesPlanOrderstatus
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PLAN_ORDER_STATUS {
CREATE(10, "CREATED", "创建"),
DE_COMPOSE_ING(20, "DE_COMPOSE_ING", "分解中"),
DE_COMPOSE_ED(30, "DE_COMPOSE_ED", "分解完成"),
CLOSE(40, "CLOSE", "关闭");
private int value;
private String code;
private String description;
PLAN_ORDER_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String 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;
}
}
/**
* MesWorkOrderworkOrderStatus
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_STATUS {
CREATE(10, "创建"),
LANDED(20, "下达"),
OPEN(30, "启动"),
PAUSE(40, "暂停"),
CANCEL(50, "取消"),
CLOSE(60, "关闭");
private int value;
private String description;
WORK_ORDER_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesWorkOrderworkOrderType
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_TYPE {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单");
private int value;
private String description;
WORK_ORDER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String 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;
}
}
/**
* MesPlanOrderplanType
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PLAN_ORDER_TYPE {
STANDARD_ORDER(10, "标准");
private int value;
private String description;
PLAN_ORDER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* MesPlanOrdersource
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PALN_ORDER_SOURCE {
MES("MES", "来源于MES"),
SAP("SAP", "来源于SAP");
private String value;
private String description;
PALN_ORDER_SOURCE(String value, String description) {
this.value = value;
this.description = description;
}
public String 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.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesWorkOrdersource
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_SOURCE {
MES("MES", "来源于MES"),
AMES("AMES", "来源于AMES"),
SAP("SAP", "来源于SAP"),
CREATE("CREATE", "手工新增"),
RESOLVE("RESOLVE", "计划分解");
private String value;
private String description;
WORK_ORDER_SOURCE(String value, String description) {
this.value = value;
this.description = description;
}
public String 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.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesQueueOrderstatus
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_ORDER_STATUS {
NORMAL(10, "正常"),
ONLINE(20, "已上线"),
OFFLINE(30, "已下线"),
CLOSE(40, "已关闭"),
;
private int value;
private String description;
QUEUE_ORDER_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesQueueOrderDetailstatus
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_ORDER_DETAIL_STATUS {
NORMAL(10, "正常"),
CLOSE(20, "关闭");
private int value;
private String description;
QUEUE_ORDER_DETAIL_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesPartCategorycategoryType
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_CATEGORY_TYPE {
CATEGORY_ONE("Category1", "类型1"),
CATEGORY_TWO("Category2", "类型2"),
CATEGORY_THREE("Category3", "类型3");
private String value;
private String description;
PART_CATEGORY_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (val.equals(values()[i].value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesWorkOrderapprovalStatus
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_APPROVAL_STATUS {
WAIT_APPROVAL(10, "待审批"),
COMPLETE_APPROVAL(20, "已审批"),
REJECT_APPROVAL(30, "驳回");
private int value;
private String description;
WORK_ORDER_APPROVAL_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription2(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
}
}
return tmp;
}
}
}

@ -377,6 +377,44 @@ public class WmsEnumUtil {
}
/**
* 使
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRINT_STATUS {
PRINTED(1, "已打印"), NOPRINT(2, "未打印"), GENERATE(3, "退料生成条码");
private int value;
private String description;
PRINT_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 String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -560,7 +598,9 @@ public class WmsEnumUtil {
ASN(200, "ASN", "ASN"),
PO(210, "PO", "PO"),
QC(220, "QC", "QC"),
AMPR(230, "AMPR", "AMPR");
AMPR(230, "AMPR", "AMPR"),
FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
VDA_REPORT(250, "VDA_REPORT", "VDA生产报工");
private int value;

@ -530,6 +530,19 @@ public class DdlPreparedPack {
}
/**
* not in List
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPackList(List<?> data, String columnName, DdlPackBean packBean) {
if (data != null && data.size() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data);
}
}
/**
* in String
*
* @param data
@ -572,9 +585,9 @@ public class DdlPreparedPack {
data = "";
for (int i = 0; i < dataArray.length; i++) {
if (i == dataArray.length - 1) {
data += "" + dataArray[i] + "";
data += "'" + dataArray[i] + "'";
} else {
data += "" + dataArray[i] + ",";
data += "'" + dataArray[i] + "',";
}
}
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.pcn.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_PART_CATEGORY")
@Api("零件种类")
public class MesPartCategory extends BaseBean {
@Column(name="CATEGORY_CODE")
@ApiParam("分类代码")
private String categoryCode;
@Column(name="CATEGORY_NAME")
@ApiParam("分类名称")
private String categoryName;
@Column(name="CATEGORY_TYPE")
@ApiParam("分类类型")
private String categoryType;
}

@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean {
public String prodCfgName;
@Transient
@ApiParam("区域代码名称")
private String areaCodeName;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划开始日期查询用,查询开始日期",example = "2018-12-31 23:59:59")
public String startTimeStart;

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPartCategory;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesPartCategoryRepository extends BaseRepository<MesPartCategory, Long> {
}

@ -33,6 +33,20 @@ public class MesHqlPack {
}
/**
*
*
* @param organizeCode
* @return
*/
public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
return packBean;
}
/**
* MES PCN
*
* @param mesConfig
@ -153,4 +167,55 @@ public class MesHqlPack {
return packBean;
}
/**
*
*
* @param mesPart
* @return
*/
public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
if (StringUtils.isNotEmpty(mesPart.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getPartName())) {
DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
}
DdlPreparedPack.getOrderDefault(mesPart);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
return packBean;
}
/**
* MES
*
* @param customer
* @return
*/
public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode);
if (StringUtils.isNotEmpty(customer.getCustomerCode())) {
DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean);
}
if (StringUtils.isNotEmpty(customer.getCustomerName())) {
DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
}
return packBean;
}
}

@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean {
public String prodCfgName;
@Transient
@ApiParam("区域代码名称")
private String areaCodeName;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划开始日期查询用,查询开始日期",example = "2018-12-31 23:59:59")
public String startTimeStart;

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.*;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.Serializable;
@ -32,6 +33,9 @@ public class BsSuitCaseModel implements Serializable {
@ApiParam(value = "Web Service 适配套件")
private BsSuitCaseWebService webService;
@ApiParam(value = " MQ 适配套件")
private BsSuitCaseMq mq;
@ApiParam(value = "REST 适配套件")
private BsSuitCaseREST bsSuitCaseREST;

@ -11,6 +11,16 @@ import lombok.Data;
**/
@Data
public class SoftswitchIocModel {
/* Spring Ioc Bean 名称 */
private String beanName;
/* Spring Ioc 需要管理的Bean */
private Object obj;
/* 需要 管理 Bean 类型 */
private Integer objType;
/* 需要 管理 Bean 状态 */
private Integer objStatus;
/* 需要 管理 Bean 唯一 */
private String objKey;
/* Bean 的描述信息 */
private String objDescription;
}

@ -27,6 +27,8 @@ public class SuitServerModel {
/* 认证使用 以后使用 */
private String token;
// 请求ID
private String requestId;
// 传输单对象
private Object obj;
// 传输集合

@ -35,8 +35,11 @@ public class WmsActionResponseBean<Obj> implements Serializable {
@ApiParam("进度")
public String percent = "消息提示:";
@ApiParam("当前步骤")
public Integer currentStep;
@ApiParam("当前步骤类型名称")
public String currentStepTypeName;
@ApiParam("当前步骤名称")
public String currentStepName;
@ApiParam("总步数")
public int totalStep;

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : MQ
* @Reference :
* @Author : wei.peng
* @CreateDate : 2019/9/9 11:09
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SUIT_CASE_MQ")
@Api(value = "MQ", description = "MQ 适配套件")
public class BsSuitCaseMq extends BaseBean {
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
private Long suitCaseId;
@Column(name = "USER_LOGIN_NAME")
@ApiParam(value = "登录名称")
private String userLoginName;
@Column(name = "USER_LOGIN_PWD")
@ApiParam(value = "登录密码")
private String userLoginPwd;
@Column(name = "VIRTUAL_HOST")
@ApiParam(value = "虚拟 Host")
private String virtualHost;
@Column(name = "QUEUE_NAME")
@ApiParam(value = "队列名称")
private String queueName;
}

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -26,6 +27,7 @@ import java.util.List;
@Entity
@DynamicInsert
@DynamicUpdate
@XStreamAlias("param")
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SUIT_CASE_PARAM")
@Api(value = "适配器出入参", description = "适配器出入参")

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseMq;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 2019/9/26 3:25
* @Modify:
**/
@Repository
public interface BsSuitCaseMqRepository extends BaseRepository<BsSuitCaseMq,Long> {
}

@ -84,6 +84,10 @@ public class WmsActionGroupDetails extends BaseBean {
private String asName;
@Transient
@ApiParam(value = "步骤类型名称")
private String atName;
@Transient
@ApiParam(value = "流程名称")
private String agName;
@ -112,11 +116,13 @@ public class WmsActionGroupDetails extends BaseBean {
@ApiParam(value = "是否自动开窗", example = "2")
private Integer isAutoOpenWindow;
@Column(name = "SEARCH_KEY")
@ApiParam(value = "搜索KEY")
public String searchKey;
private String searchKey;
@Column(name = "GROUP_KEY")
@ApiParam(value = "分组KEY")
public String groupKey;
private String groupKey;
public int getSeqVal() {
return this.seq == null ? 0 : this.seq;
@ -153,4 +159,37 @@ public class WmsActionGroupDetails extends BaseBean {
public int getLenCheckVal() {
return this.lenCheck == null ? 0 : this.lenCheck;
}
public WmsActionGroupDetails() {
}
public WmsActionGroupDetails(Long id, Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper,
Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId,
String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow,
Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey,
String groupKey, String organizeCode) {
this.id = id;
this.agId = agId;
this.seq = seq;
this.okSeq = okSeq;
this.ngSeq = ngSeq;
this.valueType = valueType;
this.toUpper = toUpper;
this.lenCheck = lenCheck;
this.regularCheck = regularCheck;
this.regularCheckFailMsg = regularCheckFailMsg;
this.asId = asId;
this.atId = atId;
this.asName = asName;
this.atName = atName;
this.goToBtnCode = goToBtnCode;
this.goToBtnName = goToBtnName;
this.preShow = preShow;
this.showAmId = showAmId;
this.isCommitAble = isCommitAble;
this.isAutoOpenWindow = isAutoOpenWindow;
this.searchKey = searchKey;
this.groupKey = groupKey;
this.organizeCode = organizeCode;
}
}

@ -133,7 +133,7 @@ public class WmsCSOrderDetails extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
public Integer differenceType;
public Integer getDifferenceType() {
public Integer getDifferenceTypeVal() {
return this.differenceType == null ?
-1: this.differenceType;
}

@ -128,11 +128,11 @@ public class WmsStockSn extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
private Integer snStatus;
/**
* 1:2
* 1:23退
*/
@Column(name = "PRINTED")
@ApiParam(value = "是否打印", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
private Integer printed;
@Column(name = "PDATE")

@ -208,6 +208,12 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
// 查询计划时间在指定范围的单号,查询这些单号的数据
if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {
DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result);
}
getStringBuilderPack(wmsPOMaster, result);
return result;
@ -593,6 +599,11 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
// 查询计划时间在指定范围的单号,查询这些单号的数据
if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) {
DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result);
}
getStringBuilderPack(wmsASNMaster, result);
return result;
@ -1529,6 +1540,12 @@ public class WmsHqlPack {
DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result);
result.setOrderByStr(wmsStockSn.orderBy());
if(wmsStockSn.getPrinted()!= null){
if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result);
}
}
getStringBuilderPack(wmsStockSn, result);
return result;
}

Loading…
Cancel
Save