From 79e90298ef4b161d1d993734eb0468eb16745712 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: Mon, 11 May 2020 13:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java   |  2 +-
 .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
index 7cf7251..599196a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
@@ -61,7 +61,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
 
     @Column(name = "IS_CONCESSION")
     @ApiParam("是否允许让步")
-    private String isConCession;
+    private String isConcession;
 
     @Column(name = "STATUS")
     @ApiParam("状态")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index de193d7..992531d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -2568,6 +2568,24 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 供应商
+     *
+     * @param basVendor
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesBasVendor(BasVendor basVendor, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(basVendor, organizeCode);
+        if (!StringUtils.isEmpty(basVendor.getVendorNo())) {
+            DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", packBean);
+        }
+        if (!StringUtils.isEmpty(basVendor.getVendorDesc())) {
+            DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", packBean);
+        }
+        return packBean;
+    }
+
     public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) {
         DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean);