采购信息记录排除已经禁用的供应商

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReasonTypeDetailList.js

@@ -21,7 +21,7 @@ function initGrid() {
     });
     gridManager = UICtrl.grid('#maingrid', {
             columns: [
-                {display: "序号（一级分类编码）", name: "reasonType", width: "200", align: "center", type: "string"}
+                {display: "序号（一级分类编码）", name: "reasonType", width: "200", align: "center", type: "int"}
                 , {display: "标准名称大类（一级分类）", name: "reasonTypeName", width: "200", minWidth: 60, type: "string", align: "center"}
                 , {display: "问题类型代码（二级分类 ）", name: "reasonTypeDetail", width: "200", minWidth: 60, type: "string", align: "center"}
                 , {display: "问题类型（二级分类 ）", name: "reasonTypeDetailName", width: "500", minWidth: 60, type: "string", align: "center"}

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/insertExceptionReasonTypeDetail.jsp

@@ -11,13 +11,12 @@
     <div class="hg-form-cols">
         <div class="hg-form-row">
             <x:hidden name="id"/>
-            <x:inputC name="reasonType" label="序号（一级分类编码）" labelCol="3" fieldCol="2" required="true"/>
+            <x:inputC name="reasonType" label="序号（一级分类编码）" labelCol="3" fieldCol="2" required="true" mask="999"/>
             <x:inputC name="reasonTypeName" label="标准名称大类（一级分类）" labelCol="3" fieldCol="4" required="true" />
-            </div>
+        </div>
         <div class="hg-form-row">
             <x:inputC name="reasonTypeDetail" label="问题类型代码（二级分类 ）" labelCol="3" fieldCol="2" required="true" />
             <x:inputC name="reasonTypeDetailName" label="问题类型（二级分类 ）" labelCol="3" fieldCol="4" required="true" />
-
         </div>
     </div>
 </form>

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/domain/ExceptionReasonTypeDetail.java

@@ -19,7 +19,7 @@ import javax.persistence.Table;
 public class ExceptionReasonTypeDetail extends AbstractEntity {
 
     @Column(name = "reason_type")
-    private String reasonType;
+    private Integer reasonType;
 
     @Column(name = "reason_type_name")
     private String reasonTypeName;

topsun/src/main/resources/config/content/easysearch/easy-search-suppliers.xml

@@ -3,18 +3,17 @@
 
     <easy-search name="selectSuppliers" desc="供应商">
         <sql>
-            SELECT DISTINCT t.partner, t.name_org1 FROM sap_suppliers_info t
-             WHERE
-             t.STATUS = 3
-             AND t.apply_type != - 1
-             AND t.bu_group IN ( 'Z001', 'Z002', 'Z003', 'Z005' )
-             AND t.partner IS NOT NULL
-             AND t.partner != ''
-             ORDER BY t.partner ASC
+            SELECT t1.partner, t1.name_org1
+             FROM sap_suppliers_info t1
+             INNER JOIN ( SELECT partner, MAX( fillin_date ) AS max_date FROM sap_suppliers_info WHERE STATUS = 3 GROUP BY partner ) t2 ON t1.partner = t2.partner
+             AND t1.fillin_date = t2.max_date WHERE t1.STATUS = 3
+             AND t1.apply_type != - 1 AND t1.bu_group IN ( 'Z001', 'Z002', 'Z003', 'Z005' ) AND t1.partner IS NOT NULL
+             AND t1.partner != '' AND t1.sperm = '0'
+             ORDER BY t1.partner ASC
         </sql>
         <field name="供应商编码" title="供应商编码" code="partner" width="100"/>
         <field name="供应商名称" title="供应商名称" code="nameOrg1" width="200"/>
-        <condition column="name_org1" name="nameOrg1" symbol="like" alias="t"/>
+        <condition column="name_org1" name="nameOrg1" symbol="like" alias="t1"/>
     </easy-search>
 
     <!--<easy-search name="selectSupplierWaers" desc="根据供应商编码查询货币码">