工序报价备注字段取消必填；工序外协带出单位；品质异常报告中原材料异常取消客户相关必填，通过采购单号筛选出物料信息

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

@@ -164,9 +164,9 @@ function showPurchaseDiv() {
 }
 
 function setPurchaseMustInput(flag) {
-    UICtrl.setElRequiredFlag("#customerNamePur", flag);
-    UICtrl.setElRequiredFlag("#customerOrderNoPur", flag);
-    UICtrl.setElRequiredFlag("#brandName", flag);
+    //UICtrl.setElRequiredFlag("#customerNamePur", flag);
+    //UICtrl.setElRequiredFlag("#customerOrderNoPur", flag);
+    //UICtrl.setElRequiredFlag("#brandName", flag);
 
     UICtrl.setElHideOrShow("#loseMoney",true);
 
@@ -809,19 +809,21 @@ function getPurchaseGridColumns() {
             ,editor: {
                 required: true, type: "select",
                 data: {
-                    type: 'system',
-                    name: "sapMaterialSelect",
+                    type: 'material',
+                    name: "selectMaterialsByPurchaseOrder",
                     getParam: function (item) {
                         return {
-                           // filterValue:item.company
+                            ebeln:item.produceNo
                         }
                     },
                     back: {
-                        MATNR: "productCode",
-                        MAKTX: "productName",
-                      //  EKGRP: "ekgrp",
-                        MEINS: "unit",
-                        MSEHL: "unitName"
+                        matnr: "productCode",
+                        txz01: "productName",
+                        menge: "number",
+                        meins: "unit",
+                        msehl: "unitName",
+                        waers: "currency",
+                        name: "currencyName",
 
                     }
                 }

topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.js

@@ -127,6 +127,8 @@ function getOrderColumns(){
                     MAKTX: "productName",
                     MTART: "productType",
                     MTBEZ: "productTypeName",
+                    MSEH3: "meins",
+                    MSEHL: "meinsName",
                 }
             }
         }

topsun-xt/src/main/webapp/biz/topsun/sap/processQuotedPrice/processQuotedPriceDetail.jsp

@@ -36,7 +36,7 @@
             <x:inputC name="currencyName" label="币别" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
         </div>
         <div class="hg-form-row">
-            <x:textareaC name="remark" label="备注" labelCol="1" fieldCol="11" required="true" rows="3"/>
+            <x:textareaC name="remark" label="备注" labelCol="1" fieldCol="11" required="false" rows="3"/>
         </div>
     </div>
     <div class="blank_div clearfix"></div>

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

@@ -192,4 +192,23 @@
         <condition column="mtart" name="mtart" symbol="=" alias="t"/>
         <condition column="matkl" name="matkl" symbol="=" alias="t"/>
     </easy-search>
+
+    <easy-search name="selectMaterialsByPurchaseOrder" desc="通过采购订单查询物料">
+        <sql>
+            SELECT oi.matnr, oi.txz01, oi.menge, oi.meins, oi.msehl, o.waers,d.`name`,o.ebeln
+             FROM sap_purchase_order_item oi
+             LEFT JOIN sap_purchase_order o ON o.id = oi.purchase_order_id
+             LEFT JOIN ( SELECT dd.`NAME`, dd.`VALUE` FROM sa_dictionarydetail dd
+             LEFT JOIN sa_dictionary d ON d.id = dd.DICTIONARY_ID
+             WHERE d.`CODE` = 'currency' ) d ON d.`VALUE`= o.WAERS where 1=1
+        </sql>
+        <field name="物料编码" title="物料编码" code="matnr" width="200"/>
+        <field name="物料名称" title="物料名称" code="txz01" width="400"/>
+        <field name="订单数量" title="订单数量" code="menge" width="100"/>
+        <field name="单位" title="单位" code="meins" width="100"/>
+        <field name="单位描述" title="单位描述" code="msehl" width="100"/>
+        <field name="币别" title="币别" code="waers" width="100"/>
+        <field name="币别描述" title="币别描述" code="name" width="100"/>
+        <condition column="ebeln" name="ebeln" symbol="=" alias="o"/>
+    </easy-search>
 </easy-search-mappings>
\ No newline at end of file