物料主数据的页面调整必输逻辑

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

@@ -142,24 +142,7 @@
                     <x:inputC name="classify" label="分类" labelCol="1" fieldCol="2" readonly="true"/>
              </div>
         </div>
-        <div class="hg-form-cols" id="distributeDiv">
-          <div class="hg-form-row">
-            <x:inputC name="werksName" label="工厂" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
-            <x:hidden name="werks"/>
-            <x:inputC name="lgortName" label="库存地点" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
-            <x:hidden name="lgort"/>
-            <x:inputC name="vkorgName" label="销售组织" required="true"  labelCol="1" wrapper="select" fieldCol="2"/>
-            <x:hidden name="vkorg"/>
-            <x:inputC name="vtwegName"  label="分销渠道" required="true" labelCol="1" wrapper="select" fieldCol="2"/>
-            <x:hidden name="vtweg"/>
-            <x:inputC name="lgnumName" label="仓库号" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
-            <x:hidden name="lgnum"/>
-            <x:inputC name="lgtypName" label="存储类型" labelCol="1" fieldCol="2" wrapper="select"/>
-            <x:hidden name="lgtyp"/>
-        </div>
-        </div>
-
-        <div class="hg-form-cols">
+         <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="maktxRemEn" label="英文文本说明" labelCol="1" fieldCol="11"/>
@@ -186,11 +169,26 @@
             </c:if>
         </div>
         <div class="hg-form-cols">
+        </div>
+        <div class="hg-form-cols" id="distributeDiv">
+            <div class="hg-form-row">
+                <x:inputC name="werksName" label="工厂" required="false" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:hidden name="werks"/>
+                <x:inputC name="lgortName" label="库存地点" required="false" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:hidden name="lgort"/>
+                <x:inputC name="lgtypName" label="存储类型" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:hidden name="lgtyp"/>
+                <x:selectC name="mtvfp" label="可用性检查组" labelCol="1" fieldCol="2" required="false" dictionary="mtvfp"/>
+            </div>
         </div>
             <div id="businessUsageDiv">
                 <div class="hg-form-cols" id="saleDiv">
                     <x:title title="销售" name="group"/>
                     <div class="hg-form-row">
+                        <x:inputC name="vkorgName" label="销售组织" required="true"  labelCol="1" wrapper="select" fieldCol="2"/>
+                        <x:hidden name="vkorg"/>
+                        <x:inputC name="vtwegName"  label="分销渠道" required="true" labelCol="1" wrapper="select" fieldCol="2"/>
+                        <x:hidden name="vtweg"/>
                         <x:inputC name="vrkmeName" label="销售计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
                         <x:hidden name="vrkme"/>
                         <x:inputC name="umrenSale" label="转换分母" labelCol="1" fieldCol="2"/>
@@ -268,7 +266,7 @@
 
                             <x:inputC name="eisbe" label="安全库存" labelCol="1" fieldCol="1" required="false"/>
                             <x:inputC name="eislo" label="最小安全库存" labelCol="1" fieldCol="1"/>
-                            <x:selectC name="mtvfp" label="可用性检查组" labelCol="1" fieldCol="2" required="false" dictionary="mtvfp"/>
+
 
                             <x:selectC name="strgr" label="策略组" labelCol="1" fieldCol="2" dictionary="strgr"/>
 
@@ -321,6 +319,8 @@
                 <div class="hg-form-cols" id="warehouseDiv">
                     <x:title title="仓库管理" name="group"/>
                     <div class="hg-form-row">
+                        <x:inputC name="lgnumName" label="仓库号" required="false" labelCol="1" fieldCol="2" wrapper="select"/>
+                        <x:hidden name="lgnum"/>
                         <x:inputC name="lgortProfitName" label="库存地点" labelCol="1" fieldCol="2" wrapper="select"/>
                         <x:hidden name="lgortProfit"/>
                         <!--x:selectC name="lgnum" label="仓库号" labelCol="1" fieldCol="2" dictionary="lgnum"/-->

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -589,8 +589,10 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
             } else if ("D".equals(backMap.get("TYPE").toString())) {  // 推送待分发的待办信息
                 if (genericName.equals(title)){
                     title="";
+                } else {
+                    title="("+title+")";
                 }
-                messageExecute.setTaskDescribe(genericName +sign+ "待确认(" + title+ ")");
+                messageExecute.setTaskDescribe(genericName +sign+ "待确认" + title);
             }
             bsnMessageApplication.saveBsnMessageSponsor(bsnMessageSponsor);
             messageExecute.setMessageSponsorId(bsnMessageSponsor.getId());