添加供应商查询

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("状态")

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);