【任务：1287】

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -30,41 +31,24 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCategoryCode;
+    private String produceCtgyCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name = "PICTURE_URL")
-    @ApiParam("图片URL")
-    private String pictureUrl;
-
-    @Column(name = "PICTURE_NAME")
-    @ApiParam("图片名称")
-    private String pictureName;
-
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
-    private String fileSize;
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private Long fileId;
 
-    @Column(name = "FILE_TYPE_ID")
-    @ApiParam("FILE_TYPE_ID")
-    private String fileTypeId;
+    @Transient
+    @ApiParam("文件名称")
+    private String fileName;
 
-    @Column(name = "FILE_TYPE_NAME")
-    @ApiParam("FILE_TYPE_NAME")
-    private String fileTypeName;
+    @Transient
+    @ApiParam("文件URL")
+    private String fileUrl;
 
-    @Column(name = "SOP_NAME")
-    @ApiParam("SOP名称")
-    private String sopName;
-
-    @Column(name = "GROUP_NAME")
-    @ApiParam("GROUP_NAME")
-    private String groupName;
-
-    @Column(name = "SYNC_TAG")
-    @ApiParam("SYNC_TAG")
-    private Integer syncTag = 0;
+    @ApiParam("图片URL")
+    private String pictureUrl;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProduceCtgyPictureModel.java

@@ -1,14 +1,16 @@
-package cn.estsh.i3plus.pojo.mes.pcn.model;
+package cn.estsh.i3plus.pojo.mes.model;
 
 import io.swagger.annotations.ApiParam;
+import lombok.Data;
 
 /**
  * @Description:
  * @Reference:
  * @Author: joke.wang
- * @CreateDate: 2019\12\4 17:10
+ * @CreateDate: 2019\12\4 16:44
  * @Modify:
  **/
+@Data
 public class ProduceCtgyPictureModel {
 
     private Long id;
@@ -21,7 +23,7 @@ public class ProduceCtgyPictureModel {
     private Integer isDeleted;
 
     @ApiParam("产品类型代码")
-    private String produceCategoryCode;
+    private String produceCtgyCode;
 
     @ApiParam("面位")
     private String sideLocation;
@@ -29,8 +31,8 @@ public class ProduceCtgyPictureModel {
     @ApiParam("文件id")
     private Long fileId;
 
-    @ApiParam("文件名称")
-    private String fileName;
+    @ApiParam("文件原名称")
+    private String fileOriginName;
     @ApiParam("文件URL")
     private String fileUrl;
     @ApiParam("组名")
@@ -39,7 +41,7 @@ public class ProduceCtgyPictureModel {
     public ProduceCtgyPictureModel() {
     }
 
-    public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCategoryCode, String sideLocation, Long fileId, String fileName, String fileUrl, String groupName) {
+    public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCtgyCode, String sideLocation, Long fileId, String fileOriginName, String fileUrl, String groupName) {
         this.id = id;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
@@ -48,10 +50,10 @@ public class ProduceCtgyPictureModel {
         this.organizeCode = organizeCode;
         this.isValid = isValid;
         this.isDeleted = isDeleted;
-        this.produceCategoryCode = produceCategoryCode;
+        this.produceCtgyCode = produceCtgyCode;
         this.sideLocation = sideLocation;
         this.fileId = fileId;
-        this.fileName = fileName;
+        this.fileOriginName = fileOriginName;
         this.fileUrl = fileUrl;
         this.groupName = groupName;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1421,28 +1421,6 @@ public class MesHqlPack {
     }
 
     /**
-     * MES 产品类型图片查询条件封装
-     *
-     * @param mesProduceCtgyPicture
-     * @param organizeCode
-     * @return
-     */
-    public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode);
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean);
-        }
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean);
-        }
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getSideLocation())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getSideLocation(), "sideLocation", packBean);
-        }
-        return packBean;
-    }
-
-
-    /**
      * 设备通知对象配置 查询条件封装
      *
      * @param mesEquNotifyObjectCfg