Merge remote-tracking branch 'origin/dev' into dev

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

@@ -98,7 +98,7 @@
             <div class="hg-form-row">
                 <x:inputC name="matnr" label="物品编码" readonly="true" labelCol="1" fieldCol="2"/>
 
-                <x:inputC name="mbrsh" label="行业"  labelCol="1" fieldCol="2"/>
+                <!--x:inputC name="mbrsh" label="行业"  labelCol="1" fieldCol="2"/-->
                 <x:selectC name="mtart" label="物品类型" required="true" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
                 <x:inputC name="matklName" label="物料组" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="matkl"/>

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

@@ -330,6 +330,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         }
         //存储分区标识默认001
         sapVO.setLgbkz("001");
+        sapVO.setMbrsh("M");//行业默认M
         //销售单位转换
         if (StringUtil.isNotBlank(sapVO.getVrkme())){
             Map<String,Object> unitsaleMap = new HashMap<>();

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

@@ -223,7 +223,7 @@ public class NonProdApplyNextController extends CommonController {
 
     /**
      * 分发表单
-     *
+     */
     public String distributeSapNonProdApplyDept() {
         SDO sdo = this.getSDO();
         nonProdApplyDeptApplication.distributeSapNonProdApplyDept(sdo);