|
@@ -1,15 +1,21 @@
|
|
|
package cn.ezhizao.project.business.product.service.impl;
|
|
|
|
|
|
+
|
|
|
+import cn.ezhizao.framework.logGing.SomeService;
|
|
|
import cn.ezhizao.project.business.product.domain.BizDaywork;
|
|
|
import cn.ezhizao.project.business.product.domain.BizDayworkCarrier;
|
|
|
import cn.ezhizao.project.business.product.domain.BizDayworkItem;
|
|
|
import cn.ezhizao.project.business.product.mapper.BizDayworkCarrierMapper;
|
|
|
import cn.ezhizao.project.business.product.mapper.BizDayworkItemMapper;
|
|
|
import cn.ezhizao.project.business.product.service.IBizDayworkItemService;
|
|
|
+import cn.ezhizao.project.business.technologicalProcessDetailDrawing.domain.BizTechnologicalProcessDetailDrawing;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.time.LocalDateTime;
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -141,23 +147,75 @@ public class BizDayworkItemServiceImpl extends ServiceImpl<BizDayworkItemMapper
|
|
|
* 3.将对应的箱数保存到dayworkItem中
|
|
|
*/
|
|
|
|
|
|
- //将工序已完成status='3'的数据筛选出来
|
|
|
+
|
|
|
+
|
|
|
List<BizDayworkItem> dayworkItemList=dayworkItems.stream().filter(item -> "3".equals(item.getStatus())).collect(Collectors.toList());
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if(!dayworkItemList.isEmpty()){
|
|
|
+ //创建log数据
|
|
|
+ List<BizDayworkItem> logList = new ArrayList<>();
|
|
|
+ // 获取当前时间
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
+
|
|
|
+ // 定义时间格式
|
|
|
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
+
|
|
|
+ // 将当前时间格式化为字符串
|
|
|
+ String formattedTime = now.format(formatter);
|
|
|
+ StringBuffer message=new StringBuffer();
|
|
|
+ message.append(formattedTime).append(" 开始:\n");
|
|
|
+
|
|
|
+ //将工序已完成status='3'的数据筛选出来
|
|
|
+ message.append("报工数据: ");
|
|
|
+ // 报工数据
|
|
|
+ message.append("dayworkId: ").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getDayworkId())).toArray(String[]::new))).append(" ").append("批次号:").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(BizDayworkItem::getLotCode).toArray(String[]::new))).append(" ").append("LotId: ").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getLotId())).toArray(String[]::new))).append(" ").append("员工编号: ").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(BizDayworkItem::getUserName).toArray(String[]::new))).append(" ").append("员工姓名: ").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(BizDayworkItem::getNickName).toArray(String[]::new))).append(" ").append("dayworkItemId: ").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getId())).toArray(String[]::new))).append(" ").append("创建时间:").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getCreateTime())).toArray(String[]::new))).append(" ").append("修改时间:").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getUpdateTime())).toArray(String[]::new))).append(" ").append("箱数:").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getCarrierNum())).toArray(String[]::new))).append("\n");
|
|
|
+
|
|
|
+
|
|
|
// 提取dayworkId到一个新的集合中
|
|
|
List<Long> dayworkIds = dayworkItemList.stream()
|
|
|
.map(BizDayworkItem::getDayworkId) // 提取dayworkId
|
|
|
.collect(Collectors.toList()); // 收集到新的列表中
|
|
|
-
|
|
|
//根据dayworkId查询绑定信息只查询蓝箱子和铁箱子
|
|
|
List<BizDayworkCarrier> dayworkCarriers=bizDayworkCarrierMapper.getListBayDayworkId(dayworkIds);
|
|
|
+ message.append("载具信息: ").append(String.join(System.lineSeparator(), dayworkCarriers.stream()
|
|
|
+ .map(BizDayworkCarrier::toString)
|
|
|
+ .toArray(String[]::new))).append("\n");;
|
|
|
+
|
|
|
Map<Long, Integer> countsByDayworkId = dayworkCarriers.stream().collect(Collectors.groupingBy(BizDayworkCarrier::getDayworkId,Collectors.summingInt(carrier -> 1)));
|
|
|
|
|
|
//将对应的箱数保存到dayworkItem中
|
|
|
for (BizDayworkItem dayworkItem:dayworkItemList){
|
|
|
dayworkItem.setCarrierNum(countsByDayworkId.get(dayworkItem.getDayworkId()));
|
|
|
}
|
|
|
+
|
|
|
super.saveOrUpdateBatch(dayworkItemList);
|
|
|
+ //报工数据
|
|
|
+ message.append("最终数据: ");
|
|
|
+ message.append("dayworkId: ").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getDayworkId())).toArray(String[]::new))).append(" ").append("批次号:").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(BizDayworkItem::getLotCode).toArray(String[]::new))).append(" ").append("LotId: ").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getLotId())).toArray(String[]::new))).append(" ").append("员工编号: ").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(BizDayworkItem::getUserName).toArray(String[]::new))).append(" ").append("员工姓名: ").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(BizDayworkItem::getNickName).toArray(String[]::new))).append(" ").append("dayworkItemId: ").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getId())).toArray(String[]::new))).append(" ").append("创建时间:").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getCreateTime())).toArray(String[]::new))).append(" ").append("修改时间:").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getUpdateTime())).toArray(String[]::new))).append(" ").append("箱数:").append(String.join(System.lineSeparator(), dayworkItems.stream()
|
|
|
+ .map(item -> String.valueOf(item.getCarrierNum())).toArray(String[]::new))).append("结束----------------------------------------------------------").append("\n");
|
|
|
+ SomeService service=new SomeService();
|
|
|
+ service.someMethod(message.toString());
|
|
|
+ service.onDestroy();
|
|
|
|
|
|
}
|
|
|
|