修改基础模块:炉子图片由与位置绑定改为与模式绑定

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;

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;
 }

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) {
+    public static DdlPackBean getPartFurnace(MesPartFurnace partFurnace) {
-        DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode());
+        DdlPackBean packBean = getAllBaseData(partFurnace.getOrganizeCode());
-        DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean);
+        DdlPreparedPack.getStringLikerPack(partFurnace.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean);
+        DdlPreparedPack.getStringLikerPack(partFurnace.getModelNo(), "modelNo", packBean);
-        DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(partFurnace.getIsValid(), "isValid", packBean);
         return packBean;
     }