【14681 19108+ PCN->容器绑定单件条码工位,当前容器号无显示+2021-03-25】

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

@@ -146,6 +146,14 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("版本号")
     private String versionNo;
 
+    @Column(name = "VARIANT")
+    @ApiParam("variant")
+    private String variant;
+
+    @Column(name = "PACK_MOTH")
+    @ApiParam("packmoth")
+    private String packMoth;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description: 特殊物料
+ * @Author: jokelin
+ * @Date: 2021/3/24 3:10 PM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_PART_CAR_MODEL")
+@Api("车型零件关系表")
+public class MesPartCarModel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4039513102671811231L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("零件名称")
+    private String partNameRdd;
+
+    @Column(name = "VEHICLE_CODE")
+    @ApiParam("车型代码")
+    private String vehicleCode;
+
+    @Column(name = "VEHICLE_NAME")
+    @ApiParam("车型名称")
+    private String vehicleName;
+
+    @Column(name = "SERIAL_NO")
+    @ApiParam("车型流水号")
+    private String serialNo;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCarModelRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartCarModel;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/24 3:13 PM
+ * @Modify:
+ */
+public interface MesPartCarModelRepository extends BaseRepository<MesPartCarModel, Long> {
+}

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

@@ -3791,4 +3791,12 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesPartCarModel(MesPartCarModel mesPartCarModel) {
+        DdlPackBean packBean = getAllBaseData(mesPartCarModel.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesPartCarModel.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPartCarModel.getVehicleCode(), "vehicleCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPartCarModel.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }