From 3b8f9eaa550172ec455bba3a9c52809f67b2c9ee Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 16:58:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
production-server/src/main/java/com/yuanchu/mom/service/impl/ManualTechnologyServiceImpl.java | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManualTechnologyServiceImpl.java b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManualTechnologyServiceImpl.java
index a3ce511..82e3bdf 100644
--- a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManualTechnologyServiceImpl.java
+++ b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManualTechnologyServiceImpl.java
@@ -1,13 +1,11 @@
package com.yuanchu.mom.service.impl;
import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUnit;
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.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.mapper.DeviceMapper;
import com.yuanchu.mom.mapper.ManualTechnologyMapper;
import com.yuanchu.mom.mapper.ManufactureOrderMapper;
import com.yuanchu.mom.pojo.*;
@@ -16,7 +14,6 @@
import com.yuanchu.mom.service.ManualTechnologyService;
import com.yuanchu.mom.service.ManufactureOrderProcessService;
import com.yuanchu.mom.service.ManufactureSchedulingService;
-import com.yuanchu.mom.service.TechnologyService;
import com.yuanchu.mom.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +24,6 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -45,9 +41,6 @@
@Resource
ManufactureOrderMapper manufactureOrderMapper;
-
- @Autowired
- private TechnologyService technologyService;
@Autowired
private ManufactureSchedulingService manufactureSchedulingService;
@@ -97,19 +90,6 @@
// 鏇存柊璁㈠崟鐨勫凡鎺掍骇鏁伴噺
manufactureOrderMapper.updateManufacture(manualTechnologyDto.getManOrdId(), manualTechnologyDto.getSchedulingNumber());
- }
-
- @Override
- public Integer updateTime(Integer technologyId, String startTime) {
-// // Hutool 宸ュ叿绫昏绠楅棿闅斿皬鏃�
-// DateTime startTime1 = DateUtil.parse(startTime);
-// DateTime endTime1 = DateUtil.parse(endTime);
-// long between = DateUtil.between(startTime1, endTime1, DateUnit.HOUR);
-// // 鏇存柊
-// LambdaUpdateWrapper<ManualTechnology> updateWrapper = Wrappers.<ManualTechnology>lambdaUpdate()
-// .eq(ManualTechnology::getId, technologyId);
-// return manualTechnologyMapper.update(new ManualTechnology(), updateWrapper);
- return null;
}
// 鏍规嵁鎺掍骇鏁伴噺璁＄畻宸ヨ壓鍛ㄦ湡
--
Gitblit v1.9.3