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
汪云昊 5 years ago
parent 3dd247491a 5d4e8a94c4
commit 4632c7572c
16 changed files with 234 additions and 80 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java
Unescape Escape View File

@ -67,6 +67,6 @@ public class MesWorkCell extends BaseBean {
private String workCellType;
public String getName(){
return this.workCellName;
return this.workCellCode;
}
}

4
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java
Unescape Escape View File

@ -18,4 +18,8 @@ public class GanttCalendarModel {
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date endDate;
private String cls;
//private String timeRangeColor;
private String eventColor;
private String name;
private Long workId;
}

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

@ -276,7 +276,8 @@ public class MesEnumUtil {
DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
REPAIR("REPAIR", "处理措施"),
SCRAP("SCRAP", "报废原因"),
QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准");
QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
WC_CHECK("WC_CHECK", "开线检查项");
private String value;
private String description;
@ -1463,7 +1464,9 @@ public class MesEnumUtil {
MES_DATASOURCE(360, "DB地址清单"),
MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
MES_PLC(390,"PLC地址清单");
MES_PLC(390,"PLC地址清单"),
MES_PROCESS(400,"工序信息"),
MES_KPSN_RULE(410,"关键件条码校验规则");
private int value;
private String description;
@ -3725,13 +3728,8 @@ public class MesEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WC_CHECK_TYPE {
PERSON(10, "person", "人员"),
EQUIPMENT(20, "equipment", "设备"),
MATERIAL(30, "material", "物料"),
ROUTE(40, "route", "工艺"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
MATERIAL(10, "MATERIAL", "物料"),
ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号");
private int value;
private String code;

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

@ -214,7 +214,45 @@ public class MesPcnEnumUtil {
}
}
/**
* MES_TYPE_CFG 类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_TYPE_CFG {
DEFECT("DEFECT", "缺陷"),
DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
REPAIR("REPAIR", "处理措施"),
SCRAP("SCRAP", "报废原因"),
QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
WC_CHECK("WC_CHECK", "开线检查项");
private String value;
private String description;
MES_TYPE_CFG(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;
}
}
/**
* MesProdBindRecord 是否是关键件
*/
@ -1175,14 +1213,8 @@ public class MesPcnEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WC_CHECK_TYPE {
PERSON(10, "people", "人员"),
EQUIPMENT(20, "equipments", "设备"),
MATERIAL(30, "materials", "物料"),
ROUTE(40, "routes", "工艺"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
ENVIRONMENT(60, "environment", "环境");
MATERIAL(10, "MATERIAL", "物料"),
ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号");
private int value;
private String code;

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

@ -981,7 +981,6 @@ public class WmsEnumUtil {
/**
* 业务表：库存条码状态
* 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
@ -991,7 +990,6 @@ public class WmsEnumUtil {
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
//SCRAP(70, "报废"),
COMMING(80, "在途");
private int value;
@ -4656,7 +4654,7 @@ public class WmsEnumUtil {
}
/**
* 计划拉动明细表状态创建
* 计划拉动主表状态创建
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

22
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java
Unescape Escape View File

@ -3,7 +3,11 @@ package cn.estsh.i3plus.pojo.base.util;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class StringUtil {
@ -65,4 +69,22 @@ public class StringUtil {
return null;
}
}
private static Pattern linePattern = Pattern.compile("_(\\w)");
/** 驼峰转下划线 */
public static Map<String, Object> humpToLine(Map<String, Object> map) {
Map<String, Object> resultMap = new HashMap<>();
for (String str : map.keySet()) {
str = str.toLowerCase();
Matcher matcher = linePattern.matcher(str);
StringBuffer sb = new StringBuffer();
while (matcher.find()) {
matcher.appendReplacement(sb, matcher.group(1).toUpperCase());
}
matcher.appendTail(sb);
resultMap.put(sb.toString(), map.get(str));
}
return resultMap;
}
}

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

@ -22,28 +22,17 @@ import java.util.*;
@Api("开线管控model")
public class WcCheckModel {
@ApiParam("人")
private List<MesWcCheckRecord> people;
@ApiParam("人 列")
private Map<String, String> peopleColumn;
@ApiParam("机")
private List<MesWcCheckRecord> equipments;
@ApiParam("机 列")
private Map<String, String> equipmentsColumn;
@ApiParam("工作中心")
private String workCenterCode;
@ApiParam("物料")
private List<MesWcCheckRecord> materials;
@ApiParam("物料 列")
private Map<String, String> materialsColumn;
@ApiParam("工单")
private String workOrder;
@ApiParam("法")
private List<MesWcCheckRecord> routes;
@ApiParam("法 列")
private Map<String, String> routesColumn;
@ApiParam("产品号")
private String partNo;
@ApiParam("对象list和列关系")
private Map<String, String> dataColumnRelation;
@ApiParam("是否通过")
private Integer isPass;
@ApiParam("开线信号")
private Integer onlineSignal;
@ -51,43 +40,23 @@ public class WcCheckModel {
@ApiParam("开线对象")
MesWcCheckRecord onlineSignalEqu;
@ApiParam("是否通过")
private Integer isPass;
@ApiParam("工作中心")
private String workCenterCode;
@ApiParam("工单")
private String workOrder;
@ApiParam("产品号")
private String partNo;
@ApiParam("需要展示的数据")
private Map<String, String> need2ShowMap;
private Map<String, String> titleMap;
@ApiParam("对象list和列关系")
private Map<String, Map<String, String>> dataColumnRelation;
@ApiParam("重构map")
private Map<String, List<MesWcCheckRecord>> dataMap;
public WcCheckModel initialWcCheckModel() {
WcCheckModel wcCheckModel = new WcCheckModel();
wcCheckModel.setPeople(new ArrayList<>());
wcCheckModel.setEquipments(new ArrayList<>());
wcCheckModel.setMaterials(new ArrayList<>());
wcCheckModel.setRoutes(new ArrayList<>());
wcCheckModel.setPeopleColumn(new HashMap<>());
wcCheckModel.setEquipmentsColumn(new HashMap<>());
wcCheckModel.setMaterialsColumn(new HashMap<>());
wcCheckModel.setRoutesColumn(new HashMap<>());
wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue());
wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue());
onlineSignalEqu = new MesWcCheckRecord();
wcCheckModel.setNeed2ShowMap(new HashMap<>());
Map<String, String> dataColumnRelationMap = new HashMap<>();
dataColumnRelationMap.put("people", "peopleColumn");
dataColumnRelationMap.put("equipments", "equipmentsColumn");
dataColumnRelationMap.put("materials", "materialsColumn");
dataColumnRelationMap.put("routes", "routesColumn");
wcCheckModel.setDataColumnRelation(dataColumnRelationMap);
wcCheckModel.setTitleMap(new LinkedHashMap<>());
wcCheckModel.setDataMap(new LinkedHashMap<>());
wcCheckModel.setDataColumnRelation(new LinkedHashMap<>());
return wcCheckModel;
}

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

@ -37,10 +37,6 @@ public class MesPartObject extends BaseBean {
@ApiParam("对象代码")
private String objectCode;
@Column(name = "OBJECT_NAME")
@ApiParam("物料名称")
private String objectName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
@ -60,4 +56,8 @@ public class MesPartObject extends BaseBean {
@Transient
@ApiParam("数据组号")
private String groupNo;
@Transient
@ApiParam("对象名称")
private String objectName;
}

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

@ -0,0 +1,67 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Transient;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\12\13 14:33
* @Modify:
**/
@Data
public class MesPartObjectModel {
private Long id;
@ApiParam(value ="组织代码")
private String organizeCode;
@ApiParam(value = "创建用户")
private String createUser;
@ApiParam(value = "创建日期")
private String createDatetime;
@ApiParam(value = "修改人")
private String modifyUser;
@ApiParam(value = "修改日期")
private String modifyDatetime;
@ApiParam(value = "有效性",example = "1")
private Integer isValid;
@ApiParam(value = "是否已删除",example = "2")
private Integer isDeleted;
@ApiParam("物料编码")
private String partNo;
@ApiParam("对象代码")
private String objectCode;
@ApiParam("生产线")
private String workCenterCode;
@ApiParam("对象名称")
private String objectName;
public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) {
this.id = id;
this.organizeCode = organizeCode;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.partNo = partNo;
this.objectCode = objectCode;
this.workCenterCode = workCenterCode;
this.objectName = objectName;
}
}

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

@ -2057,4 +2057,28 @@ public class MesHqlPack {
}
return packBean;
}
/**
* 质量标准配置
*
* @param qualityStandardCfg
* @param organizeCode
* @return
*/
public static DdlPackBean getMesQualityStandardCfg(MesQualityStandardCfg qualityStandardCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(qualityStandardCfg, organizeCode);
if (!StringUtils.isEmpty(qualityStandardCfg.getStandardType())) {
DdlPreparedPack.getNumEqualPack(qualityStandardCfg.getStandardType(), "standardType", packBean);
}
if (!StringUtils.isEmpty(qualityStandardCfg.getObjectKey())) {
DdlPreparedPack.getStringLikerPack(qualityStandardCfg.getObjectKey(), "objectKey", packBean);
}
if (!StringUtils.isEmpty(qualityStandardCfg.getObjectType())) {
DdlPreparedPack.getNumEqualPack(qualityStandardCfg.getObjectType(), "objectType", packBean);
}
if (!StringUtils.isEmpty(qualityStandardCfg.getObjectKeyValue())) {
DdlPreparedPack.getStringLikerPack(qualityStandardCfg.getObjectKeyValue(), "objectKeyValue", packBean);
}
return packBean;
}
}

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

@ -40,6 +40,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("工作单元名称")
private String workCellName;
@ApiParam("流程代码")
private String routeCode;

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

@ -112,6 +112,7 @@ public class WmsActionGroupDetails extends BaseBean {
@Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false)
@ApiParam(value = "是否自动开窗")
@AnnoOutputColumn
private Integer isAutoOpenWindow;
@Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''")

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

@ -99,6 +99,7 @@ public class WmsDocMovementMaster extends BaseBean {
public Integer isTask;
@Column(name = "PRIORITY")
@AnnoOutputColumn(refClass = WmsEnumUtil.PRIORITY.class, refForeignKey = "value", value = "description")
@ApiParam(value = "优先级", example = "1")
public Integer priority;

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

@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{
@Column(name="WROKORDER_NO")
@ApiParam("工单号")
private String wrokorderNo;
private String woekorderNo;
@Column(name="ITEM")
@ApiParam(value = "行号", example = "0")
@ -107,7 +107,7 @@ public class WmsPullTaskDetails extends BaseBean{
private Double bootLotNo = 0d;
@Column(name="ORDER_STATUS")
@ApiParam(value = "单据状态", example = "0")
@ApiParam(value = "明细状态", example = "0")
private Integer orderStatus = 0;
public Integer getOrderStatus() {

30
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java
Unescape Escape View File

@ -20,9 +20,6 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
@ApiParam("物料号")
private String partNo;
@ApiParam("运输状态")
private String orderStatus;
@ApiParam("单据号")
private String moveNo;
@ -34,4 +31,31 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
@ApiParam("工厂代码")
protected String organizeCode;
@ApiParam("ID")
private Long id;
@ApiParam(value ="道口")
private String dockNo;
@ApiParam(value ="承运商编号")
private String vendorNo;
@ApiParam(value ="承运商名称RDD")
private String vendorName;
@ApiParam(value ="驾驶员编号")
private String driverNo;
@ApiParam(value ="驾驶员名称RDD")
private String driverName;
@ApiParam(value ="驾驶员联系方式RDD")
private String phone;
@ApiParam(value ="单据状态")
private Integer orderStatus;
@ApiParam(value ="车牌号RDD")
private String carNo;
}

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

@ -2618,7 +2618,18 @@ public class WmsHqlPack {
*/
public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getInPack(statusList, "orderStatus", result);
List<String> stringList = null;
List<Integer> integerList = null;
//List<Integer> integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList());
if(StringUtils.isNotBlank(statusList)){
stringList = Arrays.asList(statusList.split(","));
integerList = new ArrayList<>();
for(String sl : stringList){
integerList.add(Integer.valueOf(sl));
}
}
DdlPreparedPack.getInPackList(integerList, "orderStatus", result);
DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result);
DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result);
@ -2637,7 +2648,7 @@ public class WmsHqlPack {
*/
public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result);
DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result);
DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result);
getStringBuilderPack(wmsPullTaskDetails, result);

Write Preview
Loading…
Cancel
Save