Finish Task #2098 Cost:8h

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

@@ -0,0 +1,39 @@
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/7 15:20
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SUB_PART")
+@Api("数据同步死信")
+public class MesSubPart extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4636507477301700549L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "SUB_PART_NO")
+    @ApiParam("替代料")
+    private String subPartNo;
+
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesSubPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/7 15:23
+ * @desc
+ */
+@Repository
+public interface MesSubPartRepository extends BaseRepository<MesSubPart, Long> {
+}

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

@@ -113,16 +113,16 @@ public class MesPcnHqlPack {
      * 获取原材料扫描信息的对应工序BOM
      *
      * @param stationBom
-     * @param rawPartSn
+     * @param rawPartNo
      * @return
      */
-    public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) {
+    public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) {
         DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean);
-        DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean);
         return packBean;
     }
 
@@ -316,6 +316,7 @@ public class MesPcnHqlPack {
 
     /**
      * 按条件分页查询产品条码补打印数据
+     *
      * @param mesProduceSn
      * @return
      */
@@ -355,6 +356,7 @@ public class MesPcnHqlPack {
 
     /**
      * 按条件分页查询包装条码补打印数据
+     *
      * @param mesPackage
      * @return
      */
@@ -417,9 +419,9 @@ public class MesPcnHqlPack {
     }
 
 
-
     /**
      * 按条件分页查询类型信息数据
+     *
      * @param typeCfg
      * @return
      */