|
@@ -147,8 +147,8 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
|
|
|
@DSTransactional
|
|
|
@Override
|
|
|
public void add(TechnologyDto technologyDto) {
|
|
|
- String join = String.join(",", technologyDto.getProcessRouteList());
|
|
|
- technologyDto.setProcessRoute(join);
|
|
|
+
|
|
|
+
|
|
|
this.save(technologyDto);
|
|
|
List<ApplicableProducts> productList = technologyDto.getProductList();
|
|
|
for (ApplicableProducts applicableProducts : productList) {
|
|
@@ -166,8 +166,8 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
|
|
|
@DSTransactional
|
|
|
@Override
|
|
|
public void edit(TechnologyDto technologyDto) {
|
|
|
- String join = String.join(",", technologyDto.getProcessRouteList());
|
|
|
- technologyDto.setProcessRoute(join);
|
|
|
+
|
|
|
+
|
|
|
this.updateById(technologyDto);
|
|
|
List<ApplicableProducts> productList = technologyDto.getProductList();
|
|
|
applicableProductsService.remove(q -> q.eq(ApplicableProducts::getTechnologyId, technologyDto.getId()));
|
|
@@ -223,7 +223,7 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
|
|
|
|
|
|
TechnologyProcessLine technologyProcessLine = new TechnologyProcessLine();
|
|
|
|
|
|
- if (sourceCell.equals("1") || sourceCell.equals("2")) {
|
|
|
+ if (sourceCell.equals("1") || sourceCell.equals("99")) {
|
|
|
technologyProcessLine.setSourceProcessesId(Long.parseLong(sourceCell));
|
|
|
} else {
|
|
|
JSONObject from = nodeMap.get(sourceCell);
|
|
@@ -231,7 +231,7 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
|
|
|
technologyProcessLine.setSourceProcessesId(from.getLong("productionId"));
|
|
|
}
|
|
|
|
|
|
- if (targetCell.equals("1") || targetCell.equals("2")) {
|
|
|
+ if (targetCell.equals("1") || targetCell.equals("99")) {
|
|
|
technologyProcessLine.setTargetProcessesId(Long.parseLong(targetCell));
|
|
|
} else {
|
|
|
JSONObject to = nodeMap.get(targetCell);
|