From 62d5d62cef5d58e87c9188bfd6d24eed27f7f75c Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Mon, 26 Oct 2020 20:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=ACMGN=E7=B3=BB=E5=88=97BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java   |  2 +-
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java  | 10 +++++++---
 .../cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java   |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 58ebed3..cdd8873 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -4035,7 +4035,7 @@ public class WmsEnumUtil {
     public enum INVENTORY_DIFFERENCE_TYPE {
         INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"),
         INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
-        INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"),
+        INVENTORY_WIN(30, "INVENTORY_WIN", "盘盈"),
         INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"),
         INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘");
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
index 68abad8..85b257d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@@ -11,7 +11,11 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -148,7 +152,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public String[] zoneNos;
 
     /**
-     * 差异类型：10：盘平，20：盘亏，30盘赢
+     * 差异类型：10：盘平，20：盘亏，30盘盈
      */
     @Transient
     @ApiParam("差异类型")
@@ -156,7 +160,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public Integer differenceType;
 
     /**
-     * 差异类型：10：盘平，20：盘亏，30盘赢
+     * 差异类型：10：盘平，20：盘亏，30盘盈
      */
     @Transient
     @ApiParam("差异集合")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java
index 694ebfc..d565516 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java
@@ -56,9 +56,9 @@ public class WmsQCStatusModel {
     private Double proportion;
 
     @ApiParam("标准质检时间")
-    private Integer stdCheckTime;
+    private Double stdCheckTime;
 
-    public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Integer stdCheckTime) {
+    public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Double stdCheckTime) {
         this.asnOrderNo = asnOrderNo;
         this.qcOrderNo = qcOrderNo;
         this.partNo = partNo;