元器件字段修改：截料设置盘数，安全库存盘数，补充盘数限制。

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -237,7 +237,7 @@ public class DataInitManager {
 
 
 
-        Menu orderM = Menu.CreatePMenu("工单管理", 20, "orderManager", 2, "workOrder");
+        Menu orderM = Menu.CreatePMenu("工单管理", 20, "orderManager", 2, "orderManager");
         Menu menuOrder = new Menu(new ArrayList<Menu>(), 1, "billworkOrder", "工单", 1, "billworkOrder", "neolight/billworkOrder/index", "", 0, "orderOut");
         Menu reelOut = new Menu(new ArrayList<Menu>(), 1, "reelOut", "工单料盘出库", 1, "reelOut", "system/reelOut/index", "", 0, "swagger");
         Menu orderSheetMenu = new Menu(new ArrayList<Menu>(), 1, "orderSheet", "工单合单", 1, "orderSheet", "system/orderSheet/index", "", 0, "orderSheet");

src/main/java/com/neotel/smfcore/core/barcode/rest/ComponentController.java

@@ -211,9 +211,9 @@ public class ComponentController {
         try {
             List<Map<String, Object>> maps = new ArrayList<>();
             List<String> titles = new ArrayList<>();
-//            String[] titleArray = new String[]{"料件编号" , "数量", "尺寸", "高度", "物料间距", "最小库存", "安全库存"
+//            String[] titleArray = new String[]{"料件编号" , "数量", "尺寸", "高度", "物料间距", "截料设置盘数", "安全库存盘数","补充盘数上限"
 //                    , "呆滞天数", "整盘比", "散盘比", "描述"};
-            String[] titleArray = new String[]{"materialNo" , "amount", "plateSize", "height", "distance", "minStoreNum", "safetyStoreNum"
+            String[] titleArray = new String[]{"materialNo" , "amount", "plateSize", "height", "distance", "minStoreNum", "safetyStoreNum","maxStoreNum"
                     , "sluggishDay", "wholeReel", "halfReel", "description"};
 
             for (String title :
@@ -232,6 +232,7 @@ public class ComponentController {
                 map.put("minStoreNum", "");
 
                 map.put("safetyStoreNum", "");
+                map.put("maxStoreNum","");
                 map.put("sluggishDay", "");
                 map.put("wholeReel", "");
                 map.put("halfReel", "");
@@ -260,7 +261,7 @@ public class ComponentController {
 
         List<Component> items = new ArrayList<>();
         try {
-            String[] titleArray = new String[]{"料件编号", "数量", "尺寸", "高度", "物料间距", "最小库存", "安全库存"
+            String[] titleArray = new String[]{"料件编号", "数量", "尺寸", "高度", "物料间距", "截料设置盘数", "安全库存盘数","补充最大盘数"
                     , "呆滞天数", "整盘", "散盘", "描述"};
             CsvReader csvRead = CsvReader.newReader(fileUrl, "料件编号", "materialNo");
             int partNumberIndex = csvRead.getIndex("料件编号", "materialNo");
@@ -268,8 +269,9 @@ public class ComponentController {
             int plateSizeIndex = csvRead.getIndex("尺寸", "plateSize");
             int heightIndex = csvRead.getIndex("高度", "height");
             int distanceIndex = csvRead.getIndex("物料间距", "distance");
-            int minStoreNumIndex = csvRead.getIndex("最小库存", "minStoreNum");
-            int safetyStoreNumIndex = csvRead.getIndex("安全库存", "safetyStoreNum");
+            int minStoreNumIndex = csvRead.getIndex("截料设置盘数", "minStoreNum");
+            int safetyStoreNumIndex = csvRead.getIndex("安全库存盘数", "safetyStoreNum");
+            int maxStoreNumIndex=csvRead.getIndex("补充最大盘数","maxStoreNum");
             int sluggishDayIndex = csvRead.getIndex("呆滞天数", "sluggishDay");
             int wholeReelIndex = csvRead.getIndex("整盘", "wholeReel");
             int halfReelIndex = csvRead.getIndex("散盘", "halfReel");
@@ -299,6 +301,7 @@ public class ComponentController {
                     item.setDistance(getIntValue(lineValues, distanceIndex, item.getDistance()));
                     item.setMinStoreNum(getIntValue(lineValues, minStoreNumIndex, item.getMinStoreNum()));
                     item.setSafetyStoreNum(getIntValue(lineValues, safetyStoreNumIndex, item.getSafetyStoreNum()));
+                    item.setMaxStoreNum(getIntValue(lineValues,maxStoreNumIndex,item.getMaxStoreNum()));
                     item.setSluggishDay(getIntValue(lineValues, sluggishDayIndex, item.getSluggishDay()));
                     item.setWholeReel(getIntValue(lineValues, wholeReelIndex, item.getWholeReel()));
                     item.setHalfReel(getIntValue(lineValues, halfReelIndex, item.getHalfReel()));

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/ComponentDto.java

@@ -150,13 +150,13 @@ public class ComponentDto implements Serializable {
     @ApiModelProperty("尺寸是否已经确认")
     private boolean sizeConfirmed = false;
 
-    @ApiModelProperty("最大库存")
+    @ApiModelProperty("补充盘数上限")
     private int maxStoreNum = 999999999;
 
-    @ApiModelProperty("最小库存")
+    @ApiModelProperty("截料设置盘数")
     private int minStoreNum = 0;
 
-    @ApiModelProperty("安全库存")
+    @ApiModelProperty("安全库存盘数")
     private int safetyStoreNum=0;
 
     @ApiModelProperty("呆滞天数，默认0无需处理")

src/main/java/com/neotel/smfcore/core/barcode/service/manager/impl/ComponentManagerImpl.java

@@ -175,14 +175,14 @@ public class ComponentManagerImpl implements IComponentManager {
         //判断最大库存和最小库存
         if(resources.getMinStoreNum()>0  )
         {
-            if(resources.getMaxStoreNum()==0){
-                resources.setMaxStoreNum(999999999);
-            }
-            if(resources.getMinStoreNum()<=resources.getSafetyStoreNum()&& resources.getSafetyStoreNum()<=resources.getMaxStoreNum()){
-
-            }else{
-                throw new ValidateException("smfcore.component.storeError","请输入正确的库存，最小库存<=安全库存<=最大库存" );
-            }
+//            if(resources.getMaxStoreNum()==0){
+//                resources.setMaxStoreNum(999999999);
+//            }
+//            if(resources.getMinStoreNum()<=resources.getSafetyStoreNum()&& resources.getSafetyStoreNum()<=resources.getMaxStoreNum()){
+//
+//            }else{
+//                throw new ValidateException("smfcore.component.storeError","请输入正确的库存，最小库存<=安全库存<=最大库存" );
+//            }
         }
         if(resources.getProvider()==null){
             resources.setProvider("");

src/main/java/com/neotel/smfcore/core/barcode/service/po/Component.java

@@ -123,15 +123,15 @@ public class Component extends BasePo implements Serializable {
     private boolean sizeConfirmed = false;
 
     /**
-     * 最大库存 盘数
+     * 补充上限 盘数
      */
     private int maxStoreNum = 999999999;
     /**
-     * 最小库存 盘数
+     * 截料设定  盘数
      */
     private int minStoreNum = 0;
     /**
-     *安全库存
+     *安全库存 盘数
      */
     private int safetyStoreNum=0;
     /**

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialStockController.java

@@ -179,6 +179,10 @@ public class MaterialStockController {
 //                    int needReel = com.getMinStoreNum() / dto.getAmount();
 //                    dto.setSupplementReel(needReel);
 //                }
+                int suppleReel=com.getSafetyStoreNum() - dto.getStockReel();
+                if(suppleReel>com.getMaxStoreNum()){
+                    suppleReel=com.getMaxStoreNum();
+                }
                 dto.setSupplementReel(com.getSafetyStoreNum() - dto.getStockReel());
             }
             if (needSupplement) {