From f8405b87d9c3c32ac54013ee5f40e4938bd8f2eb Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 1 Apr 2020 09:29:31 +0800 Subject: [PATCH 01/10] =?UTF-8?q?bug7940=E3=80=907940=20=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=85=A5=E5=BA=93-=E6=9C=AA=E6=8C=89=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E6=8E=A8=E8=8D=90=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 4fd1ad6..9eab3f2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -5301,4 +5301,44 @@ public class WmsEnumUtil { 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; + } + } } \ No newline at end of file From 078e1a77a4732fa86e27d736bdc091f25d1ccf1f Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 13:18:19 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E3=80=90bug=207895=20PLC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E9=A1=B5=E9=9D=A2=E9=9C=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 1ad0189..9ea903c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -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; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 15b53e4..d217cfb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -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); } From 73f647e3b4300471d23bd047895eb687c0cba83a Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 14:06:50 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index c594693..2b86276 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3052,7 +3052,8 @@ public class MesEnumUtil { ATTEMPT_ORDER(30, "试制工单"), BH_ORDER(40, "B&H工单"), JIT_ORDER(50, "JIT工单"), - STOCK_ORDER(60, "库存工单"); + STOCK_ORDER(60, "库存工单"), + REPAIR(70,"返修插单"); private int value; private String description; From 3654d602146cec06338c0e197807f07880c50022 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 1 Apr 2020 15:12:26 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E3=80=90bug7947=E3=80=91PLC=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=B7=A5=E6=AD=A5=E8=A3=85=E9=98=9F=E5=88=97=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 0aef82a..d1e1299 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -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 dataMap; + private Map dataMap=new HashMap<>(); @ApiParam("流程状态集合") private List routeStatusList; From 83d7a618bf59d91d71f585c9a63f243b72c0a968 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 18:05:05 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6model?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java index 5553485..257d5ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java @@ -20,6 +20,9 @@ public class ButtonComponentResultModel { @ApiParam("成功信号") private boolean isSuccess; + @ApiParam("是否跳过工序") + private boolean isJumpProcess; + @ApiParam("提示信息") private String msg; From 8c4cb0748b2b33f042659f8817b592eb0897669b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 1 Apr 2020 20:29:23 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901483=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E6=96=B0=E5=A2=9E=E6=8B=89=E5=8A=A8=E8=A7=84?= =?UTF-8?q?=E5=88=99=E8=A1=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901484=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E7=89=A9=E6=96=99=E8=A1=A8=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901485=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901486?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E5=AD=98=E5=82=A8=E5=8C=BA=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901487?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=901488=E3=80=91=EF=BC=9ALES-=E6=8B=89=E5=8A=A8=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901489=E3=80=91=EF=BC=9ALES-=E5=85=A5=E5=9C=BA?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E7=AA=97=E5=8F=A3=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=A1=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901490=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E5=B7=A1=E7=BA=BF=E6=8B=89=E5=8A=A8=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901491=E3=80=91=EF=BC=9ALES-=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901492=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E8=BF=87=E7=82=B9=E6=8B=89=E5=8A=A8=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901493=E3=80=91=EF=BC=9ALES-=E6=89=8B=E5=B7=A5?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901494=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E9=A2=84=E7=95=99=E5=A4=96=E9=83=A8=E6=8B=89?= =?UTF-8?q?=E5=8A=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 6e21241..7ccc46c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -115,6 +115,10 @@ public class WmsASNMaster extends BaseBean { @ApiParam("备注") public String remark; + @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") + @ApiParam("道口") + public String dock; + @Transient @ApiParam("供应商电话") private String vendorCall; From 3529d1b8451401a3ed44edd5c5458b08cc720e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 1 Apr 2020 20:30:46 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=A7=84=E5=88=99=E8=8C=83=E5=9B=B4=E5=92=8C=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 69 +++++++++++++--------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0fde085..fc12b72 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -5357,18 +5357,18 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RULE { - IS_SAME_CUSTOMER("同客户", "isSameCustomer", 2, 10), - IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", 1, 10), - IS_SAME_PRIORITY("同优先级", "isSamePriority", 1, 10), - IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", 2, 10), - IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", 2, 10), - IS_SAME_PART("同物料", "isSamePart", 2, 10), - IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", 2, 10), - IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", 2, 10), - IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", 1, 10), - IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", 1, 10), - IS_CROSS_AREA("允许跨区", "isCrossArea", 2, 10), - IS_COLLECTION("物料整箱归集", "isCollection", 2, 10); + IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10), + IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10), + IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10), + IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10), + IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10), + IS_SAME_PART("同物料", "isSamePart", "2", 10), + IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10), + IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10), + IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10), + IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10), + IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10), + IS_COLLECTION("物料整箱归集", "isCollection", "2", 10); private String chName; @@ -5376,12 +5376,12 @@ public class WmsEnumUtil { private int waveMergeType; - private int value; + private String fieldValue; - WAVE_MERGE_RULE(String chName, String enName, int value, int waveMergeType) { + WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { this.chName = chName; this.enName = enName; - this.value = value; + this.fieldValue = fieldValue; this.waveMergeType = waveMergeType; } @@ -5393,8 +5393,8 @@ public class WmsEnumUtil { return enName; } - public int getValue() { - return value; + public String getFieldValue() { + return fieldValue; } public int getWaveMergeType() { @@ -5408,23 +5408,29 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", - "custNo, custName", "custNo, custName", "custNo", 20), + "custNo, custName", "custNo, custName", "custNo", + 20, ""), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", - "code, name", "code, name", "code", 20), + "code, name", "code, name", "code", + 20, ""), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", - "", "", 20), + "", "", 20, ""), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + "zoneNo, zoneName", "zoneNo", "zoneNo", + 20, ""), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + "zoneNo, zoneName", "zoneNo", "zoneNo", + 20, ""), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", - "partNo, partName", "partNo", "partNo", 20), - PART_GROUP_NO("物料组代码", "partGroupNo", "", "", - "", "", 20), + "partNo, partName", "partNo", "partNo", + 20, ""), + PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", + "partGroupNo, partGroupName", "partGroupNo", + "partGroupNo", 20, ""), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", - "", "", 20), + "", "", 20, ""), ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "", - "", "", 20); + "", "", 20, ""); // 中文名称 String chName; @@ -5441,8 +5447,10 @@ public class WmsEnumUtil { // 合并操作类型 private int waveMergeType; + private String fieldValue; + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, - String searchColumnName, String explicitColumnName, int waveMergeType) { + String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { this.chName = chName; this.enName = enName; this.entityName = entityName; @@ -5450,6 +5458,7 @@ public class WmsEnumUtil { this.searchColumnName = searchColumnName; this.explicitColumnName = explicitColumnName; this.waveMergeType = waveMergeType; + this.fieldValue = fieldValue; } public String getChName() { @@ -5479,6 +5488,10 @@ public class WmsEnumUtil { public int getWaveMergeType() { return waveMergeType; } + + public String getFieldValue() { + return fieldValue; + } } /** From 241ec4974ba9b524266b845dd6c0edfde8743d38 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 1 Apr 2020 23:54:54 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 12 ++++ .../i3plus/pojo/mes/model/MesQueueShipping.java | 66 +++++++++++++++++++ .../pojo/mes/model/MesQueueShippingDetail.java | 73 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 29 +++++++-- .../i3plus/pojo/mes/model/StepDispatchModel.java | 5 +- 5 files changed, 178 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index a3f4547..e641bcf 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -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; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java new file mode 100644 index 0000000..45dcf3d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java @@ -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; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java new file mode 100644 index 0000000..2e83143 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java @@ -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; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 60b7948..7b12171 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -129,16 +129,33 @@ public class QueueOrderModel implements Serializable { this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; } + 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 queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { - this.queueGroupNo = queueGroupNo; - this.groupNo = groupNo; - 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; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index bf9d485..7585012 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -18,12 +18,15 @@ public class StepDispatchModel { private String cellParamKey; + private String requestBeanKey; + private String scanInfo; - public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) { + public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) { this.stepListKey = stepListKey; this.firstScanKey = firstScanKey; this.cellParamKey = cellParamKey; + this.requestBeanKey = requestBeanKey; this.scanInfo = scanInfo; } } From dce52df770c9452d317f28331c7946af7b3b2baa Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 2 Apr 2020 00:12:43 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E7=BB=99=E5=B7=A5=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index 7585012..ec019ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -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; } } From 851bd1feecac81c16969f6a1ecc7d8685f298e2f Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 2 Apr 2020 00:48:26 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/QueueOrderModel.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 7b12171..60d0f9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -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;