From 4975e808dfca56c00314593d803c2bf5564217b8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 04 十一月 2023 17:24:45 +0800
Subject: [PATCH] Changes
---
mes-technology/src/main/resources/mapper/StructureMapper.xml | 11 +++++++++++
mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java | 1 +
mes-technology/src/main/java/com/chinaztt/mes/technology/entity/StructureComponent.java | 4 ++++
mes-technology/src/main/java/com/chinaztt/mes/technology/entity/Structure.java | 20 ++++++++++++++++++++
mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/StructureServiceImpl.java | 2 ++
5 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java
index 081b37e..18365c3 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/StructureController.java
@@ -195,6 +195,7 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('technology_structure_add')")
public R save(@RequestBody StructureDTO structure) {
+ System.out.println("===========================>"+structure);
return structureService.fullSave(structure);
}
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 6adf31e..9fd2503 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
@@ -129,4 +129,24 @@
*/
@ApiModelProperty(value = "鏄惁鍚屾ifs")
private Boolean ifsSync;
+
+ private String sharpenerNo;
+
+ private String caveNum;
+
+ private String gramWeight;
+
+ private String gateGramWeight;
+
+ private String moldingCycle;
+
+ private String machine;
+
+ private String scale;
+
+ private String dryingTime;
+
+ private String dryingTemperature;
+
+ private String packingInfo;
}
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/StructureComponent.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/StructureComponent.java
index 6794e38..dd6cf63 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/StructureComponent.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/StructureComponent.java
@@ -107,4 +107,8 @@
private String dryingTemperature;
private String packingInfo;
+
+ private String specs;
+
+ private String partModel;
}
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 9acf37a..9176fb3 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
@@ -353,6 +353,8 @@
@Override
public R fullSave(StructureDTO structure) {
+ System.out.println(structure);
+ System.out.println("===============================");
int noCount = baseMapper.selectCount(Wrappers.<Structure>lambdaQuery()
.eq(Structure::getAlternativeNo, structure.getAlternativeNo())
.eq(Structure::getBomTypeDb, structure.getBomTypeDb())
diff --git a/mes-technology/src/main/resources/mapper/StructureMapper.xml b/mes-technology/src/main/resources/mapper/StructureMapper.xml
index a6a97d4..ecba329 100644
--- a/mes-technology/src/main/resources/mapper/StructureMapper.xml
+++ b/mes-technology/src/main/resources/mapper/StructureMapper.xml
@@ -37,6 +37,16 @@
<result property="alternativeNo" column="alternative_no"/>
<result property="alternativeDesc" column="alternative_desc"/>
<result property="ifsSync" column="ifs_sync"/>
+ <result property="sharpenerNo" column="sharpener_no"/>
+ <result property="caveNum" column="cave_num"/>
+ <result property="gramWeight" column="gram_weight"/>
+ <result property="gateGramWeight" column="gate_gram_weight"/>
+ <result property="moldingCycle" column="molding_cycle"/>
+ <result property="machine" column="machine"/>
+ <result property="scale" column="scale"/>
+ <result property="dryingTime" column="drying_time"/>
+ <result property="dryingTemperature" column="drying_temperature"/>
+ <result property="packingInfo" column="packing_info"/>
</resultMap>
<resultMap id="structureComponentMap" type="com.chinaztt.mes.technology.dto.StructureComponentDTO">
@@ -55,6 +65,7 @@
<result property="lineItemNo" column="line_item_no"/>
<result property="color" column="color"/>
<result property="planningMethod" column="planning_method"/>
+
</resultMap>
<resultMap id="structureComponentDtoMap" type="com.chinaztt.mes.technology.dto.StructureDTO">
--
Gitblit v1.9.3