Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -1973,7 +1973,8 @@ public class MesEnumUtil {
         MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"),
         MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"),
         MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"),
-        MES_LOCATION(570, "locationExcelService", "库位信息导入");
+        MES_LOCATION(570, "locationExcelService", "库位信息导入"),
+        MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入");
 
         private int value;
         private String service;

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

@@ -36,4 +36,7 @@ public class MesSubPart extends BaseBean implements Serializable {
     @ApiParam("替代料")
     private String subPartNo;
 
+    @Column(name = "SUB_FLAG")
+    @ApiParam("替代料标识")
+    private String subFlag;
 }

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

@@ -161,6 +161,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }
+        if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean);
+        }
         if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
         }
@@ -3327,4 +3330,13 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesSubPart(MesSubPart mesSubPart) {
+        DdlPackBean packBean = getAllBaseData(mesSubPart.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesSubPart.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesSubPart.getSubPartNo(), "subPartNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesSubPart.getSubFlag(), "subFlag", packBean);
+        DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }