From 17eb62f9d9cb2706296ea35f241dd8aafbebd6f2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期日, 12 十一月 2023 05:17:08 +0800
Subject: [PATCH] Changes11
---
mes-basic/src/main/resources/mapper/PartMapper.xml | 2 ++
mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java | 6 ++++++
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java | 2 ++
mes-technology/src/main/java/com/chinaztt/mes/technology/entity/Structure.java | 1 +
mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/StructureServiceImpl.java | 16 +++++++++++++++-
mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureData.java | 3 +++
6 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java
index c80ad72..e1bc30e 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java
@@ -255,6 +255,12 @@
@ApiModelProperty(value = "鏄惁鍘熸潗鏂欐")
private Integer testRuleType;
+ @Alias("鍩�")
+ private String domainNo;
+
+ @Alias("鍩熸弿杩�")
+ private String domainName;
+
@Alias("鏄惁璁惧澶囦欢")
private String isEquipment;
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 8ce1260..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
@@ -551,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));
diff --git a/mes-basic/src/main/resources/mapper/PartMapper.xml b/mes-basic/src/main/resources/mapper/PartMapper.xml
index 1384fcf..82d9830 100644
--- a/mes-basic/src/main/resources/mapper/PartMapper.xml
+++ b/mes-basic/src/main/resources/mapper/PartMapper.xml
@@ -52,6 +52,8 @@
<result property="examiner" column="examiner"/>
<result property="prodName" column="prod_name"/>
<result property="partPitch" column="part_pitch"/>
+ <result property="domainNo" column="domain_no"/>
+ <result property="domainName" column="domain_name"/>
</resultMap>
<sql id="partPage">
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/Structure.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/Structure.java
index 52048b5..8ef181b 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/Structure.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/Structure.java
@@ -130,6 +130,7 @@
@ApiModelProperty(value = "鏄惁鍚屾ifs")
private Boolean ifsSync;
+
private String sharpenerNo;
private String caveNum;
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureData.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureData.java
index f359e3f..8999bad 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureData.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureData.java
@@ -28,6 +28,9 @@
@ExcelProperty(value = "娑堣�楀伐搴�")
private String operationName;
+ @ExcelProperty(value = "鏁伴噺")
+ private String totalNUm;
+
@ExcelProperty(value = "妯″叿缂栧彿")
private String sharpenerNo;
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/StructureServiceImpl.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/StructureServiceImpl.java
index eef703c..63986d6 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/StructureServiceImpl.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/StructureServiceImpl.java
@@ -55,6 +55,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
@@ -85,6 +86,8 @@
private NumberGenerator<Structure> numberGenerator;
private DictUtils dictUtils;
private IfsFeignClient ifsFeignClient;
+ @Autowired
+ private PlatformTransactionManager transactionManager;
private RedisTemplate redisTemplate;
@Autowired
@@ -269,6 +272,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void importExcel(List<StructureData> list) {
+ list.forEach(System.out::println);
String key = "syncStructure_lock" + SecurityUtils.getUser().getId();
if (redisTemplate.hasKey(key)) {
throw new RuntimeException("鏈夊鍏ヤ换鍔℃鍦ㄥ鐞�");
@@ -302,6 +306,16 @@
structure.setBomTypeDb("M");
structure.setIfsSync(false);
structure.setAlternativeNo("*");
+ structure.setSharpenerNo(data.getSharpenerNo());
+ structure.setCaveNum(data.getCaveNum());
+ structure.setGramWeight(data.getGramWeight());
+ structure.setMoldingCycle(data.getMoldingCycle());
+ structure.setMachine(data.getMachine());
+ structure.setScale(data.getScale());
+ structure.setDryingTime(data.getDryingTime());
+ structure.setDryingTemperature(data.getDryingTemperature());
+ structure.setPackingInfo(data.getPackingInfo());
+ structure.setCustom(data.getCustom());
baseMapper.insert(structure);
}
List<Part> childParts = partMapper.selectList(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, data.getSonPartNo()));
@@ -319,7 +333,7 @@
QueryWrapper<StructureComponent> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().select(StructureComponent::getLineItemNo).eq(StructureComponent::getStructureId,structure.getId()).orderByDesc(StructureComponent::getLineItemNo);
List<StructureComponent> structureComponents = structureComponentMapper.selectList(queryWrapper);
- component.setQpa(new BigDecimal(1));// todo: 浜у搧缁撴瀯瀵煎叆鏁伴噺,杩樼己涓�涓鍙�
+ component.setQpa(new BigDecimal(data.getTotalNUm()));// todo: 浜у搧缁撴瀯瀵煎叆鏁伴噺,杩樼己涓�涓鍙�
Console.log("鍊�===銆�"+structureComponents);
if(structureComponents.size()<1){
component.setLineItemNo(1);
--
Gitblit v1.9.3