迈征匹配信息提交

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -342,8 +342,8 @@ public class LiteOrderCache {
                                         liteOrderItem.setOutReelCount(liteOrderItem.getOutReelCount() + 1);
                                         liteOrderItem.setTotalOutNum(liteOrderItem.getTotalOutNum() + task.getNum());
                                         liteOrderItem.setTotalOutReelCount(liteOrderItem.getTotalOutReelCount() + 1);
-                                        liteOrderItem.setOutReel(task.getBarcode());
-                                        liteOrderItem.setPosition(task.getPosName());
+                                        liteOrderItem.setOutReelList(task.getBarcode());
+                                        liteOrderItem.setPositionList(task.getPosName());
                                         liteOrderItem = liteOrderItemManager.save(liteOrderItem);
                                     }
                                     liteOrderItems.add(liteOrderItem);
@@ -472,25 +472,27 @@ public class LiteOrderCache {
         //List<LiteOrderItem> orderItems = liteOrderItemManager.findOrderItems(cacheOrder.getId());
         for (LiteOrderItem orderItem : cacheOrder.getOrderItems()) {
             //如果已出数量大于已出盘数,则跳过
-            if (orderItem.getOutNum() > orderItem.getNeedNum()){
+            if (orderItem.getTotalOutReelCount() >= orderItem.getNeedReelCount()){
                 continue;
             }
-            orderItem.setOutNum(0);
+            //orderItem.setOutNum(0);
             orderItem.setOutReelCount(0);
             liteOrderItemManager.save(orderItem);
             //剩余未出数量
-            Float totalNum = orderItem.getNeedNum() * cacheOrder.getOrderTimes();
+            //Float totalNum = orderItem.getNeedNum() * cacheOrder.getOrderTimes();
 
-            int remainNum = totalNum.intValue() - orderItem.getOutNum();
+            //int remainNum = totalNum.intValue() - orderItem.getOutNum();
+
+            int remainReelCount = orderItem.getNeedReelCount() - orderItem.getTotalOutReelCount();
 
             //此PN未完成
-            if (remainNum > 0) {
+            if (remainReelCount > 0) {
                 if (outBom) {
                     //套料出库,设置剩余数量为1,这样就只会出一盘
-                    remainNum = 1;
+                    remainReelCount = 1;
                 }
-                int assignNum = 0;
-                while (assignNum < remainNum) {
+                int assignReelCount = 0;
+                while (assignReelCount < remainReelCount) {
                     Collection<String> excludePosIds = excludeOutPosIds();
                     String partNumber = orderItem.getPn();
 
@@ -524,7 +526,7 @@ public class LiteOrderCache {
 //                        log.error("未找到可以出库的物料[" + partNumber + "]");
                         break;
                     } else {
-                        assignNum = assignNum + pos.getBarcode().getAmount();
+                        assignReelCount = assignReelCount + 1;
                         taskReelCount = taskReelCount + 1;
                         log.info("工单[" + orderNo + "],任务数[" + taskReelCount + "]出库位置仓位【" + pos.getPosName() + "】RI=[" + pos.getBarcode().getBarcode() + "] PN=[" + partNumber + "] num:" + pos.getBarcode().getAmount());
                         DataLog task = newTask(pos);

src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrderItem.java

@@ -8,6 +8,7 @@ import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -228,7 +229,7 @@ public class LiteOrderItem extends BasePo implements Serializable ,Comparable<Li
     /**
      * 对应出库的物料
      */
-    private String outReel;
+    private List<String> outReelList;
 
 
     private String width;
@@ -237,13 +238,28 @@ public class LiteOrderItem extends BasePo implements Serializable ,Comparable<Li
     private String dia;
 
 
-    private String position;
+    private List<String> positionList;
+
+
+    public void setOutReelList(String reel) {
+        if (outReelList == null){
+            outReelList = new ArrayList<>();
+        }
+        outReelList.add(reel);
+    }
+
+    public void setPositionList(String position) {
+        if (positionList == null){
+            positionList = new ArrayList<>();
+        }
+        positionList.add(position);
+    }
 
     /**
      * 出库是否满足要求,已出库数量大于需求数量
      */
     public boolean isOutFinished(){
-        return outNum - needNum >=0;
+        return totalOutReelCount - needReelCount >=0;
     }
 
     @Override