|
|
@@ -74,10 +74,13 @@ import java.text.DateFormat;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
+import java.util.Collections;
|
|
|
import java.util.Comparator;
|
|
|
import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
|
@@ -396,7 +399,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
|
|
|
if (resultMap.isSuccess()) {
|
|
|
Goods goods1 = (Goods) resultMap.getData();
|
|
|
if (Status.REMOVED.value() == aBatch.getStatus() && Status.REMOVED.value() != goods1.getStatus()) {
|
|
|
- ResultMap offMap = goodsService.offShelfGoodsByProvider(goods.getBatchCode(), false);
|
|
|
+ ResultMap offMap = goodsService.offShelfGoodsByProvider(goods.getBatchCode(), null, false);
|
|
|
if (offMap.isSuccess()) {
|
|
|
result++;
|
|
|
} else {
|