From 8b43954926db6b4df6a61ab6e04d6cb11189069d Mon Sep 17 00:00:00 2001
From: 吴健 <14790700720@163.com>
Date: 星期二, 15 四月 2025 08:54:08 +0800
Subject: [PATCH] add-415
---
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
index 068877f..dc2def0 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
@@ -3,12 +3,14 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSONObject;
+import com.jcdm.common.core.domain.R;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.common.utils.StringUtils;
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
import com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper;
import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
+import com.jcdm.main.da.passingStationCollection.domain.ProductNumVO;
import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.da.passingStationCollection.vo.DaPassingStationVO;
@@ -69,6 +71,11 @@
public List<DaPassingStationCollection> selectDaPassingStationCollectionList(DaPassingStationCollection daPassingStationCollection)
{
return daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
+ }
+
+ @Override
+ public List<DaPassingStationCollection> selectDaPassingStationCollectionForSearch(DaPassingStationCollection daPassingStationCollection) {
+ return daPassingStationCollectionMapper.selectDaPassingStationCollectionForSearch(daPassingStationCollection);
}
@Override
@@ -225,13 +232,15 @@
rmRepairRecordMapper.deleteRmRepairRecordByCode(sfcCode);
}
}
- RmRepairRecord rmRepairRecord = new RmRepairRecord();
- rmRepairRecord.setBoxCode(result.getSfcCode());
- rmRepairRecord.setProcessesCode(result.getLocationCode());
- rmRepairRecord.setOriginalResult(result.getOutRsSign());
- rmRepairRecord.setCreateTime(new Date());
- rmRepairRecordMapper.insertRmRepairRecord(rmRepairRecord);
- daPassingStationCollectionMapper.deleteDaPassingStationCollectionById(result.getId());
+ if (ObjectUtil.isNotEmpty(result)){
+ RmRepairRecord rmRepairRecord = new RmRepairRecord();
+ rmRepairRecord.setBoxCode(result.getSfcCode());
+ rmRepairRecord.setProcessesCode(result.getLocationCode());
+ rmRepairRecord.setOriginalResult(result.getOutRsSign());
+ rmRepairRecord.setCreateTime(new Date());
+ rmRepairRecordMapper.insertRmRepairRecord(rmRepairRecord);
+ daPassingStationCollectionMapper.deleteDaPassingStationCollectionById(result.getId());
+ }
}
}
@@ -249,6 +258,39 @@
}
}
+ @Override
+ public List<ProductNumVO> getProductNum(DaPassingStationCollection daPassingStationCollection) {
+ String queryMonth = daPassingStationCollection.getQueryMonth();
+ LocalDate queryLocalDate = daPassingStationCollection.getQueryDate();
+ if (ObjectUtil.isNotEmpty(queryLocalDate)){
+ LocalDate addQueryLocalDate = queryLocalDate.plusDays(1);
+ String queryDate = queryLocalDate.toString();
+ String addQueryDate = addQueryLocalDate.toString();
+ List<ProductNumVO> productNum = bsOrderSchedulingMapper.getProductNum(queryDate, addQueryDate);
+ if (CollUtil.isNotEmpty(productNum)){
+ productNum.forEach(x -> {
+ x.setQueryDate(queryDate);
+ });
+ }
+ return productNum;
+ } else if (ObjectUtil.isNull(queryLocalDate) && ObjectUtil.isNotNull(queryMonth)){
+ //鎸夋湀浠芥煡璇�
+ String s = queryMonth + "-01";
+ LocalDate parse = LocalDate.parse(s);
+ LocalDate localDate = parse.plusMonths(1);
+ String queryDate = parse.toString();
+ String addQueryDate = localDate.toString();
+ List<ProductNumVO> productNum = bsOrderSchedulingMapper.getProductNum(queryDate, addQueryDate);
+ if (CollUtil.isNotEmpty(productNum)){
+ productNum.forEach(x -> {
+ x.setQueryDate(queryMonth);
+ });
+ }
+ return productNum;
+ }
+ return new ArrayList<ProductNumVO>();
+ }
+
// public String sendMessage(String message) throws Exception{
// Map<String,Object> map = new HashMap<>();
//
--
Gitblit v1.9.3