From 208bb2f289ce8a7b59f587a9f57e24c0fc8a0ba6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:48:40 +0800
Subject: [PATCH] MOM系统-9-24 加班
---
production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderProcessServiceImpl.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderProcessServiceImpl.java b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderProcessServiceImpl.java
index a74f557..e1f426a 100644
--- a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderProcessServiceImpl.java
+++ b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderProcessServiceImpl.java
@@ -2,12 +2,18 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.pojo.ManufactureOrderProcess;
import com.yuanchu.mom.mapper.ManufactureOrderProcessMapper;
+import com.yuanchu.mom.pojo.ManufactureScheduling;
import com.yuanchu.mom.service.ManufactureOrderProcessService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.service.ManufactureSchedulingService;
import com.yuanchu.mom.utils.MyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -29,22 +35,32 @@
@Resource
private ManufactureOrderProcessMapper manufactureOrderProcessMapper;
+ @Autowired
+ private ManufactureSchedulingService manufactureSchedulingService;
+
@Override
public void batchInsert(List<ManufactureOrderProcess> manufactureOrderProcessesDate) {
manufactureOrderProcessMapper.insertBatchSomeColumn(manufactureOrderProcessesDate);
}
@Override
- public Integer updateTime(Integer technologyId, Integer schedulingId, String startTime) {
-// // Hutool 宸ュ叿绫昏绠楅棿闅斿皬鏃�
+ public void updateTime(Integer technologyId, Integer schedulingId, String startTime, Integer period) {
+ // 鍏堟洿鏂板懆鏈�
+ LambdaUpdateWrapper<ManufactureOrderProcess> updateWrapper = Wrappers.<ManufactureOrderProcess>lambdaUpdate()
+ .eq(ManufactureOrderProcess::getId, technologyId)
+ .set(ManufactureOrderProcess::getPeriod, period);
+ manufactureOrderProcessMapper.update(new ManufactureOrderProcess(), updateWrapper);
+
+
+ // 濡傛灉鍛ㄦ湡鏇存柊瀹屾垚锛屾牴鎹帓浜d鏌ヨ鎵�鏈夌殑宸ュ簭Id涓庢瘡閬撳伐搴忓懆鏈燂紝缁忚繃澶勭悊鐒跺悗鎵归噺鏇存柊寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ // Hutool 宸ュ叿绫昏绠楅棿闅斿皬鏃�
Date startTime1 = DateUtil.parse(startTime);
// 鏍规嵁鎺掍骇Id鏌ヨ鎵�鏈夊搴旂殑宸ュ簭鏁版嵁
LambdaQueryWrapper<ManufactureOrderProcess> queryWrapper = Wrappers.<ManufactureOrderProcess>lambdaQuery()
.eq(ManufactureOrderProcess::getManufactureSchedulingId, schedulingId)
.select(ManufactureOrderProcess::getId, ManufactureOrderProcess::getPeriod);
List<ManufactureOrderProcess> list = manufactureOrderProcessMapper.selectList(queryWrapper);
-
- //
+ // 寮�濮嬪鐞嗘棩鏈�
for (int i = 0; i < list.size(); i++) {
if (Objects.equals(list.get(i).getId(), technologyId)){
list.get(i).setStartTime(startTime1);
@@ -58,8 +74,18 @@
break;
}
}
- MyUtil.PrintLog(list.toString());
- return null;
-// return manufactureOrderProcessMapper.updateTime(list);
+ manufactureOrderProcessMapper.updateTime(list);
+
+
+ // 濡傛灉鎵归噺鏇存柊鏃堕棿鎴愬姛锛屽紑濮嬫洿鏂版帓浜ц〃涓殑寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ // 鑾峰彇宸ヨ壓鐨勮鍒掑紑濮嬫椂闂�
+ Date startDate = manufactureOrderProcessMapper.selectSchedulingStartTime(schedulingId);
+ // 鑾峰彇宸ヨ壓鐨勬渶鏅氬畬鎴愭椂闂�
+ Date endDate = list.get(list.size() - 1).getEndTime();
+ LambdaUpdateWrapper<ManufactureScheduling> updateWrapper1 = Wrappers.<ManufactureScheduling>lambdaUpdate()
+ .eq(ManufactureScheduling::getId, schedulingId)
+ .set(ManufactureScheduling::getStartTime, startDate)
+ .set(ManufactureScheduling::getEndTime, endDate);
+ manufactureSchedulingService.update(new ManufactureScheduling(), updateWrapper1);
}
}
--
Gitblit v1.9.3