From f1715db6644f4228eee37a57f48fb75b2c90b9fd Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 11 Sep 2020 11:37:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Finish=20Task=20#2184=20Cost:8h=202184=2006?= =?UTF-8?q?=201.2.3.7.1=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BF=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/MesPPMasterModel.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java new file mode 100644 index 0000000..7a612b3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.wms; + + +import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 生产领料计划 + * @Reference : + * @Author : puxiao + * @CreateDate : 2020-09-10 19:50 + * @Modify: + **/ +@Data +public class MesPPMasterModel { + + @ApiParam("生产计划主数据") + private MesPpMaster mesPpMaster; + + @ApiParam("生产计划明细数据") + private List mesPpDetailsList; +} From b978fa390c61e9d3902014278ea8d4c1a902ce86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 11 Sep 2020 12:03:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E6=B6=82=E8=A3=85=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=E5=92=8C=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) 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 0333bea..3e688fc 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 @@ -161,6 +161,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean); + } if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); }