From 0cec15c1bad57df51a22cb307161910ad61e4768 Mon Sep 17 00:00:00 2001
From: Dominic_Xiao <1003069915@qq.com>
Date: Tue, 29 Dec 2020 17:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97:=E7=82=89=E5=AD=90=E5=9B=BE=E7=89=87=E7=94=B1?=
 =?UTF-8?q?=E4=B8=8E=E4=BD=8D=E7=BD=AE=E7=BB=91=E5=AE=9A=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8E=E6=A8=A1=E5=BC=8F=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java   |  4 ----
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java  |  4 ++++
 .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java   | 13 +++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java
index dd6e895..e5c4ae0 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java
@@ -42,10 +42,6 @@ public class MesFurnaceLocation extends BaseBean implements Serializable {
     @ApiParam("炉内位置代码")
     private String fnLocationNo;
 
-    @Column(name = "MODEL_IMG_URL")
-    @ApiParam("模式图片路径")
-    private String modelImgUrl;
-
     @Column(name = "SEQ")
     @ApiParam("推荐顺序")
     private Integer seq;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java
index 8053275..560d696 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java
@@ -40,4 +40,8 @@ public class MesPartFurnace extends BaseBean implements Serializable {
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
     private String partNo;
+
+    @Column(name = "MODEL_IMG_URL")
+    @ApiParam("模式图片路径")
+    private String modelImgUrl;
 }
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 1346c2f..821f273 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
@@ -2784,7 +2784,8 @@ public class MesHqlPack {
      * @return
      */
     public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) {
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());;
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());
+        ;
         if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
         }
@@ -3627,11 +3628,11 @@ public class MesHqlPack {
         return packBean;
     }
 
-    public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) {
-        DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode());
-        DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean);
-        DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean);
-        DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean);
+    public static DdlPackBean getPartFurnace(MesPartFurnace partFurnace) {
+        DdlPackBean packBean = getAllBaseData(partFurnace.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(partFurnace.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(partFurnace.getModelNo(), "modelNo", packBean);
+        DdlPreparedPack.getNumEqualPack(partFurnace.getIsValid(), "isValid", packBean);
         return packBean;
     }