From 143e2f1947d2dd99f1f29350fcaf62afec83e16b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 2 Nov 2020 14:07:49 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=9012057=20#20011-----=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E6=B5=81=E7=A8=8B=E6=98=AF=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=92=8Cpo=E6=94=B6=E8=B4=A7=E5=92=8Cpo?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=EF=BC=8C=E6=94=B6=E8=B4=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B5=B0=E5=AE=8C=E4=BD=86=E6=98=AF=E8=BF=98=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E9=9C=80=E8=A6=81=E8=83=BD=E5=A4=9F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=93=8D=E4=BD=9C=E5=90=8E=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E4=B8=8D=E5=85=81=E8=AE=B8=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=BE=85=E6=8F=90=E4=BA=A4=E7=9A=84=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E3=80=82=E6=9C=9F=E6=9C=9B=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=97=A5=E6=9C=9F2020/10/31=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/wms/bean/WmsMoveSn.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 22d79be..5f0f6bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -412,9 +412,10 @@ public class WmsMoveSn extends BaseBean { } - public WmsMoveSn(String sn, String refSrc, String transTypeName, Integer itemStatus) { + public WmsMoveSn(String sn, String refSrc,String transTypeCode, String transTypeName, Integer itemStatus) { this.sn = sn; this.refSrc = refSrc; + this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; this.itemStatus = itemStatus; } From 47f464b01de12c991b5b3c9573a18bd9a99e4178 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Mon, 2 Nov 2020 14:27:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 50 +++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index ad715f0..2a3156a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -107,6 +107,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "超时时间(单位:分钟)") private Integer timeOut; + @Transient + @ApiParam(value = "窗口时间") + private Integer windowTime; + + @Transient + @ApiParam(value = "紧急程度") + private String urgentStatus; + @Column(name = "SRC_NO") @ApiParam(value = "源单号") private String srcNo; @@ -123,6 +131,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "完成状态") public Integer orderStatus; + @Transient + @ApiParam(value = "客户名称") + public String custName; + + @Transient + @ApiParam(value = "道口") + public String dock; + /** * 已创建，已收货，已发运，已拣货 */ @@ -134,6 +150,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; + @Transient + @ApiParam(value = "完成数百分比") + private String number; + /** * 是否免费:0=计费,1=免费 */ @@ -285,6 +305,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("生产日期") public String dateCode; + @Transient + @ApiParam("生产线") + public String line; + @ApiParam(value = "散件移库输入移库数量") @Transient public Double inputMoveQty; @@ -420,8 +444,27 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("窗口领料结束时间") private String windowPickEndTime; - public WmsDocMovementDetails () { + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo ,Double qty,Double pickQty, + Double recQty,Double outQty,Integer itemStatus) { + this.custNo = custNo; + this.orderNo = orderNo; + this.planDate = planDate; + this.planTime = planTime; + this.qty = qty; + this.pickQty = pickQty; + this.recQty= recQty; + this.outQty = outQty; + this.itemStatus = itemStatus; + this.projectNo = projectNo; + this.partNo=partNo; + } + public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus) { + this.createDatetime = createDatetime; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.createUser = createUser; + this.itemStatus= itemStatus; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { @@ -485,6 +528,11 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } + public WmsDocMovementDetails(){ + + } + + public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo,Integer priority,String createDatetime) { this.orderNo = orderNo; this.srcZoneNo = srcZoneNo; From 11748bb19eaa160ca6970dece495856f6c5fdb62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 2 Nov 2020 15:26:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=9012066=2019048-=E5=96=B7=E6=B6=82?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E9=A2=9C=E8=89=B2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B9=E5=BC=8F=E5=8F=98=E6=9B=B4-20201024=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/bean/MesProduceSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index c14092e..a024e83 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -229,6 +229,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("维修状态") private Integer repairStatus; + @Transient + @ApiParam("颜色名称") + private String colorName; + public MesProduceSn() { } From 52c35877d81e180cd2ee6e3638bc877ef5c70631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 2 Nov 2020 18:02:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/TJMgnBoardModel.java | 12 ++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 8ded48c..b55ccd2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -47,10 +47,22 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("反喷标识") private String reverseSprayMark; + @ApiParam("班次") + private String shiftName; + + @ApiParam("车间配置代码") + private String areaConfigCode; + @ApiParam("列名") private List> headModelList; @ApiParam("列值") private List> headValueModelList; + @ApiParam("不良汇总列名") + private List defectNameList; + + @ApiParam("不良汇总列值") + private List defectValueList; + } 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 08e4739..bd6bf3d 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 @@ -3501,4 +3501,25 @@ public class MesHqlPack { } return packBean; } + + /** + * MES下线报工查询条件封装 + * + * @param productOffLine + * @return + */ + public static DdlPackBean getIfProductOffLine(IfProductOffLine productOffLine) { + DdlPackBean packBean = getAllBaseDataByNormalPro(productOffLine, productOffLine.getOrganizeCode()); + if (!StringUtils.isEmpty(productOffLine.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(productOffLine.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(productOffLine.getPartNo())) { + DdlPreparedPack.getStringLikerPack(productOffLine.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(productOffLine.getCreateDateTimeStart()) || !StringUtils.isEmpty(productOffLine.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(productOffLine.getCreateDateTimeStart(), productOffLine.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } } From f38e41f1ec4b7382390c9e962d9d9d11f68636c5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 2 Nov 2020 18:54:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= 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 | 4 +++- 1 file changed, 3 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 d328625..7188498 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 @@ -5347,7 +5347,9 @@ public class MesEnumUtil { BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"), - BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"); + BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"), + BOARD_MGN_BJ_MAIN_SCREEN("BOARD_MGN_BJ_MAIN_SCREEN", "北京麦格纳总屏幕看板"), + BOARD_MGN_BJ_EQU_REPAIR("BOARD_MGN_BJ_EQU_REPAIR", "北京麦格纳设备维修看板"); private String code; private String description;