From 279b381d288cf6d1358408684d308d50ef3dd7a5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 03 十一月 2023 09:10:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PartVo.java                    |   99 ++++++++++++++++++++++++
 mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PropertyVo.java                |   22 +++++
 mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java          |    8 ++
 mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java    |   12 +++
 mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java |   51 +++++++++++-
 mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PropertiesInfoVo.java          |   20 +++++
 mes-web/src/main/resources/bootstrap.yml                                         |    2 
 7 files changed, 208 insertions(+), 6 deletions(-)

diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
index 7060d09..d1679eb 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
@@ -29,6 +29,7 @@
 import com.chinaztt.mes.basic.service.PartService;
 import com.chinaztt.mes.basic.util.DictUtils;
 import com.chinaztt.mes.basic.util.PartUtils;
+import com.chinaztt.mes.basic.vo.PartVo;
 import com.chinaztt.mes.common.util.JsonUtil;
 import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
 import com.chinaztt.ztt.admin.api.entity.SysDictItem;
@@ -80,6 +81,17 @@
 
 	@Autowired
 	private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
+
+	@ApiOperation(value = "瑙﹀彂闆朵欢", notes = "瑙﹀彂闆朵欢")
+	@SysLog("瑙﹀彂闆朵欢")
+	@PostMapping("/triggerAdd")
+	public R triggerAdd(@RequestBody PartVo partVo) {
+		return R.ok(partService.triggerAdd(partVo));
+	}
+
+
+
 	/**
 	 * 鍒嗛〉鏌ヨ
 	 *
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java
index 83eb458..67abf0c 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java
@@ -24,6 +24,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.chinaztt.mes.basic.entity.Part;
 import com.chinaztt.mes.basic.excel.PartData;
+import com.chinaztt.mes.basic.vo.PartVo;
 import com.chinaztt.ztt.common.core.util.R;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -134,4 +135,11 @@
 	Long syncNewIfs(String date);
 
     void asyncUploadExcel(MultipartFile file);
+
+	/**
+	 * 瑙﹀彂闆朵欢
+	 * @param partVo
+	 * @return
+	 */
+	String triggerAdd(PartVo partVo);
 }
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java
index 3efc91a..8ce1260 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java
@@ -39,6 +39,7 @@
 import com.chinaztt.mes.basic.util.DictUtils;
 import com.chinaztt.mes.basic.util.PartUtils;
 import com.chinaztt.mes.basic.util.TransactionUtils;
+import com.chinaztt.mes.basic.vo.PartVo;
 import com.chinaztt.mes.common.util.JsonUtil;
 import com.chinaztt.mes.common.util.MultipartFileToFile;
 import com.chinaztt.ztt.common.core.util.R;
@@ -57,6 +58,7 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.util.EntityUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.core.env.Environment;
@@ -311,11 +313,6 @@
 			throw new RuntimeException("闆朵欢鍙风増鏈彿閲嶅锛�" + partByFind.getPartName() + "-" + partByFind.getPartNo());
 		}
 		baseMapper.insert(part);
-		//瀵规帴IFS
-//		R result = ifsFeignClient.importInventPartStd(new JSONObject().fluentPut("BATCH_INFO", new JSONArray().fluentAdd(ifsDataMake(part))), true);
-//		if (result.getCode() == 1) {
-//			throw new RuntimeException("IFS閿欒鈥斺��" + result.getMsg());
-//		}
 		return true;
 	}
 
@@ -480,6 +477,50 @@
 		},threadPoolTaskExecutor);
 	}
 
+	//瑙﹀彂闆朵欢
+	@Override
+	public String triggerAdd(PartVo partVo) {
+		Part part = new Part();
+		BeanUtils.copyProperties(partVo,part);
+		//鍒涘缓鑰�
+		part.setCreateUser(partVo.getCreate_name());
+		//鏇存柊鑰�
+		part.setUpdateUser(partVo.getUpdate_name());
+		//闆朵欢鍙�
+		part.setPartNo(partVo.getMaterial_number());
+		//鍚嶇О
+		part.setPartName(partVo.getMaterial_name());
+		//闆朵欢鎻忚堪
+		part.setDescription(partVo.getMaterial_description());
+		//鍗曚綅
+		part.setUnit(partVo.getUnit());
+		//涓�绾у垎绫�
+		part.setAssortment(partVo.getFirstCategoryName());
+		//浜岀骇鍒嗙被
+		part.setCategory(partVo.getSecondCategoryName());
+		//涓夌骇鍒嗙被
+		part.setThreeLevelClassification(partVo.getThirdCategoryName());
+		//瑙勬牸
+		part.setSpecs(partVo.getMaterial_spec());
+		//鐗堟湰鍙�
+		part.setEngChgLevel(partVo.getTemplate_version().substring(1));
+		//璁″垝鏂规硶
+		part.setPlanningMethod("A");
+		//鍨嬪彿
+		part.setPartModel(partVo.getMaterial_spec());
+		if (partVo.getType().equals("add")){
+			baseMapper.insert(part);
+			return "鏂板"+part.getPartNo()+"闆朵欢鍙锋垚鍔�" ;
+		}else {
+			baseMapper.update(part,Wrappers.<Part>lambdaUpdate().eq(Part::getPartNo,part.getPartNo()));
+			return "淇敼"+part.getPartNo()+"闆朵欢鍙锋垚鍔�" ;
+		}
+	}
+
+
+
+
+
 	public void asyncExcel(MultipartFile file,Map<String, String> dicmattype,Map<String, String> dicunit){
 		File file1 = MultipartFileToFile.multipartFileToFile(file);
 		CsvReader reader = CsvUtil.getReader();
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PartVo.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PartVo.java
new file mode 100644
index 0000000..f1e0810
--- /dev/null
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PartVo.java
@@ -0,0 +1,99 @@
+package com.chinaztt.mes.basic.vo;
+
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+//瑙﹀彂闆朵欢鏂板
+@Data
+public class PartVo {
+
+	//绫诲瀷:鏂板/淇敼锛坅dd/edit锛�
+	private String type;
+
+	//妯℃澘id
+	private String template_id;
+
+	//妯℃澘Code
+	private String template_code;
+
+	//妯℃澘鐗堟湰
+	private String template_version;
+
+	//璇█
+	private String material_language;
+
+	//鐗╂枡缂栧彿
+	private String material_number;
+
+	//鍒嗙被璇︽儏
+	private String category_name;
+
+	//鍒嗙被id
+	private String category_id;
+
+	//鍘熼浂浠跺彿
+	private String ori_part_no;
+
+	//鐗╂枡鍚嶇О
+	private String material_name;
+
+	//鐗╂枡鍨嬪彿
+	private String material_spec;
+
+	//鐗╂枡鎻忚堪
+	private String material_description;
+
+	//鐗╂枡鍏朵粬灞炴��
+	private String material_explain;
+
+	//鐗╂枡鍗曚綅
+	private String unit;
+
+	//鍒涘缓鏃堕棿
+	private LocalDateTime createTime;
+
+	//鍒涘缓浜�
+	private String create_name;
+
+	//鏇存柊鏃堕棿
+	private LocalDateTime updateTime;
+
+	//鏇存柊浜�
+	private String update_name;
+
+	//涓�绾у垎绫荤紪鐮�
+	private String firstCategory;
+
+	//涓�绾у垎绫绘弿杩�
+	private String firstCategoryName;
+
+	//浜岀骇鍒嗙被缂栫爜
+	private String secondCategory;
+
+	//浜岀骇鍒嗙被鎻忚堪
+	private String secondCategoryName;
+
+	//涓夌骇鍒嗙被缂栫爜
+	private String thirdCategory;
+
+	//涓夌骇鍒嗙被鎻忚堪
+	private String thirdCategoryName;
+
+	//鐘舵��
+	private String status;
+
+	//鍚屾杩囩殑鍩�
+	private String syncSite;
+
+	//涓�у寲瀛楁
+	private List<PropertyVo> property;
+
+	//闆朵欢灞炴��
+	private List<PropertiesInfoVo> propertiesInfo;
+}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PropertiesInfoVo.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PropertiesInfoVo.java
new file mode 100644
index 0000000..f4dc7b9
--- /dev/null
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PropertiesInfoVo.java
@@ -0,0 +1,20 @@
+package com.chinaztt.mes.basic.vo;
+
+import lombok.Data;
+
+@Data
+//闆朵欢灞炴��
+public class PropertiesInfoVo {
+
+	//灞炴�ode
+	private String attribute_code;
+
+	//灞炴�у悕绉�
+	private String attribute;
+
+	//灞炴�у��
+	private String attribute_value;
+
+	//灞炴�у崟浣�
+	private String attribute_unit;
+}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PropertyVo.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PropertyVo.java
new file mode 100644
index 0000000..140f7aa
--- /dev/null
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/vo/PropertyVo.java
@@ -0,0 +1,22 @@
+package com.chinaztt.mes.basic.vo;
+
+import lombok.Data;
+
+@Data
+//涓�у寲瀛楁
+public class PropertyVo {
+
+
+	//涓�у寲瀛楁code
+	private String property_code;
+
+	//涓�у寲瀛楁鍚嶇О
+	private String property_name;
+
+	//涓�у寲瀛楁鎻忚堪
+	private String property_description;
+
+	//涓�у寲瀛楁鍊�
+	private String property_value;
+
+}
diff --git a/mes-web/src/main/resources/bootstrap.yml b/mes-web/src/main/resources/bootstrap.yml
index 1d6e43d..8947b51 100644
--- a/mes-web/src/main/resources/bootstrap.yml
+++ b/mes-web/src/main/resources/bootstrap.yml
@@ -8,7 +8,7 @@
       #      password: postgres123
       password: root2022
       #      灏勯寮�鍙戞暟鎹簱
-      url: jdbc:postgresql://127.0.0.1:5432/postgres
+      url: jdbc:postgresql://106.13.194.57:9015/postgres
   application:
     name: ztt-mes
   cloud:

--
Gitblit v1.9.3