BPM维护的材料名称，汉语品名更改为“SAP物料名称”，中文文本说明改为“S物料要求描述”。对应的采购单需增加一个SAP物料名称对应为BPM物料主数据申请维...

BPM维护的材料名称，汉语品名更改为“SAP物料名称”，中文文本说明改为“S物料要求描述”。对应的采购单需增加一个SAP物料名称对应为BPM物料主数据申请维护的“SAP物料名称”，物料描述更改为物料要求描述

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.jsp

@@ -124,7 +124,7 @@
                 <x:hidden name="spart"/>
                 <%--<x:selectC name="mtposMara" label="项目类别组" labelCol="1" fieldCol="2" dictionary="mtposMara"/>--%>
                 <x:hidden name="mtposMara"/>
-                <x:inputC name="maktx" label="汉语品名" required="true" labelCol="1" fieldCol="5" maxLength="40"/>
+                <x:inputC name="maktx" label="SAP物料名称" required="true" labelCol="1" fieldCol="5" maxLength="40"/>
                 <x:inputC name="groes" label="规格" required="true" labelCol="1" fieldCol="2"/>
                 <x:hidden name="xchpf"/>
                 <!--x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/-->
@@ -171,7 +171,7 @@
                 <x:hidden name="classify"/>
             </div>
             <div class="hg-form-row">
-                <x:textareaC rows="3" name="maktxRemZh" label="中文文本说明" labelCol="1" fieldCol="11"/>
+                <x:textareaC rows="3" name="maktxRemZh" label="物料要求描述" labelCol="1" fieldCol="11"/>
                 <x:textareaC rows="3" name="maktxRemEn" label="英文文本说明" labelCol="1" fieldCol="11"/>
             </div>
         </div>

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js

@@ -126,7 +126,8 @@ function loadNonProdApplyListGrid() {
                 }
             },
             {display: "通用品名", name: "genericName", width: 200, minWidth: 60, type: "string", align: "left"},
-            {display: "汉语品名", name: "maktx", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "SAP物料名称", name: "maktx", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "物料要求描述", name: "maktxRemZh", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "适用标准(国标)", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "基本计量单位", name: "baseUnitTextView", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "规格", name: "specifications", width: 140, minWidth: 60, type: "string", align: "left"},

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js

