From 48cddae0c3d3c0f3653c1354c0ab2beb436189c5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 15:39:46 +0800
Subject: [PATCH] Changes13
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
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..abc3344 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();
@@ -510,6 +551,8 @@
no.add(rawList.get(1));
part.setPartName(rawList.get(2));
part.setDescription(rawList.get(3));
+ part.setDomainNo(rawList.get(4));
+ part.setDomainName(rawList.get(5));
part.setMaterialType(rawList.get(6));
part.setUnit(rawList.get(8));
part.setAssets(rawList.get(16));
--
Gitblit v1.9.3