From 55e5fcc8df938fefc94103149dfe3acd328abfd6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 18:00:54 +0800
Subject: [PATCH] MOM系统-8-30
---
production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java
index 01a5494..b5b0a77 100644
--- a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java
+++ b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,6 +13,7 @@
import com.yuanchu.mom.pojo.dto.ManualTechnologyDto1;
import com.yuanchu.mom.pojo.dto.ManufactureOrderDto;
import com.yuanchu.mom.service.ManufactureOrderService;
+import com.yuanchu.mom.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -54,22 +56,34 @@
BeanUtils.copyProperties(manufactureOrder,manufactureOrderDto);
//璁″垝缂栧埗
List<ManualTechnology> manualTechnologies = manualTechnologyMapper.selectList(Wrappers.<ManualTechnology>query().eq("manufacture_order_id", manOrdId));
- List<ManualTechnologyDto1> manualTechnologyDto1s = manualTechnologies.stream().map(manualTechnology -> {
- ManualTechnologyDto1 manualTechnologyDto1 = new ManualTechnologyDto1();
- BeanUtils.copyProperties(manualTechnology, manualTechnologyDto1);
- manualTechnologyDto1.setMtechId(manualTechnology.getId());
- manualTechnologyDto1.setDeviceName(deviceMapper.selectById(manualTechnology.getDeviceId()).getName());
- return manualTechnologyDto1;
- }).collect(Collectors.toList());
- manufactureOrderDto.setMessage(manualTechnologyDto1s);
+ MyUtil.PrintLog(manualTechnologies.toString());
+
+// List<ManualTechnologyDto1> manualTechnologyDto1s = manualTechnologies.stream().map(manualTechnology -> {
+// ManualTechnologyDto1 manualTechnologyDto1 = new ManualTechnologyDto1();
+// BeanUtils.copyProperties(manualTechnology, manualTechnologyDto1);
+// manualTechnologyDto1.setMtechId(manualTechnology.getId());
+// manualTechnologyDto1.setDeviceName(deviceMapper.selectById(manualTechnology.getDeviceId()).getName());
+// return manualTechnologyDto1;
+// }).collect(Collectors.toList());
+// manufactureOrderDto.setMessage(manualTechnologyDto1s);
return manufactureOrderDto;
}
//涓嬭揪
@Override
public void down(Integer manOrdId) {
- ManufactureOrder manufactureOrder = new ManufactureOrder().setId(manOrdId).setGoState(1);
+ ManufactureOrder manufactureOrder = new ManufactureOrder().setId(manOrdId).setGoState(1).setType(0);
manufactureOrderMapper.updateById(manufactureOrder);
}
+
+ @Override
+ public void deleteManufacture(List<String> manOrdId) {
+ manufactureOrderMapper.deleteManufacture(manOrdId);
+ }
+
+ @Override
+ public List<Map<String, Object>> towTree() {
+ return manufactureOrderMapper.towTree();
+ }
}
--
Gitblit v1.9.3