物料主数据变更和扩展

topsun-xt/src/main/webapp/HomePage.jsp

@@ -45,7 +45,7 @@
 	        <div class="col-sm-6 col-xs-12">
 	            <div class="box box-success">
 		            <div class="box-header with-border">
-		              <h3 class="box-title">非产品/非半成品类物料任务</h3>
+		              <h3 class="box-title">物料主数据任务</h3>
 		              <div class="box-tools pull-right">
 		                <button type="button" class="btn btn-box-tool" title="刷新" onclick="reloadSpecialTaskGrid()"><i class="fa fa-repeat"></i></button>
 		                <button type="button" class="btn btn-box-tool" title="更多" onclick="showSpecialTask(1)"><i class="fa fa-bars"></i></button>

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

@@ -82,7 +82,8 @@
             <div class="hg-form-row">
                 <x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
                 <x:inputC name="applicableStandard" label="适用标准(国际)" labelCol="1" fieldCol="2"/>
-                <x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
+                <x:hidden name="baseUnit"/>
+                <x:inputC name="baseUnitName" label="基本计量单位" labelCol="1" fieldCol="2" readonly="true"/>
                 <x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
                 <x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
                 <x:inputC name="design" label="版式" labelCol="1" fieldCol="2"/>

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java

@@ -397,6 +397,8 @@ public void getBaseInfoAttrs(NonProdApplyBaseInfo baseInfo,SapNonProdApplyDept n
         nonProdApplyDept.setMaktxRemEn(baseInfo.getMaktxRemEn());
         nonProdApplyDept.setMaktxRemZh(baseInfo.getMaktxRemZh());
         nonProdApplyDept.setTextDescription(baseInfo.getTextDescription());
+
+        nonProdApplyDept.setBaseUnitName(baseInfo.getBaseUnitName());
     }
 
 //    @EasySearch(queryName = "userNameSelect")

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java

@@ -958,6 +958,9 @@ public class SapNonProdApplyDept implements Serializable {
     private String maktxRemEn;
     @Transient
     private String textDescription;
+    @Transient
+    private String baseUnitName;
+
     @Transient
     private Date createdDate;