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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
袁津哲 5 years ago
parent 8a836e340a d2fb33d888
commit ae1c6ef8fd
17 changed files with 472 additions and 37 deletions
Show Stats Download Patch File Download Diff File

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

@ -18,7 +18,8 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_ACTION_MODULE {
WORK_ORDER_LANDED(10, "生产工单下达"),
QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达");
QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"),
MES_WORK_ORDER(30, "生产工单导入");
private int value;
private String description;

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

@ -2651,8 +2651,8 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MONITOR_TASK_OBJECT_TYPE {
PLC(10, "PLC");
// DB(20, "DB");
PLC(10, "PLC"),
DB(20, "DB");
private int value;
private String description;

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

@ -5725,6 +5725,16 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
@ -5764,7 +5774,99 @@ public class WmsEnumUtil {
return null;
}
public static String valueOf(int val) {
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;
}
}
/**
* 推送类型单位
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QAD_DOC_TYPE {
TYPE_S(10, "s","s"), TYPE_D(20, "d","d");
private int value;
private String code;
private String description;
public String getCode() {
return code;
}
QAD_DOC_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 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;
}
}
/**
* 业务场景Supplier
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BUSI_SCENE_TYPE {
YFAS_DELIVERY(10, "YFAS_DELIVERY", "YFAS送货"),
TURN_ZAITU_LOCATE(20, "TURN_ZAITU_LOCATE", "转储到在途库位"),
ORGANIZE_TRUN(30, "ORGANIZE_TRUN", "工厂内转储"),
SUPPLIER_SELF(40, "SUPPLIER_SELF", "供应商自提"),
CUSTOMER_SELF(50, "CUSTOMER_SELF", "客户自提");
private int value;
private String code;
private String description;
BUSI_SCENE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static BUSI_SCENE_TYPE codeOf(String code) {
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
return values()[i];
}
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
Unescape Escape View File

@ -67,4 +67,16 @@ public class QueueOrderModel implements Serializable {
this.snStatus = snStatus;
this.workType = workType;
}
public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workType = workType;
}
}

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

@ -38,13 +38,9 @@ public class MesMonitorTaskDetail extends BaseBean implements Serializable {
@ApiParam("数据对象编号")
private String dataObjectNo;
// @Column(name = "STORE_OBJECT_CODE")
// @ApiParam("存储对象代码")
// private String storeObjectCode;
//
// @Column(name = "STORE_FIELD_CODE")
// @ApiParam("存储字段代码")
// private String storeFieldCode;
@Column(name = "STORE_OBJECT_CODE")
@ApiParam("存储对象代码")
private String storeObjectCode;
@Transient
@ApiParam("任务名称")

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
/**
@ -92,6 +93,9 @@ public class MesPlcModel implements Serializable {
@ApiParam("对象代码")
private String objectCode;
@ApiParam("OPCUA路径")
private String opcUrl;
public MesPlcModel() {
}
@ -99,7 +103,7 @@ public class MesPlcModel implements Serializable {
public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode) {
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -126,5 +130,6 @@ public class MesPlcModel implements Serializable {
this.isAnalysis = isAnalysis;
this.device = device;
this.objectCode = objectCode;
this.opcUrl = opcUrl;
}
}

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

@ -0,0 +1,66 @@
package cn.estsh.i3plus.pojo.mes.model;
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;
import java.io.Serializable;
/**
* @Description :MES_JIT发运队列
* @Reference :
* @Author : qianhausheng
* @CreateDate : 2020-03-06 10:16 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_SHIPPING")
@Api("MES_JIT发运队列")
public class MesQueueShipping extends BaseBean implements Serializable {
private static final long serialVersionUID = 655875369308414110L;
@Column(name = "JIT_NO")
@ApiParam("队列编号")
private String jitNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("配置代码")
private String prodCfgCode;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "CUST_FLAG_NO")
@ApiParam("客户标识号")
private String custFlagNo;
@Column(name = "SEQ")
@ApiParam("排序号")
private Double seq;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户产线代码")
private String custPlantCode;
}

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

@ -0,0 +1,73 @@
package cn.estsh.i3plus.pojo.mes.model;
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;
import java.io.Serializable;
/**
* @Description :MES_JIT发运队列明细
* @Reference :
* @Author : qianhausheng
* @CreateDate : 2020-03-06 10:16 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_SHIPPING_DETAIL")
@Api("MES_JIT发运队列明细")
public class MesQueueShippingDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 1442091799346314190L;
@Column(name = "JIT_NO")
@ApiParam("队列编号")
private String jitNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("配置代码")
private String prodCfgCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "status")
@ApiParam("状态")
private Integer status;
@Column(name="SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "GROUP_NO")
@ApiParam("组内编号")
private Integer groupNo;
@Column(name = "GROUP_SEQ")
@ApiParam("分组序号")
private String groupSeq;
@Column(name = "qty")
@ApiParam("数量")
private Double qty;
}

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

@ -120,7 +120,39 @@ public class QueueOrderModel implements Serializable {
this.snStatus = snStatus;
this.workType = workType;
}
public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.serialNumber = serialNumber;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.snStatus = snStatus;
this.workType = workType;
this.finsihQty=finsihQty;
this.qty=qty;
this.orderNo=orderNo;
}
public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.serialNumber = serialNumber;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.snStatus = snStatus;
this.workType = workType;
this.orderNo=orderNo;
}
public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) {
this.id = id;
this.queDetailSeq = queDetailSeq;
@ -129,16 +161,33 @@ public class QueueOrderModel implements Serializable {
this.groupNo = groupNo;
this.prodCfgCode = prodCfgCode;
}
public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType,Double finsihQty,Double qty) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workType = workType;
this.finsihQty=finsihQty;
this.qty=qty;
this.orderNo=orderNo;
}
public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.organizeCode = organizeCode;
this.workType = workType;
this.orderNo=orderNo;
}
}

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

@ -8,6 +8,7 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -101,7 +102,7 @@ public class StationRequestBean implements Serializable {
private String queueGroupNo;
@ApiParam("数据map")
private Map<String, Object> dataMap;
private Map<String, Object> dataMap=new HashMap<>();
@ApiParam("流程状态集合")
private List<MesRouteStatus> routeStatusList;

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

@ -20,13 +20,16 @@ public class StepDispatchModel {
private String requestBeanKey;
private String moduleDataMapKey;
private String scanInfo;
public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) {
public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) {
this.stepListKey = stepListKey;
this.firstScanKey = firstScanKey;
this.cellParamKey = cellParamKey;
this.requestBeanKey = requestBeanKey;
this.moduleDataMapKey = moduleDataMapKey;
this.scanInfo = scanInfo;
}
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -1079,6 +1079,9 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode);
if (!StringUtils.isEmpty(workCellParamCfg.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(workCellParamCfg.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
}

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

@ -107,6 +107,10 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "车牌号")
private String carNo;
@Column(name = "DRIVER_NO")
@ApiParam("司机")
public String driverNo;
@Column(name = "CUST_ORDER_NO")
@ApiParam(value = "客户单号")
private String custOrderNo;

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

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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.*;
import java.util.List;
/**
* @Description : 运输规则表
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-03-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_TRANSPORT_RULE")
@Api("运输规则表")
public class WmsTransportRule extends BaseBean {
private static final long serialVersionUID = 6120257805546343124L;
@Column(name = "COMMAND_TYPE")
@ApiParam(value = "指令类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.IMPORT_ORDER_TYPE.class, refForeignKey = "value", value = "description")
private String commandType;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE")
public Integer busiType;
@Column(name = "BUSI_SCENE_TYPE")
@ApiParam("业务场景")
//@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE")
public Integer busiSceneType;
@Column(name = "SRC_AREA_NO")
@ApiParam("发货库存地")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
public String srcAreaNo;
@Column(name = "DEST_AREA_NO")
@ApiParam("目标库存地")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
public String destAreaNo;
@Column(name = "OUT_VENDOR_NO")
@ApiParam("委外供应商编码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
public String outVendorNo;
@Column(name = "PART_NO")
@ApiParam("物料编码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
public String partNo;
@Column(name = "CUST_NO")
@ApiParam("客户代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
public String custNo;
@Column(name = "IS_TRANSPORT")
@ApiParam("是否安排运输")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
public int isTransport;
@Column(name = "REMARK",length = 255)
@ApiParam("备注")
public String remark;
@ApiParam("物料编码")
@Transient
public List<String> partNoLst;
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTransportRule;
import org.springframework.stereotype.Repository;
/**
* @Description : 运输规则dao层
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-03-27 10:30
* @Modify:
**/
@Repository
public interface WmsTransportRuleRepository extends BaseRepository<WmsTransportRule, Long> {
}

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

@ -2907,4 +2907,17 @@ public class WmsHqlPack {
return result;
}
/**
* 运输规则分页查询条件
* @param wmsTransportRule
* @return
*/
public static DdlPackBean packHqlBasPlugin(WmsTransportRule wmsTransportRule) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(wmsTransportRule.getBusiType(), "busiType", result);
DdlPreparedPack.getStringLikerPack(wmsTransportRule.getCustNo(), "custNo", result);
DdlPreparedPack.getStringLikerPack(wmsTransportRule.getPartNo(), "partNo", result);
getStringBuilderPack(wmsTransportRule, result);
return result;
}
}

Write Preview
Loading…
Cancel
Save