【10828 19048-10827-预装作业界面优化！-2020-08-25】

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

@@ -1970,7 +1970,9 @@ public class MesEnumUtil {
         BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"),
         BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"),
         MES_PROD_WORK_CENTER(530, "prodWorkCenterExcelService", "产品工作中心配置导入"),
-        MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入");
+        MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"),
+        MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"),
+        MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入");
 
         private int value;
         private String service;

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

@@ -55,7 +55,15 @@ public class MesLocation extends BaseBean implements Serializable {
     @ApiParam("最大存储量")
     private Integer maxQty = 0;
 
+    @Column(name = "IS_SMALL_SIZE")
+    @ApiParam("是否小尺寸物料")
+    private Integer isSmallSize = 1;
+
     @Transient
     @ApiParam("物料名称")
     private String partNameRdd;
+
+    @Transient
+    @ApiParam("包装编号集合")
+    private String packageNoList;
 }

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

@@ -120,6 +120,10 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("打磨件物料号")
     private String prePartNo;
 
+    @Column(name = "IS_SMALL_SIZE")
+    @ApiParam("是否小尺寸物料")
+    private Integer isSmallSize = 1;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -3267,4 +3267,12 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesLocation(MesLocation mesLocation) {
+        DdlPackBean packBean = getAllBaseData(mesLocation.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesLocation.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesLocation.getLocationCode(), "locationCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesLocation.getLocationName(), "locationName", packBean);
+        return packBean;
+    }
 }