diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index f4011bf..91742c4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -645,7 +645,8 @@ public class WmsEnumUtil { KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), - KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"); + KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"), + PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"); private int value; private String code; @@ -960,6 +961,7 @@ public class WmsEnumUtil { /** * 业务表：库存条码状态 + * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_STATUS { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java index b582621..984b9bf 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ b/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; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index ae64067..5ebbca0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/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,29 +31,17 @@ 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 = "FILE_ID") + @ApiParam("文件id") + private Long fileId; - @Column(name = "PICTURE_NAME") - @ApiParam("图片名称") - private String pictureName; - - @Column(name = "FILE_SIZE") - @ApiParam("FILE_SIZE") - private String fileSize; - - @Column(name = "FILE_TYPE_ID") - @ApiParam("FILE_TYPE_ID") - private String fileTypeId; - - @Column(name = "FILE_TYPE_NAME") - @ApiParam("FILE_TYPE_NAME") - private String fileTypeName; + @Transient + @ApiParam("文件名称") + private String fileName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProduceCtgyPictureModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProduceCtgyPictureModel.java new file mode 100644 index 0000000..ae4142d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProduceCtgyPictureModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\4 16:44 + * @Modify: + **/ +@Data +public class ProduceCtgyPictureModel { + + private Long id; + private String createUser; + private String createDatetime; + private String modifyUser; + private String modifyDatetime; + private String organizeCode; + private Integer isValid; + private Integer isDeleted; + + @ApiParam("产品类型代码") + private String produceCtgyCode; + + @ApiParam("面位") + private String sideLocation; + + @ApiParam("文件id") + private Long fileId; + + @ApiParam("文件原名称") + private String fileOriginName; + @ApiParam("文件URL") + private String fileUrl; + @ApiParam("组名") + private String groupName; + + public ProduceCtgyPictureModel() { + } + + 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; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.produceCtgyCode = produceCtgyCode; + this.sideLocation = sideLocation; + this.fileId = fileId; + this.fileOriginName = fileOriginName; + this.fileUrl = fileUrl; + this.groupName = groupName; + } +} 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 a79ca12..6f6a532 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 @@ -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