|
@@ -30,6 +30,7 @@ import java.text.DateFormat;
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
|
|
+import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -402,7 +403,10 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService{
|
|
|
List<SeekPurchaseByBatch> deleteBatchList = new ArrayList<>();
|
|
List<SeekPurchaseByBatch> deleteBatchList = new ArrayList<>();
|
|
|
for (SeekPurchaseByBatch batch : seekPurchaseByBatchList) {
|
|
for (SeekPurchaseByBatch batch : seekPurchaseByBatchList) {
|
|
|
SeekPurchase seekPurchase = new SeekPurchase();
|
|
SeekPurchase seekPurchase = new SeekPurchase();
|
|
|
- if (!StringUtils.isEmpty(batch.getCode()) && !StringUtils.isEmpty(batch.getBrand()) && !StringUtils.isEmpty(batch.getDeadline()) && batch.getDeadline().compareTo(DateUtils.addTime(new Date(), 90, 23, 59 ,59))!= 1) {
|
|
|
|
|
|
|
+ Calendar now = Calendar.getInstance();
|
|
|
|
|
+ now.add(Calendar.DAY_OF_MONTH, 90);
|
|
|
|
|
+ //Date deadlineMax = DateUtils.addTime(new Date(System.currentTimeMillis()), 90, 23, 59 ,59);
|
|
|
|
|
+ if (!StringUtils.isEmpty(batch.getCode()) && !StringUtils.isEmpty(batch.getBrand()) && !StringUtils.isEmpty(batch.getDeadline()) && batch.getDeadline().compareTo(now.getTime()) != 1) {
|
|
|
//seekPurchase = (SeekPurchase) batch;
|
|
//seekPurchase = (SeekPurchase) batch;
|
|
|
seekPurchase.setDeadline(batch.getDeadline());
|
|
seekPurchase.setDeadline(batch.getDeadline());
|
|
|
seekPurchase.setCurrency(batch.getCurrency());
|
|
seekPurchase.setCurrency(batch.getCurrency());
|
|
@@ -431,7 +435,10 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService{
|
|
|
seekPurchaseBom.setStatus(1);
|
|
seekPurchaseBom.setStatus(1);
|
|
|
seekPurchaseBomDao.save(seekPurchaseBom);
|
|
seekPurchaseBomDao.save(seekPurchaseBom);
|
|
|
seekPurchaseByBatchDao.delete(deleteBatchList);
|
|
seekPurchaseByBatchDao.delete(deleteBatchList);
|
|
|
- return ResultMap.success(haveGoodsCount);
|
|
|
|
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
|
|
+ result.put("successAmount", seekPurchaseList.size());
|
|
|
|
|
+ result.put("goodsAmount", haveGoodsCount);
|
|
|
|
|
+ return ResultMap.success(result);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|