From bd3e32d39ee13b074cd5110f152aa3331d5907d2 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 16 Jul 2020 15:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=9E=AA=E8=B0=83=E8=AF=95=E5=AE=8C?= =?UTF-8?q?=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java | 2 ++ .../i3plus/pojo/model/mes/TorqueCollectionModel.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java index 9547b4c..2ca1917 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java @@ -18,5 +18,7 @@ public class PsetModel { private Integer psetCount; + private Integer actualCount; + private boolean torqueStatus; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index b3cf6be..374d58e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -219,14 +219,14 @@ public class TorqueCollectionModel implements Serializable { } private void assemblePsets() { - psets.put("pset1", new PsetModel("pset1", 1, this.pset1, false)); - psets.put("pset2", new PsetModel("pset2", 2, this.pset2, false)); - psets.put("pset3", new PsetModel("pset3", 3, this.pset3, false)); - psets.put("pset4", new PsetModel("pset4", 4, this.pset4, false)); - psets.put("pset5", new PsetModel("pset5", 5, this.pset5, false)); - psets.put("pset6", new PsetModel("pset6", 6, this.pset6, false)); - psets.put("pset7", new PsetModel("pset7", 7, this.pset7, false)); - psets.put("pset8", new PsetModel("pset8", 8, this.pset8, false)); + psets.put("pset1", new PsetModel("pset1", 1, this.pset1, 0, false)); + psets.put("pset2", new PsetModel("pset2", 2, this.pset2, 0, false)); + psets.put("pset3", new PsetModel("pset3", 3, this.pset3, 0, false)); + psets.put("pset4", new PsetModel("pset4", 4, this.pset4, 0, false)); + psets.put("pset5", new PsetModel("pset5", 5, this.pset5, 0, false)); + psets.put("pset6", new PsetModel("pset6", 6, this.pset6, 0, false)); + psets.put("pset7", new PsetModel("pset7", 7, this.pset7, 0, false)); + psets.put("pset8", new PsetModel("pset8", 8, this.pset8, 0, false)); } }