From cd5b5908546c3d6c98e7aec607af8db1f8565495 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 15 九月 2023 08:38:00 +0800
Subject: [PATCH] 修改 9.15
---
base-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java | 9 -
inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java | 3
inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java | 1
base-server/src/main/resources/mapper/TechniqueModelMapper.xml | 1
base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml | 47 ++---------
/dev/null | 17 ----
base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java | 5 +
base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java | 4
base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java | 48 -----------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java | 16 ++-
base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java | 7 -
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 20 ++++-
inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java | 2
base-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java | 6 -
14 files changed, 49 insertions(+), 137 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java b/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
index 216ddc5..7c94cb2 100644
--- a/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
+++ b/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
@@ -52,11 +52,6 @@
return Result.success(technologyTemplateService.chooseTech(type));
}
- @ApiOperation(value = "鏂板宸ヨ壓璺嚎缁存姢-->閫夋嫨鍏冧欢")
- @GetMapping("/chooseElement")
- public Result chooseElement() {
- return Result.success(technologyTemplateService.chooseElement());
- }
@ApiOperation(value = "鏂板宸ヨ壓璺嚎缁存姢")
@PostMapping("/addTechTemp")
@@ -80,7 +75,7 @@
@ApiImplicitParam(name = "father", value = "宸ュ簭(鐖剁被)", dataTypeClass = String.class, required = true)
})
@GetMapping("/selectAllTechNam")
- public Result selectAllTechNam(String father) {
+ public Result selectAllTechNam(String father,Integer id) {
return Result.success(technologyTemplateService.selectAllTechNam(father));
}
diff --git a/base-server/src/main/java/com/yuanchu/mom/mapper/ElementMapper.java b/base-server/src/main/java/com/yuanchu/mom/mapper/ElementMapper.java
deleted file mode 100644
index c04cf0b..0000000
--- a/base-server/src/main/java/com/yuanchu/mom/mapper/ElementMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.mom.pojo.Element;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍏冧欢琛�(Element)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author zss
- * @since 2023-08-28 10:48:45
- */
-public interface ElementMapper extends BaseMapper<Element> {
-
- //鏂板宸ヨ壓璺嚎-->閫夋嫨鍏冧欢
- List<Map<String,Object>> chooseElement();
-}
-
diff --git a/base-server/src/main/java/com/yuanchu/mom/mapper/ElementTechnologyMapper.java b/base-server/src/main/java/com/yuanchu/mom/mapper/ElementTechnologyMapper.java
deleted file mode 100644
index 41e3e39..0000000
--- a/base-server/src/main/java/com/yuanchu/mom/mapper/ElementTechnologyMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.mom.pojo.ElementTechnology;
-
-import java.util.List;
-
-/**
- * 鍏冧欢宸ヨ壓涓棿琛�(ElementTechnology)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author zss
- * @since 2023-08-28 10:49:07
- */
-public interface ElementTechnologyMapper extends BaseMapper<ElementTechnology> {
-
- //鍒犻櫎涓棿琛�(鏍规嵁宸ュ簭id)
- void delElemaByTechsId(Integer id);
-
- //鎵归噺鍒犻櫎涓棿琛�(鏍规嵁宸ュ簭id)
- void delAllByTechId(String ids);
-}
-
diff --git a/base-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java b/base-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java
index 06a132f..b6bd5f9 100644
--- a/base-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java
+++ b/base-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java
@@ -19,10 +19,10 @@
//鏂板宸ヨ壓璺嚎-->閫夋嫨宸ュ簭
List<String> chooseTech(Integer type);
- //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->宸﹁竟浜岀骇灞曠ず
+ //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->宸﹁竟涓�绾у睍绀�
List<Map<String,Object>> selectAllTechTem(Integer type,String message);
- //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->鍙宠竟灞曠ず宸ヨ壓鍜岃澶�
+ //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->鍙宠竟灞曠ず宸ヨ壓鍜岃澶囧拰鍏冧欢
List<Map<String, Object>> selectAllTechNam(String father);
/**
@@ -32,13 +32,8 @@
*/
List<Map<String, Object>> selecTechById(Integer id);
-
//鎵归噺鍒犻櫎
void delAllTech(String ids);
-
-
-
-
}
diff --git a/base-server/src/main/java/com/yuanchu/mom/pojo/Element.java b/base-server/src/main/java/com/yuanchu/mom/pojo/Element.java
deleted file mode 100644
index adb271b..0000000
--- a/base-server/src/main/java/com/yuanchu/mom/pojo/Element.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * 鍏冧欢琛�(Element)琛ㄥ疄浣撶被
- *
- * @author zss
- * @since 2023-08-28 10:48:45
- */
-@Data
-@Accessors(chain = true)
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@TableName("element")
-public class Element implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- **/
- @TableId(type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍏冧欢鍚嶇О
- **/
- private String name;
-
- @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- private Integer state;
-
- @TableField(fill = FieldFill.INSERT)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date updateTime;
-}
-
diff --git a/base-server/src/main/java/com/yuanchu/mom/pojo/ElementTechnology.java b/base-server/src/main/java/com/yuanchu/mom/pojo/ElementTechnology.java
deleted file mode 100644
index 0191bf2..0000000
--- a/base-server/src/main/java/com/yuanchu/mom/pojo/ElementTechnology.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * 鍏冧欢宸ヨ壓涓棿琛�(ElementTechnology)琛ㄥ疄浣撶被
- *
- * @author zss
- * @since 2023-08-28 10:49:07
- */
-@Data
-@Accessors(chain = true)
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@TableName("element_technology")
-public class ElementTechnology implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- **/
- @TableId(type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍏宠仈 宸ヨ壓id
- **/
- private Integer techTemId;
-
-
- /**
- * 鍏宠仈 鍏冧欢id
- **/
- private Integer elementId;
-
-
- @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- private Integer state;
-
- @TableField(fill = FieldFill.INSERT)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date updateTime;
-}
-
diff --git a/base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java b/base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
index 8ebdd82..b014510 100644
--- a/base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
+++ b/base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
@@ -67,5 +67,10 @@
* 璁惧缁�
**/
private String deviceGroup;
+
+ /**
+ * 鍏冧欢
+ **/
+ private String element;
}
diff --git a/base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java b/base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java
index 46ec316..1baefff 100644
--- a/base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java
+++ b/base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java
@@ -23,8 +23,8 @@
private String name;
@JsonSerialize
- @NotBlank(message = "鍏冧欢id涓嶈兘涓虹┖")
- private String elementId;
+ @NotBlank(message = "鍏冧欢涓嶈兘涓虹┖")
+ private String element;
@JsonSerialize
@NotBlank(message = "璁惧缁勪笉鑳戒负绌�")
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/ElementService.java b/base-server/src/main/java/com/yuanchu/mom/service/ElementService.java
deleted file mode 100644
index 33bbfb4..0000000
--- a/base-server/src/main/java/com/yuanchu/mom/service/ElementService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.pojo.Element;
-
-/**
- * 鍏冧欢琛�(Element)琛ㄦ湇鍔℃帴鍙�
- *
- * @author zss
- * @since 2023-08-28 10:48:45
- */
-public interface ElementService extends IService<Element> {
-
-}
-
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/ElementTechnologyService.java b/base-server/src/main/java/com/yuanchu/mom/service/ElementTechnologyService.java
deleted file mode 100644
index 4077f11..0000000
--- a/base-server/src/main/java/com/yuanchu/mom/service/ElementTechnologyService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.pojo.ElementTechnology;
-
-import java.util.List;
-
-/**
- * 鍏冧欢宸ヨ壓涓棿琛�(ElementTechnology)琛ㄦ湇鍔℃帴鍙�
- *
- * @author zss
- * @since 2023-08-28 10:49:07
- */
-public interface ElementTechnologyService extends IService<ElementTechnology> {
-
- //鍒犻櫎涓棿琛�(鏍规嵁宸ュ簭id)
- void delElemaByTechsId(Integer id);
-
- //鎵归噺鍒犻櫎涓棿琛�(鏍规嵁宸ュ簭id)
- void delAllByTechId(String ids);
-}
-
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java b/base-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java
index 6126b1d..ffe5c0c 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java
@@ -30,12 +30,6 @@
List<String> chooseTech(Integer type);
/**
- * 鏂板宸ヨ壓璺嚎-->閫夋嫨鍏冧欢
- * @return
- */
- List<Map<String,Object>> chooseElement();
-
- /**
* 鏂板宸ヨ壓璺嚎
* @param technologyTemplateDto
*/
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/ElementServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/ElementServiceImpl.java
deleted file mode 100644
index 7321ef5..0000000
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/ElementServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.mapper.ElementMapper;
-import com.yuanchu.mom.pojo.Element;
-import com.yuanchu.mom.service.ElementService;
-import org.springframework.stereotype.Service;
-
-/**
- * 鍏冧欢琛�(Element)琛ㄦ湇鍔″疄鐜扮被
- *
- * @author zss
- * @since 2023-08-28 10:48:45
- */
-@Service
-public class ElementServiceImpl extends ServiceImpl<ElementMapper, Element> implements ElementService {
-
-}
-
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/ElementTechnologyServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/ElementTechnologyServiceImpl.java
deleted file mode 100644
index 6ba56b5..0000000
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/ElementTechnologyServiceImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.mapper.ElementTechnologyMapper;
-import com.yuanchu.mom.pojo.ElementTechnology;
-import com.yuanchu.mom.service.ElementTechnologyService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 鍏冧欢宸ヨ壓涓棿琛�(ElementTechnology)琛ㄦ湇鍔″疄鐜扮被
- *
- * @author zss
- * @since 2023-08-28 10:49:07
- */
-@Service
-public class ElementTechnologyServiceImpl extends ServiceImpl<ElementTechnologyMapper, ElementTechnology> implements ElementTechnologyService {
-
- @Resource
- ElementTechnologyMapper elementTechnologyMapper;
-
- //鍒犻櫎涓棿琛�(鏍规嵁宸ュ簭id)
- @Override
- public void delElemaByTechsId(Integer id) {
- elementTechnologyMapper.delElemaByTechsId(id);
- }
-
- //鎵归噺鍒犻櫎涓棿琛�(鏍规嵁宸ュ簭id)
- @Override
- public void delAllByTechId(String ids) {
- elementTechnologyMapper.delAllByTechId(ids);
- }
-}
-
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
index 5f408c8..70cff8a 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
@@ -1,25 +1,17 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.annotation.TableField;
-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.*;
-import com.yuanchu.mom.pojo.ElementTechnology;
import com.yuanchu.mom.pojo.TechnologyTemplate;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
-import com.yuanchu.mom.service.ElementTechnologyService;
import com.yuanchu.mom.service.TechnologyTemplateService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* 宸ヨ壓璺嚎缁存姢琛�(TechnologyTemplate)琛ㄦ湇鍔″疄鐜扮被
@@ -35,12 +27,6 @@
@Resource
DeviceMapper deviceMapper;
-
- @Resource
- ElementMapper elementMapper;
-
- @Resource
- ElementTechnologyService elementTechnologyService;
@Resource
TechnicalModelMapper technicalModelMapper;
@@ -70,11 +56,6 @@
return technologyTemplateMapper.chooseTech(type);
}
- //鏂板宸ヨ壓璺嚎-->閫夋嫨鍏冧欢
- @Override
- public List<Map<String, Object>> chooseElement() {
- return elementMapper.chooseElement();
- }
//鏂板宸ヨ壓璺嚎
@Override
@@ -84,24 +65,15 @@
TechnologyTemplate technologyTemplate = new TechnologyTemplate();
BeanUtils.copyProperties(technologyTemplateDto, technologyTemplate);
technologyTemplateMapper.insert(technologyTemplate);
- /*鏂板宸ヨ壓鍏冧欢涓棿琛�*/
- String[] split = technologyTemplateDto.getElementId().split(",");
- List<ElementTechnology> elementTechnologies = Arrays.stream(split).map(s -> {
- ElementTechnology elementTechnology = new ElementTechnology();
- elementTechnology.setTechTemId(technologyTemplate.getId());
- elementTechnology.setElementId(Integer.parseInt(s));
- return elementTechnology;
- }).collect(Collectors.toList());
- elementTechnologyService.saveBatch(elementTechnologies);
}
- //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->宸﹁竟浜岀骇灞曠ず
+ //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->宸﹁竟涓�绾у睍绀�
@Override
public List<Map<String, Object>> selectAllTechTem(Integer type, String message) {
return technologyTemplateMapper.selectAllTechTem(type, message);
}
- //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->鍙宠竟灞曠ず宸ヨ壓鍜岃澶�
+ //鏌ヨ宸ヨ壓璺嚎鍒楄〃-->鍙宠竟灞曠ず宸ヨ壓鍜岃澶囧拰鍏冧欢
@Override
public List<Map<String, Object>> selectAllTechNam(String father) {
return technologyTemplateMapper.selectAllTechNam(father);
@@ -122,18 +94,6 @@
BeanUtils.copyProperties(technologyTemplateDto, technologyTemplate);
technologyTemplate.setId(id);
technologyTemplateMapper.updateById(technologyTemplate);
- /*鏇存敼涓棿琛�*/
- //鎵归噺鍒犻櫎鍘熸湁鐨勪腑闂磋〃(鏍规嵁宸ュ簭id)
- elementTechnologyService.delElemaByTechsId(id);
- //鎵归噺娣诲姞涓棿琛�
- String[] split = technologyTemplateDto.getElementId().split(",");
- List<ElementTechnology> elementTechnologies = Arrays.stream(split).map(s -> {
- ElementTechnology elementTechnology = new ElementTechnology();
- elementTechnology.setTechTemId(technologyTemplate.getId());
- elementTechnology.setElementId(Integer.parseInt(s));
- return elementTechnology;
- }).collect(Collectors.toList());
- elementTechnologyService.saveBatch(elementTechnologies);
}
//鍒犻櫎(宸ヨ壓璺嚎id)
@@ -144,8 +104,6 @@
TechnologyTemplate technologyTemplate = new TechnologyTemplate();
technologyTemplate.setId(id).setState(0);
technologyTemplateMapper.updateById(technologyTemplate);
- //鍒犻櫎涓棿琛�
- elementTechnologyService.delElemaByTechsId(id);
//鍒犻櫎鎶�鏈寚鏍囩淮鎶よ〃
technicalModelMapper.delTeMoByTechId(id);
//鍒犻櫎鐢熶骇宸ヨ壓缁存姢琛�
@@ -164,8 +122,6 @@
public void delAllTech(String ids) {
//鎵归噺鍒犻櫎宸ヨ壓琛�
technologyTemplateMapper.delAllTech(ids);
- //鎵归噺鍒犻櫎涓棿琛�
- elementTechnologyService.delAllByTechId(ids);
//鎵归噺鍒犻櫎鎸囨爣缁存姢琛�
technicalModelMapper.delAllByTechId(ids);
//鎵归噺鍒犻櫎鐢熶骇宸ヨ壓缁存姢琛�
diff --git a/base-server/src/main/resources/mapper/ElementMapper.xml b/base-server/src/main/resources/mapper/ElementMapper.xml
deleted file mode 100644
index c25da5b..0000000
--- a/base-server/src/main/resources/mapper/ElementMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.yuanchu.mom.mapper.ElementMapper">
- <!--鏂板宸ヨ壓璺嚎 閫夋嫨鍏冧欢-->
- <select id="chooseElement" resultType="java.util.Map">
- select id, name
- from mom_ocean.element
- where state=1
- </select>
-</mapper>
\ No newline at end of file
diff --git a/base-server/src/main/resources/mapper/ElementTechnologyMapper.xml b/base-server/src/main/resources/mapper/ElementTechnologyMapper.xml
deleted file mode 100644
index 930f502..0000000
--- a/base-server/src/main/resources/mapper/ElementTechnologyMapper.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.yuanchu.mom.mapper.ElementTechnologyMapper">
- <!--鍒犻櫎涓棿琛�(鏍规嵁宸ュ簭id)-->
- <update id="delElemaByTechsId">
- update mom_ocean.element_technology
- set state=0
- where tech_tem_id = #{id}
- </update>
-
- <!--鎵归噺鍒犻櫎涓棿琛�(鏍规嵁宸ュ簭id)-->
- <update id="delAllByTechId">
- update mom_ocean.element_technology
- set state=0
- where tech_tem_id in (${ids})
- </update>
-</mapper>
\ No newline at end of file
diff --git a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
index a094f05..01abf4f 100644
--- a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
+++ b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
@@ -35,6 +35,7 @@
mom_ocean.device d,
mom_ocean.technology_template tt
where qm.state = 1
+ and d.state = 1
and d.id = qm.device_id
and cm.id = qm.technical_model_id
and tt.id = qm.tech_tem_id
diff --git a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
index 25ad42f..31bf07d 100644
--- a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
+++ b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
@@ -8,23 +8,11 @@
</update>
<!--鏌ヨ宸ヨ壓璺嚎鍒楄〃 宸﹁竟浜岀骇灞曠ず-->
- <resultMap id="selectAllTechTemMap" type="map">
- <id property="name" column="elname"/>
- <collection property="children" resultMap="selectAllTechTemTowMap" javaType="List"/>
- </resultMap>
- <resultMap id="selectAllTechTemTowMap" type="map">
- <result property="name" column="father"/>
- </resultMap>
- <select id="selectAllTechTem" resultMap="selectAllTechTemMap">
- select e.name elname,
+ <select id="selectAllTechTem" resultType="java.util.Map">
+ select distinct
father
- from mom_ocean.technology_template t,
- mom_ocean.element e,
- mom_ocean.element_technology et
- where e.id = et.element_id
- and t.id = tech_tem_id
- and t.state = 1
- and et.state=1
+ from mom_ocean.technology_template t
+ where t.state = 1
and type=#{type}
<if test="message!=null and message!=''">
and father like concat('%',#{message},'%')
@@ -35,6 +23,7 @@
<select id="selectAllTechNam" resultType="java.util.Map">
select id,
name,
+ element,
device_group
from mom_ocean.technology_template
where state = 1
@@ -50,28 +39,8 @@
</select>
<!--鏍规嵁id鏌ョ湅璇︽儏-->
- <resultMap id="selecTechByIdMap" type="map">
- <id property="type" column="type"/>
- <result property="father" column="father"/>
- <result property="name" column="name"/>
- <result property="deviceGroup" column="device_group"/>
- <collection property="children" resultMap="selecTechByIdsMap" javaType="List"/>
- </resultMap>
- <resultMap id="selecTechByIdsMap" type="map">
- <id property="id" column="id"/>
- </resultMap>
- <select id="selecTechById" resultMap="selecTechByIdMap">
- select e.id,
- father,
- t.name,
- type,
- device_group
- from mom_ocean.technology_template t,
- mom_ocean.element e,
- mom_ocean.element_technology et
- where e.id = et.element_id
- and t.id = tech_tem_id
- and t.state = 1
- and t.id = #{id}
+ <select id="selecTechById" resultType="java.util.Map">
+ select * from mom_ocean.technology_template where state=1
</select>
+
</mapper>
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
index 39cd482..48acef0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
@@ -90,6 +90,7 @@
List<InspectionItem> inspectionItemList = productList.stream().map(product -> {
InspectionItem inspectionItem = new InspectionItem();
BeanUtils.copyProperties(product, inspectionItem);
+ inspectionItem.setId(null);
inspectionItem.setCreateTime(new Date());
inspectionItem.setUpdateTime(new Date());
inspectionItem.setInspectId(finishedInspect.getId());
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
index 39d235c..cf52951 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
@@ -1,5 +1,7 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.mapper.InspectionItemMapper;
import com.yuanchu.mom.mapper.TechniqueMapper;
import com.yuanchu.mom.pojo.InspectionItem;
@@ -55,13 +57,13 @@
//鏇存敼璁惧
@Override
public void updateDevByInsId(Integer id, Integer type, Integer devId) {
- InspectionItem inspectionItem = new InspectionItem();
- inspectionItem.setId(id);
- inspectionItem.setType(type);
- inspectionItem.setDeviceId(devId);
- inspectionItem.setInspectionValue(null);
- inspectionItem.setResult(null);
- inspectionItemMapper.updateById(inspectionItem);
+ LambdaUpdateWrapper<InspectionItem> updateWrapper = Wrappers.<InspectionItem>lambdaUpdate()
+ .eq(InspectionItem::getId, id)
+ .eq(InspectionItem::getType, type)
+ .set(InspectionItem::getDeviceId, devId)
+ .set(InspectionItem::getInspectionValue, null)
+ .set(InspectionItem::getResult, null);
+ inspectionItemMapper.update(new InspectionItem(), updateWrapper);
}
//鏂板鎸夐挳-->2銆佹楠岄」鐩�-->澶卞幓鐒︾偣鍙戣捣璇ヨ姹�
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
index 1edc894..80fb37c 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
@@ -98,8 +98,7 @@
public Result updateSaleById(@RequestHeader("token") String token, Integer id, String str) throws Exception {
SaleVo saleVo = JackSonUtil.unmarshal(str, SaleVo.class);
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
- saleService.updateSaleById(data.get("name").replaceAll("\"", ""), id, saleVo);
- return Result.success("淇敼鎴愬姛!");
+ return Result.success(saleService.updateSaleById(data.get("name").replaceAll("\"", ""), id, saleVo));
}
@ApiOperation(value = "鏍规嵁閿�鍞崟id鍒犻櫎")
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java b/inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java
index 4ceb1e7..d583655 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java
@@ -63,7 +63,7 @@
* @param saleman
* @param saleVo
*/
- void updateSaleById(String saleman,Integer id, SaleVo saleVo);
+ String updateSaleById(String saleman,Integer id, SaleVo saleVo);
/**
* 瀹℃牳
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index 4d80431..3e7a1d7 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -14,14 +14,13 @@
import com.yuanchu.mom.pojo.vo.SaleVo;
import com.yuanchu.mom.service.SaleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.vo.Result;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -109,7 +108,19 @@
//鏍规嵁閿�鍞崟id淇敼淇℃伅
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateSaleById(String saleman, Integer id, SaleVo saleVo) {
+ public String updateSaleById(String saleman, Integer id, SaleVo saleVo) {
+ //鏍￠獙,鍚屼竴涓骇鍝佺殑瑙勬牸鍨嬪彿涓嶈兘鐩稿悓
+ List<SaleMaterialDto> saleMaterialList = saleVo.getSaleMaterialList();
+ // 浣跨敤鍝堝笇闆嗗悎鏉ュ垽鏂槸鍚﹀瓨鍦ㄧ浉鍚屽瓧娈靛�肩粍鍚�
+ Set<String> seen = new HashSet<>();
+ for (SaleMaterialDto saleMaterial: saleMaterialList) {
+ String key = saleMaterial.getName() + "," + saleMaterial.getSpecifications();
+ if (seen.contains(key)) {
+ return "鍚屼竴涓骇鍝佺殑瑙勬牸鍨嬪彿涓嶈兘鐩稿悓";
+ } else {
+ seen.add(key);
+ }
+ }
Sale sale = saleMapper.selectById(id);
sale.setSaleman(saleman);
BeanUtils.copyProperties(saleVo, sale);
@@ -121,6 +132,7 @@
BeanUtils.copyProperties(saleMaterialDto, saleMaterial);
saleMaterialMapper.updateById(saleMaterial);
}
+ return "淇敼鎴愬姛!";
}
//瀹℃牳
--
Gitblit v1.9.3