From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档，新增了几个字段需要加入到组托档中，不额外加字段 2.针对7.11接口文档，对outOrder方法进行重写，batchSeq在wrkMast表中新增一个字段放，entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档，上报时加上orderId出库单号 4.针对7.9接口文档，wcs会先请求wms，只需要palletId托盘码，errorMsg错误信息；wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档，ERP先按照这个文档发给wms，wms再发给wcs，发给wcs这块先不写
---
src/main/java/com/zy/asrs/utils/OptimizedLockerPacking3Utils.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OptimizedLockerPacking3Utils.java b/src/main/java/com/zy/asrs/utils/OptimizedLockerPacking3Utils.java
index c7f12dd..e1884f0 100644
--- a/src/main/java/com/zy/asrs/utils/OptimizedLockerPacking3Utils.java
+++ b/src/main/java/com/zy/asrs/utils/OptimizedLockerPacking3Utils.java
@@ -7,6 +7,8 @@
public class OptimizedLockerPacking3Utils {
+ private static int signC = 0;
+
public static class Item {
String name;
double unitSpace;
@@ -445,6 +447,7 @@
double targetUtilization,
List<RemainderItem> current,
List<RemainderItem> bestCombination, double[] bestDiff) {
+ signC++;
// 妫�鏌ュ綋鍓嶇粍鍚堢殑鏈夋晥鎬�
if (!current.isEmpty()) {
double diff = Math.abs(currentSpace - targetUtilization);
@@ -468,8 +471,10 @@
RemainderItem currentItem = items.get(index);
// 涓嶉�夋嫨褰撳墠鐗╁搧
- validDfsCombination(items, index + 1, currentSpace, targetUtilization,
- current, bestCombination, bestDiff);
+ if(signC<100){
+ validDfsCombination(items, index + 1, currentSpace, targetUtilization,
+ current, bestCombination, bestDiff);
+ }
// 閫夋嫨褰撳墠鐗╁搧
if (currentItem.quantity > 0) {
@@ -479,8 +484,10 @@
for (int qty = 1; qty <= maxCanAdd; qty++) {
current.add(new RemainderItem(currentItem.item, qty));
- validDfsCombination(items, index + 1, currentSpace + qty * currentItem.item.unitSpace,
- targetUtilization, current, bestCombination, bestDiff);
+ if(signC<100){
+ validDfsCombination(items, index + 1, currentSpace + qty * currentItem.item.unitSpace,
+ targetUtilization, current, bestCombination, bestDiff);
+ }
current.remove(current.size() - 1);
}
}
--
Gitblit v1.9.1