From 351e542fd9cf676a5ecb16d83765518cc264da43 Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Fri, 22 Oct 2021 11:09:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?18062=2020065-=E6=96=B0=E5=A2=9E=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=A1=B6=E5=B1=82=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E8=BE=93=E5=85=A5=E5=92=8C=E8=BE=93=E5=87=BA=E6=83=85?=
 =?UTF-8?q?=E5=86=B5-20211019?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/aps/model/OrderFinishStatusModel.java     | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java
new file mode 100644
index 0000000..44919e9
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java
@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+/**
+ * 顶层订单完成情况
+ *
+ * @Description : OrderFinishStatusModel
+ * @Author :gsz
+ * @Date 2021/10/21 10:45
+ * @Modify
+ **/
+@Data
+@Api("顶层订单完成情况报表")
+public class OrderFinishStatusModel extends APSPager {
+    //订单号
+    private String topOrderNo;
+    //订单类型
+    private String orderType;
+    //物料编码
+    private String materialCode;
+    //工厂货品
+    private String materialName;
+    //商标编码
+    private String code;
+    //商标
+    private String logo;
+    //皮带标识编码
+    private String leatherSignId;
+    //皮带标识
+    private String sign;
+    //顶层订单数量
+    private Integer topOrderCount;
+    //库存扣减数量
+    private Integer inventoryBackCount;
+    //生产订单数量
+    private Integer productOrderCount;
+    //参与排程数量
+    private Double inScheduleCount;
+    //已下发数量
+    private Double confirmCount;
+    //已报工数量
+    private Double reportCount;
+    //牵纱排程数量
+    private Double trainbearerScheduleCount;
+    //覆胶排程数量
+    private Double coatingScheduleCount;
+    //包布排程数量
+    private Double wrappingScheduleCount;
+    //硫化排程数量
+    private Double sulfidationScheduleCount;
+
+
+}

From 365c9e927e6fb10dc829d33cffe85a18cae11a9e Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Fri, 5 Nov 2021 13:58:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?17789=2020065-=E6=8E=92=E7=A8=8B=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=94=99=E8=AF=AF=E9=9C=80=E8=A6=81=E5=9C=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8A=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?-20211009?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java
index f40114a..3e9821b 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java
@@ -35,6 +35,9 @@ public class RuleDetailModel {
     @ApiParam(value ="异常消息")
     private String exception = "";
 
+    @ApiParam(value ="错误信息")
+    private ImportErrorInfo errorInfo;
+
     public void addProcess() {
         this.curProcess += 1;
     }