解决冲突

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

@@ -119,13 +119,13 @@ public class MesPcnHqlPack {
      * @param rawPartSn
      * @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;
     }