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 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 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 3e3078a..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,15 +1,26 @@
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;
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.ManualTechnology;
import com.yuanchu.mom.pojo.ManufactureOrder;
+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;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 鐢熶骇璁㈠崟琛�(ManufactureOrder)琛ㄦ湇鍔″疄鐜扮被
@@ -23,10 +34,56 @@
@Resource
ManufactureOrderMapper manufactureOrderMapper;
+ @Resource
+ ManualTechnologyMapper manualTechnologyMapper;
+
+ @Resource
+ DeviceMapper deviceMapper;
+
//鏌ヨ鐢熶骇璁㈠崟鐨勫垪琛�
@Override
public IPage<Map<String, Object>> selectAllManord(Page<Object> page, String downTime, String delTime, String customerCode, Integer type) {
return manufactureOrderMapper.selectAllManord(page,downTime,delTime,customerCode,type);
}
+
+
+ //鏌ョ湅鎺掍骇璇︽儏
+ @Override
+ public ManufactureOrderDto sePros(Integer manOrdId) {
+ ManufactureOrderDto manufactureOrderDto = new ManufactureOrderDto();
+ //鍩烘湰淇℃伅
+ ManufactureOrder manufactureOrder = manufactureOrderMapper.selectById(manOrdId);
+ BeanUtils.copyProperties(manufactureOrder,manufactureOrderDto);
+ //璁″垝缂栧埗
+ List<ManualTechnology> manualTechnologies = manualTechnologyMapper.selectList(Wrappers.<ManualTechnology>query().eq("manufacture_order_id", manOrdId));
+ 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).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