@@ -1291,6 +1291,7 @@ function bindEvent() {
             $("#iprkz_text").val(data.iprkzTextView)
             $("#mhdhb").val(data.mhdhb)
             $("#mhdrz").val(data.mhdrz)
+            $("#normt").val(data.normt)
             $("#length").val(data.length)
             $("#widthCm").val(data.widthCm)
             $("#thickness").val(data.thickness)
@@ -1298,8 +1299,8 @@ function bindEvent() {
             $("#singleThickness").val(data.singleThickness)
             $("#klart").val(data.klart)
             $("#classify").val(data.class)
-            $("#maktxRemZh").val(data.maktxRemZh)
-            $("#maktxRemEn").val(data.maktxRemEn)
+            //$("#maktxRemZh").val(data.maktxRemZh)
+            //$("#maktxRemEn").val(data.maktxRemEn)
             //$("#businessUsage").val(data.businessUsage)
             var businessUsages = data.businessUsage;
             var businessUsageStr = businessUsages.split(",");
@@ -1360,6 +1361,7 @@ function bindEvent() {
             $("#umrezPurch").val(data.umrezPurch)
             $("#ekgrpName").val(data.ekgrpName)
             $("#ekgrp").val(data.ekgrp)
+            $("#mmsta").val(data.mmsta)
 
             //MRP视图
             $("#rgekz").val(data.rgekz)
@@ -1416,6 +1418,8 @@ function bindEvent() {
             $("#ausme").val(data.ausme)
             $("#umrenProd").val(data.umrenProd)
             $("#umrezProd").val(data.umrezProd)
+            $("#ueetk").val(data.ueetk);
+            $("#ueetk_text").val(data.ueetkTextView);
 
             //存储视图
             $("#lgortQmName").val(data.lgortQmName)

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp

@@ -125,7 +125,7 @@
                 <x:hidden name="spart"/>
                 <x:selectC name="mtposMara" label="项目类别组" labelCol="1" fieldCol="2" dictionary="mtposMara"/>
                 <x:selectC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" dictionary="xchpf" required="true"/>
-                <x:inputC name="maktx" label="汉语品名" required="true" labelCol="1" fieldCol="5"/>
+                <x:inputC name="maktx" label="SAP物料名称" required="true" labelCol="1" fieldCol="5"/>
                 <!--x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/-->
 
                 <x:inputC name="maktxEn" label="英语品名" labelCol="1" fieldCol="2"/>
@@ -166,7 +166,7 @@
         </div>
          <div class="hg-form-cols">
             <div class="hg-form-row">
-                <x:textareaC rows="3" name="maktxRemZh" label="中文文本说明" labelCol="1" fieldCol="11"/>
+                <x:textareaC rows="3" name="maktxRemZh" label="物料要求描述" labelCol="1" fieldCol="11"/>
                 <x:textareaC rows="3" name="maktxRemEn" label="英文文本说明" labelCol="1" fieldCol="11"/>
             </div>
             <c:if test="${applyType==2}">

topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.js

@@ -115,13 +115,20 @@ function loadGrid() {
                             MATNR: "matnr",
                             MAKTX: "maktx",
                             MEINS: "meins",
-                            MSEHL: "msehl"
+                            MSEHL: "msehl",
+                            MATXT: "matxt",
                         }
                     },
                 }
             },
             {
-                display: "物料描述", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",
+                display: "SAP物料名称", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",
+                editor: {
+                    type: "text"
+                }
+            },
+            {
+                display: "物料要求描述", name: "matxt", width: 300, minWidth: 60, type: "string", align: "left",
                 editor: {
                     type: "text"
                 }

topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.js

@@ -35,7 +35,8 @@ function loadGrid() {
             {display: "内部订单描述", name: "aufnrName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "序号", name: "rspos", width: 70, minWidth: 60, type: "string", align: "left",},
             {display: "物料", name: "matnr", width: 160, minWidth: 60, type: "string", align: "left"},
-            {display: "物料描述", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",},
+            {display: "SAP物料名称", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",},
+            {display: "物料要求描述", name: "matxt", width: 300, minWidth: 60, type: "string", align: "left",},
             {display: "库存地点", name: "lgobe", width: 200, minWidth: 60, type: "string", align: "left",},
             {display: "数量", name: "erfmg", width: 100, minWidth: 60, type: "string", align: "left",},
             {display: "申请退料数量", name: "backNum", width: 100, minWidth: 60, type: "string", align: "left",},

topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java

@@ -210,7 +210,8 @@ public class ResourceSearchController {
                         new QuerySchemeField("工厂", "WERKS", "string", 60L),
                         new QuerySchemeField("工厂名称", "NAME1", "string", 160L),
                         new QuerySchemeField("物料编码", "MATNR", "string", 140L),
-                        new QuerySchemeField("物料名称", "MAKTX", "string", 200L),
+                        new QuerySchemeField("SAP物料名称", "MAKTX", "string", 200L),
+                        new QuerySchemeField("物料要求描述", "MATXT", "string", 200L),
                         new QuerySchemeField("物料分类", "MTART", "string", 100L),
                         new QuerySchemeField("物料分类描述", "MTBEZ", "string", 200L),
                         new QuerySchemeField("库存地点", "LGFSB", "string", 100L),

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/domain/NonProducePickItem.java

@@ -38,7 +38,7 @@ public class NonProducePickItem extends AbstractEntity {
     private String matnr;
 
     /**
-     *物料描述
+     *SAP物料名称
      */
     @Column(name = "MAKTX")
     private String maktx;
@@ -123,4 +123,10 @@ public class NonProducePickItem extends AbstractEntity {
     @Column(name = "checked_box")
     private String checkedBox;
 
+    /**
+     * 物料要求描述
+     */
+    @Column(name = "matxt")
+    private String matxt;
+
 }

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

@@ -33,6 +33,7 @@
         <field name="iprkz" code="iprkz"  type="hidden"/>
         <field name="mhdhb" code="mhdhb"  type="hidden"/>
         <field name="mhdrz" code="mhdrz"  type="hidden"/>
+        <field name="normt" code="normt"  type="hidden"/>
         <field name="length" code="length"  type="hidden"/>
         <field name="widthCm" code="widthCm"  type="hidden"/>
         <field name="thickness" code="thickness"  type="hidden"/>
@@ -61,6 +62,7 @@
         <field name="umrezPurch" code="umrezPurch"  type="hidden"/>
         <field name="ekgrpName" code="ekgrpName"  type="hidden"/>
         <field name="ekgrp" code="ekgrp"  type="hidden"/>
+        <field name="mmsta" code="mmsta"  type="hidden"/>
         <field name="taxkm" code="taxkm"  type="hidden"/>
         <field name="rgekz" code="rgekz"  type="hidden"/>
         <field name="strgr" code="strgr"  type="hidden"/>
@@ -131,6 +133,8 @@
         <field name="ausme" code="ausme"  type="hidden"/>
         <field name="umrenProd" code="umrenProd"  type="hidden"/>
         <field name="umrezProd" code="umrezProd"  type="hidden"/>
+        <field name="ueetk" code="ueetk"  type="hidden"/>
+        <field name="ueetkTextView" code="ueetkTextView"  type="hidden" dictionary="ueetk"/>
         <field name="disgr" code="disgr"  type="hidden"/>
         <field name="disgrTextView" code="disgrTextView" type='hidden' dictionary="disgr"/>
         <field name="dismmTextView" code="dismmTextView" type='hidden' dictionary="dismm"/>

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

@@ -41,7 +41,8 @@
             pi.zerfmg,
             pi.checked_box,
             pi.charge_off_message,
-            pi.remark
+            pi.remark,
+            pi.matxt
              FROM sap_non_produce_pick t
              LEFT JOIN sap_non_produce_pick_item pi ON t.id = pi.non_produce_pick_id where 1=1
         </sql-query>