客供料增加查询条件；根据供应商编码查询货币码优化

topsun-xt/src/main/webapp/biz/topsun/sap/clientMaterials/clientMaterialsList.jsp

@@ -17,6 +17,8 @@
             <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
                 <x:inputC name="matnr" required="false" label="客供料" labelCol="1"/>
                 <x:inputC name="plnum" label="计划订单" labelCol="1" fieldCol="2"/>
+                <x:inputC name="kdauf" label="销售订单" labelCol="1" fieldCol="2"/>
+                <x:inputC name="aufnr" label="生产订单" labelCol="1" fieldCol="2"/>
                 <x:selectC name="closed" label="查询删除订单" labelCol="1" fieldCol="2" dictionary="yesorno"/>
                 <x:searchButtons/>
             </form>

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/domain/query/ClientMaterialsQueryRequest.java

@@ -3,8 +3,6 @@ package com.huigou.topsun.sap.clientMaterials.domain.query;
 import com.huigou.data.domain.query.QueryAbstractRequest;
 import lombok.Data;
 
-import javax.persistence.Column;
-
 /**
  * @Auther: lxh
  * @Date: 2024/06/05/16:38
@@ -28,4 +26,14 @@ public class ClientMaterialsQueryRequest extends QueryAbstractRequest {
      * 工厂
      */
     private String werks;
+
+    /**
+     * 销售订单
+     */
+    private String kdauf;
+
+    /**
+     * 生产订单
+     */
+    private String aufnr;
 }

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/vo/ClientMaterialsQueryRequestVo.java

@@ -29,4 +29,16 @@ public class ClientMaterialsQueryRequestVo {
      */
     @JsonProperty("PWWRK")
     private String werks;
+
+    /**
+     * 销售订单
+     */
+    @JsonProperty("KDAUF")
+    private String kdauf;
+
+    /**
+     * 生产订单
+     */
+    @JsonProperty("AUFNR")
+    private String aufnr;
 }

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

@@ -19,15 +19,18 @@
 
     <easy-search name="selectSupplierWaers" desc="根据供应商编码查询货币码">
         <sql>
-            SELECT
-             DISTINCT i.partner,p.ltsbz, p.ltsnr, case when p.waers is null or p.waers = '' then b.waers else p.waers end as waers,
-             case when p.waers is null or p.waers = '' then d1.`NAME` else d2.`NAME` end as waers_name
-             FROM sap_suppliers_info i
-             LEFT JOIN sap_suppliers_buyer b ON i.id = b.s_id
-             LEFT JOIN sap_suppliers_item_period p ON i.id = p.s_id
-             left join sa_dictionarydetail d1 on d1.`VALUE` = b.waers and d1.DICTIONARY_ID = 'b1d786efdd2911eea8a50242ac110003'
-             left join sa_dictionarydetail d2 on d2.`VALUE` = p.waers and d2.DICTIONARY_ID = 'b1d786efdd2911eea8a50242ac110003'
-             WHERE i.STATUS = 3 AND i.apply_type != - 1
+            select * from (
+            SELECT DISTINCT i.partner, '' AS ltsbz, '' AS ltsnr, b.waers, d1.`NAME` as waers_name
+             FROM sap_suppliers_buyer b
+             LEFT JOIN sap_suppliers_info i ON i.id = b.s_id
+             LEFT JOIN sa_dictionarydetail d1 ON d1.`VALUE` = b.waers AND d1.DICTIONARY_ID = 'b1d786efdd2911eea8a50242ac110003'
+             where i.STATUS = 3 AND i.apply_type != - 1
+             UNION
+             SELECT DISTINCT i.partner, p.ltsbz, p.ltsnr, p.waers, d2.`NAME` as waers_name
+             FROM sap_suppliers_item_period p
+             LEFT JOIN sap_suppliers_info i ON i.id = p.s_id
+             LEFT JOIN sa_dictionarydetail d2 ON d2.`VALUE` = p.waers AND d2.DICTIONARY_ID = 'b1d786efdd2911eea8a50242ac110003'
+             where i.STATUS = 3 AND i.apply_type != - 1 ) i where 1=1
         </sql>
         <field name="供应商子范围" title="供应商子范围" code="ltsnr" width="150"/>
         <field name="供应商子范围描述" title="供应商子范围描述" code="ltsbz" width="200"/>

topsun/src/main/resources/config/topsun/sap/clientMaterials/clientMaterials.xml

@@ -6,6 +6,8 @@
         </sql-query>
         <condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="t"/>
         <condition column="plnum" name="plnum" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="kdauf" name="kdauf" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="aufnr" name="aufnr" type="java.lang.String" symbol="like" alias="t"/>
     </query>