From 2fb28b36f15de26249ae34160e1accf118c011c7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 17 十一月 2023 16:47:17 +0800
Subject: [PATCH] Changes16
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 60b2a39..50ec42c 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
@@ -480,6 +480,7 @@
//瑙﹀彂闆朵欢
@Override
public String triggerAdd(PartVo partVo) {
+ log.info("鎺ユ敹涓绘暟鎹钩鍙版暟鎹负===================銆�"+JSONObject.toJSONString(partVo));
Part part = new Part();
BeanUtils.copyProperties(partVo,part);
//鍒涘缓鑰�
@@ -489,9 +490,9 @@
//闆朵欢鍙�
part.setPartNo(partVo.getMaterial_number());
//鍚嶇О
- part.setPartName(partVo.getMaterial_name());
+ part.setPartName(partVo.getMaterial_description());
//闆朵欢鎻忚堪
- part.setDescription(partVo.getMaterial_description());
+ part.setDescription(partVo.getMaterial_name());
//鍗曚綅
part.setUnit(partVo.getUnit());
//涓�绾у垎绫�
@@ -509,13 +510,19 @@
//鍨嬪彿
part.setPartModel(partVo.getMaterial_spec());
if (partVo.getType().equals("add")){
- baseMapper.insert(part);
- return "鏂板"+part.getPartNo()+"闆朵欢鍙锋垚鍔�" ;
+ int insert = baseMapper.insert(part);
+ log.info("鏂板"+part.getPartNo()+"闆朵欢鍙锋垚鍔�");
+ return insert>0?"1":"0" ;
}else {
- baseMapper.update(part,Wrappers.<Part>lambdaUpdate().eq(Part::getPartNo,part.getPartNo()));
- return "淇敼"+part.getPartNo()+"闆朵欢鍙锋垚鍔�" ;
+ int update = baseMapper.update(part, Wrappers.<Part>lambdaUpdate().eq(Part::getPartNo, part.getPartNo()));
+ log.info("淇敼"+part.getPartNo()+"闆朵欢鍙锋垚鍔�");
+ return update>0?"1":"0" ;
}
}
+
+
+
+
public void asyncExcel(MultipartFile file,Map<String, String> dicmattype,Map<String, String> dicunit){
File file1 = MultipartFileToFile.multipartFileToFile(file);
@@ -547,6 +554,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