From 582ef23ca3c9f53dbdf26106fed7083556bb97f8 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Tue, 27 Oct 2020 13:10:16 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8DSWEB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
index 1b9d541..50964f2 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
@@ -52,11 +52,7 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
-        if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) {
-            DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
-        } else {
-            DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
-        }
+        DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
         if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
             DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
                     purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);

From 24acb86dff63ae3c476ddfc7fb33049770fe8a63 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Tue, 27 Oct 2020 13:19:42 +0800
Subject: [PATCH 02/20] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2&=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java   | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
index c6e6c68..183ab40 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
@@ -332,4 +332,28 @@ public class WmsStockQuan extends BaseBean {
         this.scrapQty = scrapQty;
         this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty;
     }
+
+    public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName,
+                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
+                        Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty, String areaNo) {
+        this.organizeCode = organizeCode;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.unit = unit;
+        this.partNo = partNo;
+        this.partNameRdd = partName;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.totalQty = totalQty;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.prodCfgTypeName = prodCfgTypeName;
+        this.scrapQty = scrapQty;
+        this.areaNo = areaNo;
+    }
 }

From d9040143f92d1e4cfc0300615fe3aba6fe0a415a Mon Sep 17 00:00:00 2001
From: songss <songss>
Date: Tue, 27 Oct 2020 14:45:00 +0800
Subject: [PATCH 03/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=88=AA?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=9C=8B=E6=9D=BF-=E6=AF=8F=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E4=BA=A7=E9=87=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java
new file mode 100644
index 0000000..5e12c33
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :中航-每小时产量
+ * @Reference :
+ * @author: dominic
+ * @date: 2020/10/23 13:46
+ * @Modify:
+ */
+
+@Data
+public class MesBoardHourProductCountModel {
+    @ApiParam("时间段")
+    private String hour;
+
+    @ApiParam("计数")
+    private Integer count;
+}

From 6fcf32aa805f5786196364f8801f80ec93bc36bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Tue, 27 Oct 2020 17:51:22 +0800
Subject: [PATCH 04/20] =?UTF-8?q?=E3=80=902890=2010=202.3.8=E5=AE=89?=
 =?UTF-8?q?=E7=81=AF=E4=BD=9C=E4=B8=9A=E4=BC=98=E5=8C=96=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java    | 4 ++++
 .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java   | 2 +-
 .../java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java    | 4 ++++
 .../java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java    | 8 ++++++--
 .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java   | 3 ++-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
index aad4948..d6fe7d9 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
@@ -294,6 +294,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
     @ApiParam(value ="故障时长-分钟")
     private Integer brokenTime;
 
+    @Transient
+    @ApiParam(value ="故障字符串")
+    private String faultStr;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
index 3e41a51..66377b6 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
@@ -36,7 +36,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api("安灯记录")
+@Api("去去去去去去去去去安灯记录")
 public class AndonManageRecord extends BaseManageQueue implements Serializable {
 
     private static final long serialVersionUID = 4667499369694353351L;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java
index cf92a50..df23bab 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java
@@ -103,4 +103,8 @@ public class AndonQueueAttach extends BaseBean implements Serializable {
     @ApiParam(value ="生产累计件数")
     private Integer totalProdNum;
 
+    @Column(name="FAULT_STR")
+    @ApiParam(value ="故障字符串")
+    private String faultStr;
+
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index cdd5365..969ad3f 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -904,6 +904,7 @@ public class AndonEnumUtil {
     /**
      * 按灯业务状态
      * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60, 产品信息=70， 产品产量=80
+     * 20201027 增加安灯状态 90 =优先级, 10 =故障字符串
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_BUSI_FLAG{
@@ -914,7 +915,9 @@ public class AndonEnumUtil {
         DETAIL_TYPE("50", "安灯子类型"),
         AC_CODE("60", "原因代码"),
         PROD_INFO("70", "产品信息"),
-        LINE_INFO("80", "产量信息");
+        LINE_INFO("80", "产量信息"),
+        PRIORITY_LEVEL("90", "优先级"),
+        FAULT_STR("100", "故障字符串");
 
         private String value;
         private String description;
@@ -1063,7 +1066,8 @@ public class AndonEnumUtil {
     public enum ALARM_PRIORITY{
         FIRST(10,"一级"),
         SECOND(20,"二级"),
-        THIRD(30,"三级");
+        THIRD(30,"三级"),
+        FOUR(40,"四级");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 427a4a9..27b6637 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -1454,7 +1454,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WC_CHECK_TYPE {
         MATERIAL(10, "MATERIAL", "物料"),
-        ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号");
+        ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"),
+        WORK_ORDER(30, "WORK_ORDER", "工单信息");
 
         private int value;
         private String code;

From 5227540ecce5c3acf1a35fd504081f56b51d319c Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Tue, 27 Oct 2020 20:08:01 +0800
Subject: [PATCH 05/20] =?UTF-8?q?=E9=98=9F=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group1/default/20201021/15/50/3/123123123123.jpeg   | Bin 0 -> 15453 bytes
 .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java    |   4 +++-
 .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java |  11 ++++++-----
 .../estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java |   5 ++++-
 .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java |  13 ++++++++-----
 .../i3plus/pojo/mes/bean/MesWorkCellPointGroup.java     |  13 ++++++++-----
 6 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg

diff --git a/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg b/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..76e3cc08327fad7535079cc68b173c9616218511
GIT binary patch
literal 15453
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
KCY0qahW`)xJG<Th

literal 0
HcmV?d00001

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
index 831d8c6..6b1f00b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
@@ -25,7 +25,9 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_ORDER", indexes = {
-        @Index(columnList = "CUST_FLAG_NO")
+        @Index(columnList = "CUST_FLAG_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "ORDER_NO")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
 })
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
index 61ad875..4799548 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -27,7 +24,11 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_ORDER_BOM")
+@Table(name = "MES_QUEUE_ORDER_BOM", indexes = {
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO")
+})
 @Api("MES_生产队列散件清单")
 public class MesQueueOrderBom extends BaseBean  implements Serializable {
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
index ffc36d6..cf3da4b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@@ -25,7 +25,10 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
-        @Index(columnList = "ORDER_NO")
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "QUEUE_GROUP_NO"),
+        @Index(columnList = "PRODUCE_CATEGORY_CODE")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO", "PRODUCE_CATEGORY_CODE"})
 })
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
index fb8ef53..89f73bc 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
@@ -11,10 +11,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
@@ -30,7 +27,13 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_CELL_POINT")
+@Table(name = "MES_WORK_CELL_POINT", indexes = {
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE"),
+        @Index(columnList = "QUEUE_SEQ"),
+        @Index(columnList = "QUEUE_DETAIL_SEQ")
+})
 @Api("工站队列")
 public class MesWorkCellPoint extends BaseBean implements Serializable {
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
index 4ca4471..400909b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -27,7 +24,13 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_CELL_POINT_GROUP")
+@Table(name = "MES_WORK_CELL_POINT_GROUP", indexes = {
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE"),
+        @Index(columnList = "QUEUE_GROUP_NO"),
+        @Index(columnList = "ORDER_NO")
+})
 @Api("工站分组队列")
 public class MesWorkCellPointGroup extends BaseBean implements Serializable {
 

From 7c15ec079ce5e95c8f7d865b016d236fb1841498 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Tue, 27 Oct 2020 20:09:11 +0800
Subject: [PATCH 06/20] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group1/default/20201021/15/50/3/123123123123.jpeg   | Bin 15453 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg

diff --git a/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg b/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg
deleted file mode 100644
index 76e3cc08327fad7535079cc68b173c9616218511..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15453
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
KCY0qahW`)xJG<Th


From 6f239ee7563b1cac13eff4752c36ae2beaa59918 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Tue, 27 Oct 2020 20:33:18 +0800
Subject: [PATCH 07/20] =?UTF-8?q?Fix=20bug#12019=2012019-KT=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=EF=BC=88=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=8F=91=E8=BF=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
index bc69da7..1e25ec8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@@ -278,6 +278,18 @@ public class WmsPOMasterDetails extends BaseBean {
         this.qty = qty;
     }
 
+    public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime,
+                              Double snp, Long totalBoxes, Double qty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.planDate = planDate;//批次号（yyyyMMdd）
+        this.planTime = planTime;//批次号（yyyyMMdd）
+        this.snp = snp;
+        this.totalBoxes = totalBoxes.intValue();
+        this.qty = qty;
+    }
+
     public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty,
                               Double rcQty, Integer itemStatus) {
         this.orderNo = orderNo;

From b6a309bacfbba8eb0bfa30f02f06a09e16599b7a Mon Sep 17 00:00:00 2001
From: "rock.yu" <rock.yu@estsh.com>
Date: Tue, 27 Oct 2020 20:36:37 +0800
Subject: [PATCH 08/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20ERP=20=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E6=95=B0=E6=8D=AE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/bean/snapshot/erp/WmsErpQuanAreas.java     | 33 ++++++++++++++++++++++
 .../wms/repository/WmsErpCheckPointRepository.java |  9 ++++++
 .../wms/repository/WmsErpQuanAreasRepository.java  |  9 ++++++
 3 files changed, 51 insertions(+)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java
new file mode 100644
index 0000000..7e712f7
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java
@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : ERP 库存比对包含的库存地点
+ * @Reference :
+ * @Author : rock.yu
+ * @CreateDate : 2020-10-27 14:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ERP_QUAN_AREAS")
+public class WmsErpQuanAreas extends BaseBean {
+    private static final long serialVersionUID = 5560607687871639209L;
+
+    @Column(name="AREA_NO")
+    @ApiParam("库存地点")
+    public String area_no;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java
new file mode 100644
index 0000000..e21870a
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCheckPoint;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WmsErpCheckPointRepository extends BaseRepository<WmsErpCheckPoint, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java
new file mode 100644
index 0000000..02b6561
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpQuanAreas;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WmsErpQuanAreasRepository extends BaseRepository<WmsErpQuanAreas, Long> {
+}

From 36928196c1bb7f38e42f047a6468bfc5d743e094 Mon Sep 17 00:00:00 2001
From: songss <songss>
Date: Tue, 27 Oct 2020 21:01:18 +0800
Subject: [PATCH 09/20] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E7=9C=8B=E6=9D=BF-?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=94=E5=9B=9E=E6=8E=A5=E5=8F=A3=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java  | 4 ++++
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java     | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java
index ae43578..bbbb380 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java
@@ -37,4 +37,8 @@ public class MesBoardPicture extends BaseBean implements Serializable {
     @Column(name = "PICTURE_URL")
     @ApiParam("图片路径")
     private String pictureUrl;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java
index be79660..b2638a3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java
@@ -33,12 +33,12 @@ public class MesBoardSwitchCfg extends BaseBean implements Serializable {
     @ApiParam("看板代码")
     private String boardCode;
 
-    @Column(name = "SWITCH_INTERRVAL")
+    @Column(name = "SWITCH_INTERVAL")
     @ApiParam("屏切换频次")
-    private Integer switchInterrval;
+    private Integer switchInterval;
 
-    @Column(name = "LINE_SWITCH_INTERRVAL")
+    @Column(name = "LINE_SWITCH_INTERVAL")
     @ApiParam("产线切换频次")
-    private Integer lineSwitchInterrval;
+    private Integer lineSwitchInterval;
 
 }

From 3ad59884a85fe9e60a539caad13661732687d79a Mon Sep 17 00:00:00 2001
From: "rock.yu" <rock.yu@estsh.com>
Date: Tue, 27 Oct 2020 21:43:56 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84=E6=8F=90=E5=89=8D=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java
index e221563..79b7084 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java
@@ -72,6 +72,11 @@ public class WmsWorkCenter extends BaseBean {
             searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String descLocationCode;
 
+    @Column(name = "PRE_WO_MINUTE", columnDefinition = "int default 600")
+    @ApiParam(value = "计算未完成工单的提前时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer preWoMinute;
+
     @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180")
     @ApiParam(value = "提前拉动时间")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)

From 1b6264e80da44af77758e0725ed0b12add32421a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Wed, 28 Oct 2020 09:36:33 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?=
 =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
index 8754eae..f308538 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
@@ -20,6 +20,21 @@ public class MgnBoardListModel {
     @ApiParam("当班实际产量")
     private Double shiftActualYield;
 
+    @ApiParam("当前时间分钟")
+    private String currentMinTime;
+
+    /**
+     * 开班时间到当前时间按分钟累计计划数量
+     */
+    @ApiParam("每分钟计划产量")
+    private Double minPlanYield;
+
+    /**
+     * 开班时间到当前时间按分钟累计实际数量
+     */
+    @ApiParam("每分钟实际产量")
+    private Double minActualYield;
+
     @ApiParam("计划完成率")
     private String planCompleteRate;
 

From 760307910a3abd9a1984a2ca2bf858a2f8427c03 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Wed, 28 Oct 2020 10:52:30 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E5=A4=A9=E6=B4=A5MGN=E7=B3=BB=E5=88=97BU?=
 =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/modelbean/WmsVendorDelayMasterModel.java   | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java
index a3fd7c8..b327dc3 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java
@@ -17,6 +17,12 @@ import lombok.Data;
 public class WmsVendorDelayMasterModel extends BaseBean {
 
     private static final long serialVersionUID = 1589775350017343999L;
+    @ApiParam(value = "订单号")
+    private String orderNo;
+
+    @ApiParam(value = "原因")
+    public String reason;
+
     @ApiParam(value = "供应商代码")
     private String vendorNo;
 
@@ -26,12 +32,28 @@ public class WmsVendorDelayMasterModel extends BaseBean {
     @ApiParam(value = "延迟次数")
     private Long delayCount;
 
+    @ApiParam(value = "延迟次数")
+    private Long sumDelayCount;
+
     @ApiParam(value = "查询开始时间")
     private String startDateTime;
 
     @ApiParam(value = "查询结束时间")
     private String endDateTime;
 
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @ApiParam("实际交货时间")
+    private String actualPlanTime;
+
+    @ApiParam("计划交货时间")
+    private String planPlanDateTime;
+
+
     public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) {
         this.vendorNo = vendorNo;
         this.vendorName = vendorName;
@@ -40,6 +62,22 @@ public class WmsVendorDelayMasterModel extends BaseBean {
         this.createDatetime = createDateTime;
     }
 
+    public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, String actualPlanTime, String vendorNo, String vendorName, String organizeCode) {
+        this.orderNo = orderNo;
+        this.reason = reason;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.actualPlanTime = actualPlanTime;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.organizeCode = organizeCode;
+    }
+
+    public WmsVendorDelayMasterModel(String vendorNo, Long delayCount) {
+        this.vendorNo = vendorNo;
+        this.delayCount = delayCount;
+    }
+
     public WmsVendorDelayMasterModel() {
 
     }

From f57be38c2bd8bee3271e099dcdb17cc05e5a9246 Mon Sep 17 00:00:00 2001
From: Dominic_Xiao <1003069915@qq.com>
Date: Wed, 28 Oct 2020 11:28:33 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG:=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95-=E6=96=B0=E5=BB=BA=E5=AE=8C=E6=AF=95?=
 =?UTF-8?q?=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?->=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=9A=84SQL=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
index c55e93f..7f56701 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@@ -580,7 +580,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public int listCount() {
         try{
-            Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class)
+            Long count = entityManager.createQuery("select count(0) from " + persistentClass.getName() + " as model", Long.class)
                     .getSingleResult();
             return count == null ? 0 : count.intValue();
         }catch(NoResultException e){

From 4684466e7e174a6fa1621db9230477bff5075f7b Mon Sep 17 00:00:00 2001
From: Dominic_Xiao <1003069915@qq.com>
Date: Wed, 28 Oct 2020 14:53:37 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG:19048-=E7=8F=AD?=
 =?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?:=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=9A=84SQL=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
index 7f56701..770d14b 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@@ -886,7 +886,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public int findByHqlWhereCount(DdlPackBean packBean) {
         StringBuffer queryString = new StringBuffer();
-        queryString.append("select count(model) from " + persistentClass.getSimpleName()
+        queryString.append("select count(0) from " + persistentClass.getSimpleName()
                 + " as model where 1=1 " + packBean.getWhereAppend());
 
         Query query = entityManager.createQuery(queryString.toString(), Long.class);

From 5e1d0a75c965044961bb8009c9c948c3ceb09b92 Mon Sep 17 00:00:00 2001
From: Dominic_Xiao <1003069915@qq.com>
Date: Wed, 28 Oct 2020 15:07:43 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG:19048-=E7=8F=AD?=
 =?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?->=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84SQL=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
index 770d14b..7f56701 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@@ -886,7 +886,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public int findByHqlWhereCount(DdlPackBean packBean) {
         StringBuffer queryString = new StringBuffer();
-        queryString.append("select count(0) from " + persistentClass.getSimpleName()
+        queryString.append("select count(model) from " + persistentClass.getSimpleName()
                 + " as model where 1=1 " + packBean.getWhereAppend());
 
         Query query = entityManager.createQuery(queryString.toString(), Long.class);

From df35a22aac9b7f025223e2a4f8fbabe005c042a0 Mon Sep 17 00:00:00 2001
From: Dominic_Xiao <1003069915@qq.com>
Date: Wed, 28 Oct 2020 15:10:02 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG#12121=20=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=8D=95-=20=E6=96=B0=E5=BB=BA=E5=AE=8C?=
 =?UTF-8?q?=E6=AF=95=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0:=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E7=9A=84SQL=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
index 7f56701..2ad2a01 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@@ -580,7 +580,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public int listCount() {
         try{
-            Long count = entityManager.createQuery("select count(0) from " + persistentClass.getName() + " as model", Long.class)
+            Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model", Long.class)
                     .getSingleResult();
             return count == null ? 0 : count.intValue();
         }catch(NoResultException e){

From d7bad41b2940930bd1d375ee2da7819eb0e42a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Wed, 28 Oct 2020 17:01:29 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?=
 =?UTF-8?q?=E7=BA=B3BUG#12111=EF=BC=8C12110=EF=BC=8C12108=EF=BC=8C12105?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
index 183ab40..542301e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
@@ -356,4 +356,10 @@ public class WmsStockQuan extends BaseBean {
         this.scrapQty = scrapQty;
         this.areaNo = areaNo;
     }
+
+    public WmsStockQuan(String partNo, String partNameRdd, Double qty) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+    }
 }

From c9378a7d8cb7ca6abc8ae913f7d229f04daeeaf4 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Wed, 28 Oct 2020 19:37:52 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E3=80=9011959=2019125+PDA=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=8B=86=E5=88=86=E6=95=B0=E9=87=8F=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?100=E9=83=A8=E5=88=86=EF=BC=8C=E6=9D=A1=E7=A0=81=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E4=B8=8D=E5=A2=9E=E5=8A=A0=E3=80=82+1020=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java  | 4 ++--
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
index e336469..c136a32 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
@@ -237,7 +237,7 @@ public class DdlPreparedPack {
      */
     public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
-            packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%");
+            packBean.addColumnQuery("rl_"+columnName, " and model." + columnName + " like :m_rl_" + columnName, val + "%");
         }
     }
 
@@ -250,7 +250,7 @@ public class DdlPreparedPack {
      */
     public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
-            packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val);
+            packBean.addColumnQuery("ll_"+columnName, " and model." + columnName + " like :m_ll_" + columnName, "%" + val);
         }
     }
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 293f70d..f036e0d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -1749,11 +1749,14 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
-        DdlPreparedPack.getOrderByPack(
+        /*DdlPreparedPack.getOrderByPack(
                 new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE},
-                new String[]{"sn", "createDatetime"}, result);
+                new String[]{"sn", "createDatetime"}, result);*/
+//        result.setWhereAppend(result.getWhereAppend() + " and sn <> '"+wmsStockSn.getSn()+"'");
+
         return result;
     }
 

From f57f4e25be275d94de508184790e667313534826 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Wed, 28 Oct 2020 22:00:29 +0800
Subject: [PATCH 19/20] =?UTF-8?q?mgn-bj=20=E6=80=BB=E5=B1=8F=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 40 +++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java |  4 +++
 .../i3plus/pojo/mes/model/QueueJitActualModel.java |  8 +++++
 .../i3plus/pojo/mes/model/mgnbj/BjBoardModel.java  | 41 ++++++++++++++++++++++
 .../pojo/mes/model/mgnbj/BjBoardSeriesModel.java   | 18 ++++++++++
 5 files changed, 111 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index a0e0dde..fa8307a 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -7972,4 +7972,44 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 看板-安灯监控状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_QUEUE_STATUS {
+        CALL(10, "呼叫"),
+        RESPONSE(20, "响应"),
+        SOLVE(30, "解决");
+
+        private int value;
+        private String description;
+
+        ANDON_QUEUE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
index 0739b8d..4e32b80 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
@@ -98,4 +98,8 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("工位类型名称")
     private String workCellTypeName;
 
+    @Transient
+    @ApiParam("安灯呼叫状态")
+    private Integer andonQueueStatus;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java
index 31edd81..5e40bdc 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java
@@ -111,4 +111,12 @@ public class QueueJitActualModel {
         this.createDatetime = createDatetime;
     }
 
+    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String produceCtgyCode, String custPlantCode, String createDatetime) {
+        this.id = id;
+        this.vinCode = vinCode;
+        this.jisActualNo = jisActualNo;
+        this.produceCtgyCode = produceCtgyCode;
+        this.custPlantCode = custPlantCode;
+        this.createDatetime = createDatetime;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java
new file mode 100644
index 0000000..421d7e5
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java
@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/10/28 11:27 AM
+ * @Modify:
+ */
+@Data
+public class BjBoardModel implements Serializable {
+
+    @ApiParam("jsa数量")
+    private Integer jsaQty;
+    @ApiParam("完成数量")
+    private Integer completeQty;
+    @ApiParam("总数量")
+    private Integer totalQty;
+    @ApiParam("预警数量")
+    private Integer warnQty;
+    @ApiParam("预警率")
+    private Integer warnRate;
+    @ApiParam("目标合格率")
+    private Integer targetRate = 0;
+    @ApiParam("一次合格率")
+    private Integer onceQualityRate = 0;
+
+    @ApiParam("x坐标内容")
+    private String xAxis;
+
+    @ApiParam("x坐标内容")
+    private List<String> xAxisList;
+
+    @ApiParam("显示数据")
+    private List<BjBoardSeriesModel> seriesModels;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java
new file mode 100644
index 0000000..fa764fa
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/10/28 2:56 PM
+ * @Modify:
+ */
+@Data
+public class BjBoardSeriesModel {
+    @ApiParam("名称")
+    private String name;
+    @ApiParam("显示数量")
+    private Integer qty;
+}

From 104fa0efa5444fcd71185b4927b020d549751ba4 Mon Sep 17 00:00:00 2001
From: "rock.yu" <rock.yu@estsh.com>
Date: Wed, 28 Oct 2020 22:09:05 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E5=AE=8C=E6=88=90ERP=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=B7=AE=E5=BC=82=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java
index 7e712f7..26af6b4 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java
@@ -24,10 +24,15 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_ERP_QUAN_AREAS")
-public class WmsErpQuanAreas extends BaseBean {
+public class WmsErpQuanAreas extends BaseBean implements Comparable<WmsErpQuanAreas> {
     private static final long serialVersionUID = 5560607687871639209L;
 
     @Column(name="AREA_NO")
     @ApiParam("库存地点")
-    public String area_no;
+    public String areaNo;
+
+    @Override
+    public int compareTo(WmsErpQuanAreas o) {
+        return this.getAreaNo().compareTo(o.getAreaNo());
+    }
 }