采购信息记录增加货币码及子范围开发完成，待SAP接口添加字段在测试

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js

@@ -101,6 +101,22 @@ function bindEvent(){
             $('#name1').val(data.nameOrg1);
         }
     });
+    $('#waersName').searchbox({
+        type: "suppliers", name: "selectSupplierWaers",
+        getParam: function (item) {
+            return {
+                partner: $('#lifnr').val()
+            }
+        },
+        onChange: function (value, data) {
+            debugger
+            $('#waers').val(data.waers);
+            $('#waersName').val(data.waersName);
+            $('#ltsnr').val(data.ltsnr);
+            $('#ltsbz').val(data.ltsbz);
+            //$('#name1').val(data.nameOrg1);
+        }
+    });
     //物料编码
     $('#matnr').searchbox({
         type: "system", name: "sapMaterialSelect",

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.jsp

@@ -43,7 +43,10 @@
             <x:hidden name="matkl"/>
             <x:inputC name="matklName" label="物料组" labelCol="1" fieldCol="2" wrapper="select" />
 
-            <x:selectC name="waers" label="货币码" labelCol="1" fieldCol="2" required="true" dictionary="waers"/>
+            <x:inputC name="waersName" label="货币码" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
+            <x:hidden name="waers"/>
+            <x:hidden name="ltsnr"/>
+            <x:hidden name="ltsbz"/>
             <x:inputC name="peinh" label="价格单位" labelCol="1" fieldCol="2" required="true" mask="9999999"/>
             <x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="2"  required="false"  readonly="true"/>
 

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js

@@ -267,7 +267,7 @@ function getGridColumns() {
             //,editor: {required: true,type: 'text', mask: '9999999.99'}
         },
         {display: "货币码编号", name: "waers", width: "20", align: "left", type: "string",hide:true},
-        {display: "货币码", name: "waersTextView", width: "100", align: "left", type: "string"
+        {display: "货币码", name: "waersName", width: "100", align: "left", type: "string"
             /*,editor: {
                 type: 'dictionary',
                 data: {name: 'waers'},
@@ -619,7 +619,9 @@ function  doSaveDefine() {
             freight: $("#freight").val(),
             kbetr6: $("#kbetr6").val(),
             waers: $("#waers").val(),
-            waersTextView: $("#waers").find("option:selected").text(),
+            ltsnr: $("#ltsnr").val(),
+            ltsbz: $("#ltsbz").val(),
+            waersName: $("#waersName").val(),
             peinh: $("#peinh").val(),
             bprme: $("#bprme").val(),
             bprmeName: $("#bprmeName").val(),

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/SapPurchaseInfoRecordItem.java

@@ -125,6 +125,11 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity {
 
     @Column(name = "WAERS_NAME")
     private String waersName;
+    @Column(name = "ltsnr")
+    private String ltsnr;
+    @Column(name = "ltsbz")
+    private String ltsbz;
+
     /**
      * 价格单位
      */

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/vo/SapPurchaseInfoRecordItemVo.java

@@ -83,6 +83,18 @@ public class SapPurchaseInfoRecordItemVo implements Serializable {
      */
     @JsonProperty("WAERS")
     private String waers;
+
+    /**
+     * 供应商子范围
+     */
+    @JsonProperty("LTSNR")
+    private String ltsnr;
+
+    /**
+     * 供应商子范围描述
+     */
+    @JsonProperty("LTSBZ")
+    private String ltsbz;
     /**
      * 价格单位
      */

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

@@ -17,6 +17,25 @@
         <condition column="name_org1" name="nameOrg1" symbol="like" alias="t"/>
     </easy-search>
 
+    <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
+        </sql>
+        <field name="供应商子范围" title="供应商子范围" code="ltsnr" width="150"/>
+        <field name="供应商子范围描述" title="供应商子范围描述" code="ltsbz" width="200"/>
+        <field name="货币码" title="货币码" code="waers" width="100"/>
+        <field name="货币码描述" title="货币码描述" code="waersName" width="100"/>
+        <condition column="partner" name="partner" symbol="like" alias="i"/>
+    </easy-search>
+
     <easy-search name="selectQuotedSuppliers" desc="已报价供应商">
         <sql>
             SELECT

topsun/src/main/resources/config/topsun/sap/sapPurchaseInfoRecord/sapPurchaseInfoRecordItem.xml

@@ -35,6 +35,8 @@
             t.WEBRE,
             t.NETPR,
             t.WAERS,
+            t.LTSNR,
+            t.LTSBZ,
             t.PEINH,
             t.BPRME,
             t.KSCHL,