修改启用到启用中...

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldController.java

@@ -46,7 +46,7 @@ public class MouldController {
      * 修改参数：id 模具id, settingLife 使用年限， initialModulus 初始模次 equipmentId 设备id，
      * produceCompanyId 生产方公司id,ocCycle 每模平均周期,rfid rfid码，maintainCount 保养设定次数："1,2,3"
      *
-     * materialType 材料牌号,color 颜色,size 模具尺寸,tonnage 吨位,mallWeight 成品重量(单位:G),headWeight 料头重量(单位:G)
+     * materialType 材料牌号,color 颜色,size 模具尺寸,machineTonnage 吨位,mallWeight 成品重量(单位:G),headWeight 料头重量(单位:G)
      * maxShotWeight 最大射胶量(单位:G),minShotWeight 最小射胶量(单位:G),cycle 成型周期,commonModelTemperature 公模(动模)模温
      * motherModelTemperature 母模(定模)模温
      * 模具更新时多传的参数  preUpdateId 要被更新的模具的id dynamicId

cloud-model/src/main/java/com/hssx/cloudmodel/entity/InjectionMolding.java

@@ -45,8 +45,8 @@ public class InjectionMolding extends Model<InjectionMolding> {
     /**
      * 吨位
      */
-    @TableField("tonnage")
-    private String tonnage;
+    @TableField("machine_tonnage")
+    private String machineTonnage;
 
     /**
      * 成品重量(单位:G)
@@ -135,12 +135,12 @@ public class InjectionMolding extends Model<InjectionMolding> {
         this.size = size;
     }
 
-    public String getTonnage() {
-        return tonnage;
+    public String getMachineTonnage() {
+        return machineTonnage;
     }
 
-    public void setTonnage(String tonnage) {
-        this.tonnage = tonnage;
+    public void setMachineTonnage(String machineTonnage) {
+        this.machineTonnage = machineTonnage;
     }
 
     public Double getAllWeight() {
@@ -227,7 +227,7 @@ public class InjectionMolding extends Model<InjectionMolding> {
         ", materialType=" + materialType +
         ", color=" + color +
         ", size=" + size +
-        ", tonnage=" + tonnage +
+        ", machineTonnage=" + machineTonnage +
         ", allWeight=" + allWeight +
         ", headWeight=" + headWeight +
         ", minShotWeight=" + minShotWeight +

cloud-model/src/main/resources/mapper/InjectionMoldingMapper.xml

@@ -8,7 +8,7 @@
         <result column="material_type" property="materialType" />
         <result column="color" property="color" />
         <result column="size" property="size" />
-        <result column="tonnage" property="tonnage" />
+        <result column="machine_tonnage" property="machineTonnage" />
         <result column="all_weight" property="allWeight" />
         <result column="head_weight" property="headWeight" />
         <result column="min_shot_weight" property="minShotWeight" />
@@ -22,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        injection_id, material_type, color, size, tonnage, all_weight, head_weight, min_shot_weight, max_shot_weight, cycle, common_model_temperature, mother_model_temperature, mould_id, equipment_no
+        injection_id, material_type, color, size, machine_tonnage, all_weight, head_weight, min_shot_weight, max_shot_weight, cycle, common_model_temperature, mother_model_temperature, mould_id, equipment_no
     </sql>
 
 </mapper>