放行条空车，不到胡总审批，只到部门经理

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

@@ -129,7 +129,12 @@
                 <!--x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/-->
 
                 <x:inputC name="maktxEn" label="英语品名" labelCol="1" fieldCol="2"/>
+                <c:if test="${applyType==1}">
+                    <x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select" readonly="true"  required="true"/>
+                </c:if>
+                <c:if test="${applyType!=1}">
                     <x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select"  required="true"/>
+                </c:if>
                 <x:hidden name="meins"/>
                 <x:selectC name="raube" label="存储条件" required="true" labelCol="1" fieldCol="2" dictionary="raube"/>
                 <x:inputC name="brgew" label="毛重" labelCol="1" fieldCol="2"/>

topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.js

@@ -134,6 +134,12 @@ function loadGrid() {
                 var lifnrName = item.record.lifnrName;
                 $("#company").val(lifnrName);
             }
+            //如果是空车，不用胡总审核
+            if (item.column.name == "belongings" ){
+                if (item.value.indexOf("空车") > -1 ){
+                    $("#isEmptyCar").val("Y");
+                }
+            }
             return item;
         }
     });

topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.jsp

@@ -24,6 +24,7 @@
     <x:hidden name="positionName"/>
     <x:hidden name="personMemberId"/>
     <x:hidden name="personMemberName"/>
+    <x:hidden name="isEmptyCar"/>
 
     <div class="hg-form-cols">
     <c:if test="${statusId==3}">

topsun/src/main/java/com/huigou/topsun/sap/permit/domain/SapPermit.java

@@ -64,6 +64,12 @@ public class SapPermit extends FlowBillAbstractEntity {
     @Column(name = "car_no")
     private String carNo;
 
+    /**
+     * 是否空车
+     */
+    @Column(name = "is_empty_car")
+    private String isEmptyCar;
+
     @Override
     protected String getCodeRuleId() {
         return "sapPermit";