计算逻辑提交

src/main/java/com/neotel/webbox/capacity/box/Box.java

@@ -40,6 +40,8 @@ public class Box {
 
 
         Column column = new Column(validColumnHeight);
         Column column = new Column(validColumnHeight);
         box.setColumn(column);
         box.setColumn(column);
+
+        box.setColumnCount(boxData.getColumnCount());
         return box;
         return box;
     }
     }
 
 

src/main/java/com/neotel/webbox/capacity/method/AssignMethod2.java

@@ -33,8 +33,14 @@ public class AssignMethod2 extends BasicMethod{
             ReelData rd = requestItem.getReelData();
             ReelData rd = requestItem.getReelData();
             //纯放此料盘料仓容量
             //纯放此料盘料仓容量
             int pureBoxCapacity = boxData.getBoxPureSizeCapacity(requestItem.getReelData());
             int pureBoxCapacity = boxData.getBoxPureSizeCapacity(requestItem.getReelData());
-            int pureBoxCount = requestItem.getNum()/pureBoxCapacity;
-            int remainNum = requestItem.getNum() % pureBoxCapacity;
+
+            Float rate = 1.0f * requestItem.getNum()/pureBoxCapacity;
+            int boxCount = rate.intValue();
+            if(rate - boxCount > 0.85){
+                boxCount = boxCount + 1;
+            }
+            int pureBoxCount = boxCount;
+            int remainNum = requestItem.getNum() - pureBoxCount * pureBoxCapacity;
             requestItem.setPureBoxCount(pureBoxCount);
             requestItem.setPureBoxCount(pureBoxCount);
             requestItem.setRemainNum(remainNum);
             requestItem.setRemainNum(remainNum);
             log.info("料盘["+rd.getReelSizeStr()+"]总需求:"+requestItem.getNum()+"需要纯料仓"+ pureBoxCount+"个,每个料仓可放:"+pureBoxCapacity+"盘,剩余:"+ remainNum+"盘需要放到混合仓");
             log.info("料盘["+rd.getReelSizeStr()+"]总需求:"+requestItem.getNum()+"需要纯料仓"+ pureBoxCount+"个,每个料仓可放:"+pureBoxCapacity+"盘,剩余:"+ remainNum+"盘需要放到混合仓");

src/main/java/com/neotel/webbox/capacity/method/BasicMethod.java

@@ -36,6 +36,29 @@ public class BasicMethod {
         return new SlotUnit(reelData,validReelCount);
         return new SlotUnit(reelData,validReelCount);
     }
     }
 
 
+
+    protected static SlotUnit getFixValidSlotUnit(int requestReelCount, ReelData reelData, int validHeight){
+        if(requestReelCount <=0){
+            return null;
+        }
+        //剩余空间可放多少层料格
+        int slotCount = validHeight/reelData.getReelSlotHeight();
+        if(slotCount < reelData.getMinUnit()){
+            slotCount = reelData.getMinUnit();
+        }
+        int validReelCount = slotCount;
+        if(reelData.is7Reel()){
+            validReelCount = validReelCount * 2;
+        }
+
+        if(validReelCount >= requestReelCount){
+            //可以全部放下
+            return new SlotUnit(reelData,requestReelCount);
+        }
+        //只可以放下部分
+        return new SlotUnit(reelData,validReelCount);
+    }
+
     protected static int fillToColumn(Column column, int remainCount, ReelData reelData){
     protected static int fillToColumn(Column column, int remainCount, ReelData reelData){
         if(remainCount > 0 || remainCount == -1){
         if(remainCount > 0 || remainCount == -1){
             //剩余空间可放多少层料格
             //剩余空间可放多少层料格

src/main/resources/static/calculation.html

@@ -128,7 +128,7 @@
         methods: {
         methods: {
             // 获取表格数据
             // 获取表格数据
             getList() {
             getList() {
-                axios.get('/baseData', {
+                axios.get('/box/baseData', {
                 })
                 })
                     .then(res => {
                     .then(res => {
                         this.typeOptions = res.data.data.boxDataList
                         this.typeOptions = res.data.data.boxDataList
@@ -233,7 +233,7 @@
                 }
                 }
                 let data = Object.assign(query, newArr)
                 let data = Object.assign(query, newArr)
                 axios
                 axios
-                    .post('/capacity',
+                    .post('/box/capacity',
                         data
                         data
                         // data:JSON.stringify(Object.assign(query, newArr))
                         // data:JSON.stringify(Object.assign(query, newArr))
                     )
                     )