odn出货,新功能提交

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

@@ -243,6 +243,7 @@ public class DataInitManager {
         addNewFunctionMenu(2, wip, "bindCarton", "人工绑定", "bindCarton", "SemiFinishProducts/bindCarton/index", "bCarton", functionMenuMap);
 
         addNewFunctionMenu(3, wip, "Shipment", "ODN出货", "Shipment", "SemiFinishProducts/Shipment/index", "Shipment", functionMenuMap);
+        addNewFunctionMenu(3, wip, "odnOut", "ODN出货(新)", "odnOut", "neolight/odnOut/index", "odnOut", functionMenuMap);
 
         addNewFunctionMenu(4, wip, "requisition", "261&931领用", "requisition", "SemiFinishProducts/requisition/index", "requisition", functionMenuMap);
 
@@ -255,7 +256,7 @@ public class DataInitManager {
         addNewFunctionMenu(10, wip, "restoreRebox", "ODN还原补箱", "restoreRebox", "SemiFinishProducts/restoreRebox/index", "restoreRebox", functionMenuMap);
         addNewFunctionMenu(11, wip, "manualTransfer", "手动储位转移", "manualTransfer", "manualTransfer/index", "manualTransfer", functionMenuMap);
 
-        addNewFunctionMenu(12, wip, "pickBox", "出货计算", "pickBox", "SemiFinishProducts/pickBox/index", "", functionMenuMap);
+        addNewFunctionMenu(12, wip, "pickBox", "出货计算", "pickBox", "SemiFinishProducts/pickBox/index", "pickBox", functionMenuMap);
         addNewFunctionMenu(13, wip, "checkCarton", "核验绑定信息", "checkCarton", "checkCarton/index", "checkCarton", functionMenuMap);
 
 

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

@@ -45,6 +45,7 @@ import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.LiteorderCheckType;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.TaskCurrentLoc;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BinCacheUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util.CalculateUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util.TaskLocUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1594,7 +1595,7 @@ public class LiteOrderCache {
                     throw new ValidateException("", "料号:" + pn + ",库别:" + warehouseCode + "未找到可用出库的物料");
                 }
 
-                List<StoragePos> targetPos = findTargetPos(posList, remainNum);
+                List<StoragePos> targetPos = CalculateUtil.findCombinationsByPos(posList, remainNum);
                 if (targetPos == null || targetPos.isEmpty()) {
                     throw new ValidateException("", "料号:" + pn + ",库别:" + warehouseCode + "未找到符合出库的组合");
                 }

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

@@ -401,6 +401,8 @@ public class LiteOrderItem extends BasePo implements Serializable ,Comparable<Li
 
     private String moveType;
 
+    private List<Barcode> needOutBarcodeList;
+
     public void setOutReelList(String reel) {
         if (outReelList == null){
             outReelList = new ArrayList<>();

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/util/CalculateUtil.java

@@ -24,8 +24,8 @@ public class CalculateUtil {
         for (StoragePos pos : storagePosList) {
             Map<Integer, List<StoragePos>> temp = new HashMap<>(sumCounts); // 复制当前的和值映射，避免在迭代过程中修改
             for (Map.Entry<Integer, List<StoragePos>> entry : temp.entrySet()) {
-                if (System.currentTimeMillis() - now >= 1000 * 60) {
-                    log.info(target+"计算超过一分钟,退出");
+                if (System.currentTimeMillis() - now >= 1000 * 20) {
+                    log.info(target+"计算超过20s,退出");
                     return new ArrayList<>();
                 }