diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
index a8be89e6..d8f66e41 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
@@ -491,9 +491,7 @@ public class WorkOrderController {
     @PostMapping("/closestatus/{id}/{status}")
     @Operation(summary = "更新状态")
     public ActionResult updateStatus(@PathVariable("id") String id,@PathVariable("status") String status){
-
         WorkOrderEntity entity= workOrderService.getInfo(id);
-
         if(entity!=null){
             try{
                 entity.setStatus(status);
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/form.vue
index c1d83b16..78a8edb0 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/form.vue
@@ -1,12 +1,8 @@
-
-
-
-
-    <template>
-  <div :style="{margin: '0 auto',width:'100%'}">
+<template>
+  <div :style="{ margin: '0 auto', width: '100%' }">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
-        label-position="right" :disabled="setting.readonly">
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
+        :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
@@ -16,58 +12,49 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="10" v-if="judgeShow('inspectionCode')">
-            <jnpf-form-tip-item label="质检单编号" v-if="judgeShow('inspectionCode')"
-              prop="inspectionCode">
-              <JnpfInput v-model="dataForm.inspectionCode" @change="changeData('inspectionCode',-1)"
-                placeholder="系统自动生成" :disabled="judgeWrite('inspectionCode')" readonly
-                :style='{"width":"100%"}'>
+            <jnpf-form-tip-item label="质检单编号" v-if="judgeShow('inspectionCode')" prop="inspectionCode">
+              <JnpfInput v-model="dataForm.inspectionCode" @change="changeData('inspectionCode', -1)"
+                placeholder="系统自动生成" :disabled="judgeWrite('inspectionCode')" readonly :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="10" v-if="judgeShow('creatorTime')">
             <jnpf-form-tip-item label="制单时间" v-if="judgeShow('creatorTime')" prop="creatorTime">
-              <JnpfOpenData v-model="dataForm.creatorTime" @change="changeData('creatorTime',-1)"
-                placeholder="系统自动生成" :disabled="judgeWrite('creatorTime')" readonly
-                :style='{"width":"100%"}' type="currTime">
+              <JnpfOpenData v-model="dataForm.creatorTime" @change="changeData('creatorTime', -1)" placeholder="系统自动生成"
+                :disabled="judgeWrite('creatorTime')" readonly :style='{ "width": "100%" }' type="currTime">
               </JnpfOpenData>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('inspectionType')">
-            <jnpf-form-tip-item label="质检类型" v-if="judgeShow('inspectionType')"
-              prop="inspectionType">
-              <JnpfSelect v-model="dataForm.inspectionType"
-                @change="changeData('inspectionType',-1)" placeholder="请选择"
-                :disabled="judgeWrite('inspectionType')" clearable :style='{"width":"100%"}'
+            <jnpf-form-tip-item label="质检类型" v-if="judgeShow('inspectionType')" prop="inspectionType">
+              <JnpfSelect v-model="dataForm.inspectionType" @change="changeData('inspectionType', -1)" placeholder="请选择"
+                :disabled="judgeWrite('inspectionType')" clearable :style='{ "width": "100%" }'
                 :options="inspectionTypeOptions" :props="inspectionTypeProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('belongUserId')">
             <jnpf-form-tip-item label="质检人员" v-if="judgeShow('belongUserId')" prop="belongUserId">
-              <JnpfUserSelect v-model="dataForm.belongUserId"
-                @change="changeData('belongUserId',-1)" placeholder="请选择" selectType="all"
-                :ableIds="ableAll.belongUserIdableIds" :disabled="judgeWrite('belongUserId')"
-                clearable :style='{"width":"100%"}'>
+              <JnpfUserSelect v-model="dataForm.belongUserId" @change="changeData('belongUserId', -1)" placeholder="请选择"
+                selectType="all" :ableIds="ableAll.belongUserIdableIds" :disabled="judgeWrite('belongUserId')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfUserSelect>
             </jnpf-form-tip-item>
           </el-col>
 
           <el-col :span="8" v-if="judgeShow('inspectionTime')">
-            <jnpf-form-tip-item label="质检时间" v-if="judgeShow('inspectionTime')"
-              prop="inspectionTime">
-              <JnpfDatePicker v-model="dataForm.inspectionTime"
-                @change="changeData('inspectionTime',-1)" :startTime="dateTime(false,1,1,'','')"
-                :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
-                :disabled="judgeWrite('inspectionTime')" clearable :style='{"width":"100%"}'
-                type="datetime" format="yyyy-MM-dd HH:mm">
+            <jnpf-form-tip-item label="质检时间" v-if="judgeShow('inspectionTime')" prop="inspectionTime">
+              <JnpfDatePicker v-model="dataForm.inspectionTime" @change="changeData('inspectionTime', -1)"
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                :disabled="judgeWrite('inspectionTime')" clearable :style='{ "width": "100%" }' type="datetime"
+                format="yyyy-MM-dd HH:mm">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
-              <JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
-                placeholder="请输入" :disabled="judgeWrite('remark')" clearable
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
+                :disabled="judgeWrite('remark')" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -84,29 +71,26 @@
               </div>
               <el-table :data="dataForm.warehousingInspectionVoucherList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="凭证单据编号"
-                  v-if="judgeShow('warehousinginspectionvoucher-voucheId')" prop="voucheId">
+                <el-table-column label="凭证单据编号" v-if="judgeShow('warehousinginspectionvoucher-voucheId')"
+                  prop="voucheId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-voucheId')">*</span>凭证单据编号
                   </template>
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.voucheId" @change="inspectionVoucher"
-                      :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.warehousinginspectionvouchervoucheId"
+                    <JnpfPopupSelect v-model="scope.row.voucheId" @change="inspectionVoucher" :rowIndex="scope.$index"
+                      :formData="dataForm" :templateJson="interfaceRes.warehousinginspectionvouchervoucheId"
                       placeholder="请选择"
-                      :disabled="judgeWrite('warehousinginspectionvoucherList')||judgeWrite('warehousinginspectionvoucherList-voucheId')"
+                      :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-voucheId')"
                       propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='voucher_code' :field="'voucheId'+scope.$index"
-                      interfaceId="530709323597241349" :pageSize="20"
-                      :columnOptions="warehousinginspectionvouchervoucheIdcolumnOptions" clearable
-                      :style='{"width":"100%"}'>
+                      relationField='voucher_code' :field="'voucheId' + scope.$index" interfaceId="530709323597241349"
+                      :pageSize="20" :columnOptions="warehousinginspectionvouchervoucheIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="单据类型"
-                  v-if="judgeShow('warehousinginspectionvoucher-documentTypes')"
+                <el-table-column label="单据类型" v-if="judgeShow('warehousinginspectionvoucher-documentTypes')"
                   prop="documentTypes">
                   <template slot="header">
                     <span class="required-sign"
@@ -114,48 +98,44 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.documentTypes"
-                      @change="changeData('warehousinginspectionvoucher-documentTypes',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionvoucherList')||judgeWrite('warehousinginspectionvoucherList-documentTypes')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousinginspectionvoucher-documentTypes', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-documentTypes')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="凭证类型"
-                  v-if="judgeShow('warehousinginspectionvoucher-voucherTypes')" prop="voucherTypes">
+                <el-table-column label="凭证类型" v-if="judgeShow('warehousinginspectionvoucher-voucherTypes')"
+                  prop="voucherTypes">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-voucherTypes')">*</span>凭证类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.voucherTypes"
-                      @change="changeData('warehousinginspectionvoucher-voucherTypes',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionvoucherList')||judgeWrite('warehousinginspectionvoucherList-voucherTypes')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousinginspectionvoucher-voucherTypes', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-voucherTypes')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="磅单编号"
-                  v-if="judgeShow('warehousinginspectionvoucher-pound_code')" prop="pound_code">
+                <el-table-column label="磅单编号" v-if="judgeShow('warehousinginspectionvoucher-pound_code')"
+                  prop="pound_code">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-pound_code')">*</span>磅单编号
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.pound_code"
-                      @change="changeData('warehousinginspectionvoucher-pound_code',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionvoucherList')||judgeWrite('warehousinginspectionvoucherList-pound_code')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousinginspectionvoucher-pound_code', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-pound_code')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="车辆信息"
-                  v-if="judgeShow('warehousinginspectionvoucher-vehicleNumber')"
+                <el-table-column label="车辆信息" v-if="judgeShow('warehousinginspectionvoucher-vehicleNumber')"
                   prop="vehicleNumber">
                   <template slot="header">
                     <span class="required-sign"
@@ -163,48 +143,44 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.vehicleNumber"
-                      @change="changeData('warehousinginspectionvoucher-vehicleNumber',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionvoucherList')||judgeWrite('warehousinginspectionvoucherList-vehicleNumber')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousinginspectionvoucher-vehicleNumber', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-vehicleNumber')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="毛重"
-                  v-if="judgeShow('warehousinginspectionvoucher-grossWeight')" prop="grossWeight">
+                <el-table-column label="毛重" v-if="judgeShow('warehousinginspectionvoucher-grossWeight')"
+                  prop="grossWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-grossWeight')">*</span>毛重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.grossWeight"
-                      @change="changeData('warehousinginspectionvoucher-grossWeight',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionvoucherList')||judgeWrite('warehousinginspectionvoucherList-grossWeight')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousinginspectionvoucher-grossWeight', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-grossWeight')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="皮重"
-                  v-if="judgeShow('warehousinginspectionvoucher-tareWeight')" prop="tareWeight">
+                <el-table-column label="皮重" v-if="judgeShow('warehousinginspectionvoucher-tareWeight')"
+                  prop="tareWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-tareWeight')">*</span>皮重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.tareWeight"
-                      @change="changeData('warehousinginspectionvoucher-tareWeight',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionvoucherList')||judgeWrite('warehousinginspectionvoucherList-tareWeight')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousinginspectionvoucher-tareWeight', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-tareWeight')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="扣重"
-                  v-if="judgeShow('warehousinginspectionvoucher-buckleWeight')"
+                <el-table-column label="扣重" v-if="judgeShow('warehousinginspectionvoucher-buckleWeight')"
                   prop="buckle_weight">
                   <template slot="header">
                     <span class="required-sign"
@@ -212,16 +188,14 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.buckleWeight"
-                      @change="changeData('warehousinginspectionvoucher-buckleWeight',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionvoucherList')||judgeWrite('warehousinginspectionvoucherList-buckleWeight')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousinginspectionvoucher-buckleWeight', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-buckleWeight')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50"
-                  v-if="!judgeWrite('warehousinginspectionvoucherList')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousinginspectionvoucherList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousinginspectionvoucherList(scope.$index)">删除</el-button>
@@ -247,45 +221,39 @@
               </div>
               <el-table :data="dataForm.warehousingInspectionProductList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="商品名称"
-                  v-if="judgeShow('warehousinginspectionproduct-productId')" prop="productId">
+                <el-table-column label="商品名称" v-if="judgeShow('warehousinginspectionproduct-productId')"
+                  prop="productId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionproductList-productId')">*</span>商品名称
                   </template>
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.productId" @change="inspectionProduct"
-                      :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.warehousinginspectionproductproductId"
+                    <JnpfPopupSelect v-model="scope.row.productId" @change="inspectionProduct" :rowIndex="scope.$index"
+                      :formData="dataForm" :templateJson="interfaceRes.warehousinginspectionproductproductId"
                       placeholder="请选择"
-                      :disabled="judgeWrite('warehousinginspectionproductList')||judgeWrite('warehousinginspectionproductList-productId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      popupType="dialog" relationField='name' :field="'productId'+scope.$index"
-                      interfaceId="530714636022995973" :pageSize="20"
-                      :columnOptions="warehousinginspectionproductproductIdcolumnOptions" clearable
-                      :style='{"width":"100%"}'>
+                      :disabled="judgeWrite('warehousinginspectionproductList') || judgeWrite('warehousinginspectionproductList-productId')"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='name' :field="'productId' + scope.$index" interfaceId="530714636022995973"
+                      :pageSize="20" :columnOptions="warehousinginspectionproductproductIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" v-if="judgeShow('warehousinginspectionproduct-spec')"
-                  prop="buckle_weight">
+                <el-table-column label="规格" v-if="judgeShow('warehousinginspectionproduct-spec')" prop="buckle_weight">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingInspectionProductList-spec')">*</span>规格
+                    <span class="required-sign" v-if="judgeRequired('warehousingInspectionProductList-spec')">*</span>规格
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.spec"
-                      @change="changeData('warehousinginspectionproduct-spec',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingInspectionProductList')||judgeWrite('warehousingInspectionProductList-spec')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousinginspectionproduct-spec', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousingInspectionProductList') || judgeWrite('warehousingInspectionProductList-spec')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="库存单位"
-                  v-if="judgeShow('warehousinginspectionproduct-inventoryUnitIds')"
+                <el-table-column label="库存单位" v-if="judgeShow('warehousinginspectionproduct-inventoryUnitIds')"
                   prop="buckle_weight">
                   <template slot="header">
                     <span class="required-sign"
@@ -293,16 +261,15 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.inventoryUnitIds"
-                      @change="changeData('warehousinginspectionproduct-inventoryUnitIds',scope.$index)"
+                      @change="changeData('warehousinginspectionproduct-inventoryUnitIds', scope.$index)"
                       placeholder="请输入"
-                      :disabled="judgeWrite('warehousingInspectionProductList')||judgeWrite('warehousingInspectionProductList-inventoryUnitIds')"
-                      clearable :style='{"width":"100%"}'>
+                      :disabled="judgeWrite('warehousingInspectionProductList') || judgeWrite('warehousingInspectionProductList-inventoryUnitIds')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50"
-                  v-if="!judgeWrite('warehousinginspectionproductList')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousinginspectionproductList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousinginspectionproductList(scope.$index)">删除</el-button>
@@ -328,70 +295,65 @@
               </div>
               <el-table :data="dataForm.warehousingInspectionConclusionList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="毛重"
-                  v-if="judgeShow('warehousinginspectionconclusion-grossWeight')"
+                <el-table-column label="毛重" v-if="judgeShow('warehousinginspectionconclusion-grossWeight')"
                   prop="grossWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionconclusionList-grossWeight')">*</span>毛重
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.grossWeight"
-                      @change="changeData('warehousinginspectionconclusion-grossWeight',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionconclusionList')||judgeWrite('warehousinginspectionconclusionList-grossWeight')"
-                      clearable :style='{"width":"100%"}'>
+                    {{ scope.row.grossWeight }}
+                    <JnpfInput v-model="scope.row.grossWeight" @change="grossWeightChange" :precision="6" :min="0"
+                      prop="grossWeight" placeholder="请输入" :disabled="judgeWrite('warehousinginspectionconclusionList') ||
+    judgeWrite('warehousinginspectionconclusionList-grossWeight')" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="皮重"
-                  v-if="judgeShow('warehousinginspectionconclusion-tareWeight')" prop="tareWeight">
+                <el-table-column label="皮重" v-if="judgeShow('warehousinginspectionconclusion-tareWeight')"
+                  prop="tareWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionconclusionList-tareWeight')">*</span>皮重
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.tareWeight"
-                      @change="changeData('warehousinginspectionconclusion-tareWeight',scope.$index)"
+                    {{ scope.row.tareWeight }}
+                    <JnpfInput v-model="scope.row.tareWeight" @change="grossWeightChange" :precision="6" :min="0"
                       placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionconclusionList')||judgeWrite('warehousinginspectionconclusionList-tareWeight')"
-                      clearable :style='{"width":"100%"}'>
+                      :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-tareWeight')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="扣重"
-                  v-if="judgeShow('warehousinginspectionconclusion-buckleWeight')"
+                <el-table-column label="扣重" v-if="judgeShow('warehousinginspectionconclusion-buckleWeight')"
                   prop="buckleWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionconclusionList-buckleWeight')">*</span>扣重
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.buckleWeight"
-                      @change="changeData('warehousinginspectionconclusion-buckleWeight',scope.$index)"
+                    <JnpfInput v-model="scope.row.buckleWeight" @change="grossWeightChange" :precision="6" :min="0"
                       placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionconclusionList')||judgeWrite('warehousinginspectionconclusionList-buckleWeight')"
-                      clearable :style='{"width":"100%"}'>
+                      :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-buckleWeight')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="净重(自动计算)"
-                  v-if="judgeShow('warehousinginspectionconclusion-netWeight')" prop="netWeight">
+                <el-table-column label="净重(自动计算)" v-if="judgeShow('warehousinginspectionconclusion-netWeight')"
+                  prop="netWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionconclusionList-netWeight')">*</span>净重(自动计算)
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.netWeight"
-                      @change="changeData('warehousinginspectionconclusion-netWeight',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionconclusionList')||judgeWrite('warehousinginspectionconclusionList-netWeight')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousinginspectionconclusion-netWeight', scope.$index)" :precision="6"
+                      :min="0" placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-netWeight')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="是否降级"
-                  v-if="judgeShow('warehousinginspectionconclusion-reduceLevel')"
+                <el-table-column label="是否降级" v-if="judgeShow('warehousinginspectionconclusion-reduceLevel')"
                   prop="reduceLevel">
                   <template slot="header">
                     <span class="required-sign"
@@ -399,32 +361,29 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.reduceLevel"
-                      @change="changeData('warehousinginspectionconclusion-reduceLevel',scope.$index)"
+                      @change="changeData('warehousinginspectionconclusion-reduceLevel', scope.$index)"
                       placeholder="请选择"
-                      :disabled="judgeWrite('warehousinginspectionconclusionList')||judgeWrite('warehousinginspectionconclusionList-reduceLevel')"
-                      clearable :style='{"width":"100%"}'
+                      :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-reduceLevel')"
+                      clearable :style='{ "width": "100%" }'
                       :options="warehousinginspectionconclusionreduceLevelOptions"
                       :props="warehousinginspectionconclusionreduceLevelProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="等级"
-                  v-if="judgeShow('warehousinginspectionconclusion-grade')" prop="grade">
+                <el-table-column label="等级" v-if="judgeShow('warehousinginspectionconclusion-grade')" prop="grade">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionconclusionList-grade')">*</span>等级
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.grade"
-                      @change="changeData('warehousinginspectionconclusion-grade',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionconclusionList')||judgeWrite('warehousinginspectionconclusionList-grade')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousinginspectionconclusion-grade', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-grade')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="创建用户"
-                  v-if="judgeShow('warehousinginspectionconclusion-creatorUserId')"
+                <el-table-column label="创建用户" v-if="judgeShow('warehousinginspectionconclusion-creatorUserId')"
                   prop="creatorUserId">
                   <template slot="header">
                     <span class="required-sign"
@@ -432,15 +391,14 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.creatorUserId"
-                      @change="changeData('warehousinginspectionconclusion-creatorUserId',scope.$index)"
+                      @change="changeData('warehousinginspectionconclusion-creatorUserId', scope.$index)"
                       placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionconclusionList')||judgeWrite('warehousinginspectionconclusionList-creatorUserId')"
-                      clearable :style='{"width":"100%"}'>
+                      :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-creatorUserId')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50"
-                  v-if="!judgeWrite('warehousinginspectionconclusionList')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousinginspectionconclusionList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousinginspectionconclusionList(scope.$index)">删除</el-button>
@@ -454,28 +412,24 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('conclusionType')">
-            <jnpf-form-tip-item label="检测结论" v-if="judgeShow('conclusionType')"
-              prop="conclusionType">
-              <JnpfSelect v-model="dataForm.conclusionType"
-                @change="changeData('conclusionType',-1)" placeholder="请选择"
-                :disabled="judgeWrite('conclusionType')" clearable :style='{"width":"100%"}'
+            <jnpf-form-tip-item label="检测结论" v-if="judgeShow('conclusionType')" prop="conclusionType">
+              <JnpfSelect v-model="dataForm.conclusionType" @change="changeData('conclusionType', -1)" placeholder="请选择"
+                :disabled="judgeWrite('conclusionType')" clearable :style='{ "width": "100%" }'
                 :options="conclusionTypeOptions" :props="conclusionTypeProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24" v-if="judgeShow('conclusionRemark')">
-            <jnpf-form-tip-item label="检验结果" v-if="judgeShow('conclusionRemark')"
-              prop="conclusionRemark">
-              <JnpfInput v-model="dataForm.conclusionRemark"
-                @change="changeData('conclusionRemark',-1)" placeholder="请输入"
-                :disabled="judgeWrite('conclusionRemark')" clearable :style='{"width":"100%"}'>
+            <jnpf-form-tip-item label="检验结果" v-if="judgeShow('conclusionRemark')" prop="conclusionRemark">
+              <JnpfInput v-model="dataForm.conclusionRemark" @change="changeData('conclusionRemark', -1)"
+                placeholder="请输入" :disabled="judgeWrite('conclusionRemark')" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <!-- 表单结束 -->
         </template>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+          @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@@ -535,13 +489,13 @@ export default {
           enabledmark: undefined
         },
         warehousingInspectionConclusionList: {
-          grossWeight: '',
+          grossWeight: 0,
           grossWeightOptions: [],
-          tareWeight: '',
+          tareWeight: 0,
           tareWeightOptions: [],
-          buckleWeight: '',
+          buckleWeight: 0,
           buckleWeightOptions: [],
-          netWeight: '',
+          netWeight: 0,
           netWeightOptions: [],
           reduceLevelOptions: [],
           grade: '',
@@ -570,6 +524,10 @@ export default {
         warehousingInspectionVoucherList: [],
         warehousingInspectionProductList: [],
         warehousingInspectionConclusionList: [],
+        grossWeight: 0,
+        tareWeight: 0,
+        buckleWeight: 0,
+        netWeight: 0,
         version: 0,
       },
       tableRequiredData: {},
@@ -655,17 +613,22 @@ export default {
   },
   mounted() { },
   methods: {
+    grossWeightChange(e, f) {
+      // debugger
+      // scope.row.netWeight = this.jnpf.floatSub(this.jnpf.floatSub(parseFloat(this.dataForm.grossWeight),
+      //   parseFloat(this.dataForm.tareWeight)), parseFloat(this.dataForm.buckleWeight))
+    },
+
     inspectionVoucher(model, row) {
       this.dataForm.productIds = row.product_id
       this.dataForm.warehousingInspectionVoucherList.push(row)
-      this.dataForm.warehousingInspectionVoucherList.splice(0, 1)
-
+      this.dataForm.warehousingInspectionVoucherList.splice(-2, 1)
     },
 
     inspectionProduct(model, row) {
       row.productId = row.id
       this.dataForm.warehousingInspectionProductList.push(row)
-      this.dataForm.warehousingInspectionProductList.splice(0, 1)
+      this.dataForm.warehousingInspectionProductList.splice(-2, 1)
 
     },
 
@@ -812,6 +775,10 @@ export default {
 
     },
     addwarehousinginspectionvoucherList() {
+      if (this.dataForm.warehousingInspectionVoucherList.length > 0) {
+        return
+      }
+
       let item = {
         // voucheId: '',
         voucheId: this.dataForm.voucheId,
@@ -836,6 +803,11 @@ export default {
       this.childIndex = -1
     },
     addwarehousinginspectionproductList() {
+
+      if (this.dataForm.warehousingInspectionProductList.length > 0) {
+        return
+      }
+
       let item = {
         productId: '',
       }
@@ -858,6 +830,10 @@ export default {
       this.childIndex = -1
     },
     addwarehousinginspectionconclusionList() {
+
+      if (this.dataForm.warehousingInspectionConclusionList.length > 0) {
+        return
+      }
       let item = {
         grossWeight: undefined,
         tareWeight: undefined,
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
index 772e2ee2..3b03bc59 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
@@ -1,12 +1,8 @@
-
-
-
-
-    <template>
-  <div :style="{margin: '0 auto',width:'100%'}">
+<template>
+  <div :style="{ margin: '0 auto', width: '100%' }">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
-        label-position="right" :disabled="setting.readonly">
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
+        :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
@@ -17,72 +13,62 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('documentNo')">
             <jnpf-form-tip-item label="单据编号" v-if="judgeShow('documentNo')" prop="documentNo">
-              <JnpfInput v-model="dataForm.documentNo" @change="changeData('documentNo',-1)"
-                placeholder="系统自动生成" :disabled="judgeWrite('documentNo')" readonly
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.documentNo" @change="changeData('documentNo', -1)" placeholder="系统自动生成"
+                :disabled="judgeWrite('documentNo')" readonly :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('warehousingOutboundType')">
-            <jnpf-form-tip-item label="单据类型" v-if="judgeShow('warehousingOutboundType')"
-              prop="warehousingOutboundType">
-              <JnpfSelect v-model="dataForm.warehousingOutboundType"
-                @change="changeData('warehousingOutboundType',-1)" placeholder="请选择"
-                :disabled="judgeWrite('warehousingOutboundType')" clearable
-                :style='{"width":"100%"}' :options="warehousingOutboundTypeOptions"
+            <jnpf-form-tip-item label="单据类型" v-if="judgeShow('warehousingOutboundType')" prop="warehousingOutboundType">
+              <JnpfSelect v-model="dataForm.warehousingOutboundType" @change="changeData('warehousingOutboundType', -1)"
+                placeholder="请选择" :disabled="judgeWrite('warehousingOutboundType')" clearable
+                :style='{ "width": "100%" }' :options="warehousingOutboundTypeOptions"
                 :props="warehousingOutboundTypeProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('warehousingId')">
             <jnpf-form-tip-item label="关联单号" v-if="judgeShow('warehousingId')" prop="warehousingId">
-              <JnpfPopupSelect v-model="dataForm.warehousingId"
-                @change="changeData('warehousingId',-1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.warehousingId" placeholder="请选择"
-                :disabled="judgeWrite('warehousingId')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='warehousing_code'
-                field='warehousingId' interfaceId="529924192531927237" :pageSize="20"
-                :columnOptions="warehousingIdcolumnOptions" clearable :style='{"width":"100%"}'>
+              <JnpfPopupSelect v-model="dataForm.warehousingId" @change="changeData('warehousingId', -1)"
+                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.warehousingId" placeholder="请选择"
+                :disabled="judgeWrite('warehousingId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                popupType="dialog" relationField='warehousing_code' field='warehousingId'
+                interfaceId="529924192531927237" :pageSize="20" :columnOptions="warehousingIdcolumnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('warehouseId')">
             <jnpf-form-tip-item label="出库仓库" v-if="judgeShow('warehouseId')" prop="warehouseId">
-              <JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId',-1)"
-                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.warehouseId"
-                placeholder="请选择" :disabled="judgeWrite('warehouseId')" propsValue="id"
-                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                field='warehouseId' interfaceId="529617754022498181" :pageSize="20"
-                :columnOptions="warehouseIdcolumnOptions" clearable :style='{"width":"100%"}'>
+              <JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)" :rowIndex="null"
+                :formData="dataForm" :templateJson="interfaceRes.warehouseId" placeholder="请选择"
+                :disabled="judgeWrite('warehouseId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                popupType="dialog" relationField='name' field='warehouseId' interfaceId="529617754022498181"
+                :pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
 
           <el-col :span="8" v-if="judgeShow('warehousingTime')">
-            <jnpf-form-tip-item label="出库时间" v-if="judgeShow('warehousingTime')"
-              prop="warehousingTime">
-              <JnpfDatePicker v-model="dataForm.warehousingTime"
-                @change="changeData('warehousingTime',-1)" :startTime="dateTime(false,1,1,'','')"
-                :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
-                :disabled="judgeWrite('warehousingTime')" clearable :style='{"width":"100%"}'
-                type="date" format="yyyy-MM-dd">
+            <jnpf-form-tip-item label="出库时间" v-if="judgeShow('warehousingTime')" prop="warehousingTime">
+              <JnpfDatePicker v-model="dataForm.warehousingTime" @change="changeData('warehousingTime', -1)"
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                :disabled="judgeWrite('warehousingTime')" clearable :style='{ "width": "100%" }' type="date"
+                format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('outboundReason')">
-            <jnpf-form-tip-item label="出库原因" v-if="judgeShow('outboundReason')"
-              prop="outboundReason">
-              <JnpfInput v-model="dataForm.outboundReason" @change="changeData('outboundReason',-1)"
-                placeholder="请输入" :disabled="judgeWrite('outboundReason')" clearable
-                :style='{"width":"100%"}'>
+            <jnpf-form-tip-item label="出库原因" v-if="judgeShow('outboundReason')" prop="outboundReason">
+              <JnpfInput v-model="dataForm.outboundReason" @change="changeData('outboundReason', -1)" placeholder="请输入"
+                :disabled="judgeWrite('outboundReason')" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
-              <JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
-                placeholder="请输入" :disabled="judgeWrite('remark')" clearable
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
+                :disabled="judgeWrite('remark')" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -106,17 +92,14 @@
                       v-if="judgeRequired('warehousingoutboundpoundlistList-voucherId')">*</span>关联凭证
                   </template>
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.voucherId" @change="changeDataVoucher"
-                      :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.warehousingoutboundpoundlistvoucherId"
+                    <JnpfPopupSelect v-model="scope.row.voucherId" @change="changeDataVoucher" :rowIndex="scope.$index"
+                      :formData="dataForm" :templateJson="interfaceRes.warehousingoutboundpoundlistvoucherId"
                       placeholder="请选择"
-                      :disabled="judgeWrite('warehousingoutboundpoundlistList')||judgeWrite('warehousingoutboundpoundlistList-voucherId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      popupType="dialog" relationField='voucher_code'
-                      :field="'voucherId'+scope.$index" interfaceId="529929122277773509"
-                      :pageSize="20"
-                      :columnOptions="warehousingoutboundpoundlistvoucherIdcolumnOptions" clearable
-                      :style='{"width":"100%"}'>
+                      :disabled="judgeWrite('warehousingoutboundpoundlistList') || judgeWrite('warehousingoutboundpoundlistList-voucherId')"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='voucher_code' :field="'voucherId' + scope.$index" interfaceId="529929122277773509"
+                      :pageSize="20" :columnOptions="warehousingoutboundpoundlistvoucherIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
@@ -127,7 +110,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.documentTypes" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -138,7 +121,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.voucherType" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -149,7 +132,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.poundCode" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -160,7 +143,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.poundlistTime" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -171,7 +154,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.vehicleNumber" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -181,7 +164,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.productName" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -192,7 +175,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.productSpec" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -202,7 +185,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.unit" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -212,7 +195,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.grossWeight" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -222,7 +205,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.tareWeight" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -232,7 +215,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.buckleWeight" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -242,7 +225,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.netWeight" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -253,13 +236,12 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.remark" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50"
-                  v-if="!judgeWrite('warehousingoutboundpoundlistList')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingoutboundpoundlistList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousingoutboundpoundlistList(scope.$index)">删除</el-button>
@@ -281,7 +263,7 @@
           <el-col :span="24">
             <jnpf-form-tip-item>
               <JnpfText
-                :textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":12,"line-height":32,"font-style":"normal","text-align":"left"}'
+                :textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 12, "line-height": 32, "font-style": "normal", "text-align": "left" }'
                 content="默认展示关联单据的商品信息，可直接修改商品数量。">
               </JnpfText>
             </jnpf-form-tip-item>
@@ -293,23 +275,20 @@
               </div>
               <el-table :data="dataForm.warehousingOutboundProductList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="商品名称"
-                  v-if="judgeShow('warehousingoutboundproduct-productId')" prop="productId">
+                <el-table-column label="商品名称" v-if="judgeShow('warehousingoutboundproduct-productId')" prop="productId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingoutboundproductList-productId')">*</span>商品名称
                   </template>
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.productId" @change="changeDataProduct"
-                      :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.warehousingoutboundproductproductId"
+                    <JnpfPopupSelect v-model="scope.row.productId" @change="changeDataProduct" :rowIndex="scope.$index"
+                      :formData="dataForm" :templateJson="interfaceRes.warehousingoutboundproductproductId"
                       placeholder="请选择"
-                      :disabled="judgeWrite('warehousingoutboundproductList')||judgeWrite('warehousingoutboundproductList-productId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      popupType="dialog" relationField='name' :field="'productId'+scope.$index"
-                      interfaceId="529622659227471749" :pageSize="20"
-                      :columnOptions="warehousingoutboundproductproductIdcolumnOptions" clearable
-                      :style='{"width":"100%"}'>
+                      :disabled="judgeWrite('warehousingoutboundproductList') || judgeWrite('warehousingoutboundproductList-productId')"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='name' :field="'productId' + scope.$index" interfaceId="529622659227471749"
+                      :pageSize="20" :columnOptions="warehousingoutboundproductproductIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
@@ -330,31 +309,27 @@
                     <span class="required-sign"></span>规格
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="productIds" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                    <JnpfInput v-model="productIds" placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="出库单位"
-                  v-if="judgeShow('warehousingoutboundproduct-outboundUnit')" prop="outboundUnit">
+                <el-table-column label="出库单位" v-if="judgeShow('warehousingoutboundproduct-outboundUnit')"
+                  prop="outboundUnit">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingoutboundproductList-outboundUnit')">*</span>出库单位
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.outboundUnit"
-                      @change="changeData('warehousingoutboundproduct-outboundUnit',scope.$index)"
+                      @change="changeData('warehousingoutboundproduct-outboundUnit', scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.warehousingoutboundproductoutboundUnit"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('warehousingoutboundproductList')||judgeWrite('warehousingoutboundproductList-outboundUnit')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      popupType="dialog" relationField='unit_name'
-                      :field="'outboundUnit'+scope.$index" interfaceId="523054191598383685"
-                      :pageSize="20"
-                      :columnOptions="warehousingoutboundproductoutboundUnitcolumnOptions" clearable
-                      :style='{"width":"100%"}'>
+                      :templateJson="interfaceRes.warehousingoutboundproductoutboundUnit" placeholder="请选择"
+                      :disabled="judgeWrite('warehousingoutboundproductList') || judgeWrite('warehousingoutboundproductList-outboundUnit')"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='unit_name' :field="'outboundUnit' + scope.$index" interfaceId="523054191598383685"
+                      :pageSize="20" :columnOptions="warehousingoutboundproductoutboundUnitcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
@@ -365,7 +340,7 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="dataForm.spec" placeholder="请输入" disabled clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -375,8 +350,8 @@
                     <span class="required-sign"></span>库存单位
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="dataForm.inventoryUnitIds" placeholder="请输入" disabled
-                      clearable :style='{"width":"100%"}'>
+                    <JnpfInput v-model="dataForm.inventoryUnitIds" placeholder="请输入" disabled clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -386,14 +361,13 @@
                     <span class="required-sign"></span>入库单位规格
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.storageNumber" placeholder="请输入" disabled
-                      clearable :style='{"width":"100%"}'>
+                    <JnpfInput v-model="scope.row.storageNumber" placeholder="请输入" disabled clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="出库货区"
-                  v-if="judgeShow('warehousingoutboundproduct-outboundAreaId')"
+                <el-table-column label="出库货区" v-if="judgeShow('warehousingoutboundproduct-outboundAreaId')"
                   prop="outboundAreaId">
                   <template slot="header">
                     <span class="required-sign"
@@ -401,21 +375,18 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.outboundAreaId"
-                      @change="changeData('warehousingoutboundproduct-outboundAreaId',scope.$index)"
+                      @change="changeData('warehousingoutboundproduct-outboundAreaId', scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.warehousingoutboundproductoutboundAreaId"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('warehousingoutboundproductList')||judgeWrite('warehousingoutboundproductList-outboundAreaId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      popupType="dialog" relationField='name' :field="'outboundAreaId'+scope.$index"
-                      interfaceId="529624294691458949" :pageSize="20"
-                      :columnOptions="warehousingoutboundproductoutboundAreaIdcolumnOptions"
-                      clearable :style='{"width":"100%"}'>
+                      :templateJson="interfaceRes.warehousingoutboundproductoutboundAreaId" placeholder="请选择"
+                      :disabled="judgeWrite('warehousingoutboundproductList') || judgeWrite('warehousingoutboundproductList-outboundAreaId')"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='name' :field="'outboundAreaId' + scope.$index" interfaceId="529624294691458949"
+                      :pageSize="20" :columnOptions="warehousingoutboundproductoutboundAreaIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="出库数量"
-                  v-if="judgeShow('warehousingoutboundproduct-outboundNumber')"
+                <el-table-column label="出库数量" v-if="judgeShow('warehousingoutboundproduct-outboundNumber')"
                   prop="outboundNumber">
                   <template slot="header">
                     <span class="required-sign"
@@ -423,38 +394,34 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.outboundNumber"
-                      @change="changeData('warehousingoutboundproduct-outboundNumber',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingoutboundproductList')||judgeWrite('warehousingoutboundproductList-outboundNumber')"
-                      clearable :style='{"width":"100%"}'>
+                      @change="changeData('warehousingoutboundproduct-outboundNumber', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousingoutboundproductList') || judgeWrite('warehousingoutboundproductList-outboundNumber')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="批次号"
-                  v-if="judgeShow('warehousingoutboundproduct-batchNumber')" prop="batchNumber">
+                <el-table-column label="批次号" v-if="judgeShow('warehousingoutboundproduct-batchNumber')"
+                  prop="batchNumber">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingoutboundproductList-batchNumber')">*</span>批次号
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.batchNumber"
-                      @change="changeData('warehousingoutboundproduct-batchNumber',scope.$index)"
+                      @change="changeData('warehousingoutboundproduct-batchNumber', scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.warehousingoutboundproductbatchNumber"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('warehousingoutboundproductList')||judgeWrite('warehousingoutboundproductList-batchNumber')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      popupType="dialog" relationField='storage_number'
-                      :field="'batchNumber'+scope.$index" interfaceId="529928174901940421"
-                      :pageSize="20"
+                      :templateJson="interfaceRes.warehousingoutboundproductbatchNumber" placeholder="请选择"
+                      :disabled="judgeWrite('warehousingoutboundproductList') || judgeWrite('warehousingoutboundproductList-batchNumber')"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='storage_number' :field="'batchNumber' + scope.$index"
+                      interfaceId="529928174901940421" :pageSize="20"
                       :columnOptions="warehousingoutboundproductbatchNumbercolumnOptions" clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="生产日期"
-                  v-if="judgeShow('warehousingoutboundproduct-dateManufacture')"
+                <el-table-column label="生产日期" v-if="judgeShow('warehousingoutboundproduct-dateManufacture')"
                   prop="dateManufacture">
                   <template slot="header">
                     <span class="required-sign"
@@ -462,16 +429,15 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfDatePicker v-model="scope.row.dateManufacture"
-                      @change="changeData('warehousingoutboundproduct-dateManufacture',scope.$index)"
-                      :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
+                      @change="changeData('warehousingoutboundproduct-dateManufacture', scope.$index)"
+                      :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
                       placeholder="请选择"
-                      :disabled="judgeWrite('warehousingoutboundproductList')||judgeWrite('warehousingoutboundproductList-dateManufacture')"
-                      clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
+                      :disabled="judgeWrite('warehousingoutboundproductList') || judgeWrite('warehousingoutboundproductList-dateManufacture')"
+                      clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50"
-                  v-if="!judgeWrite('warehousingoutboundproductList')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingoutboundproductList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousingoutboundproductList(scope.$index)">删除</el-button>
@@ -486,8 +452,8 @@
           </el-col>
           <!-- 表单结束 -->
         </template>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+          @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@@ -665,7 +631,9 @@ export default {
     }
     this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
   },
-  mounted() { },
+  mounted() {
+    this.initOutboundData();
+  },
   methods: {
     changeDataVoucher(model, row) {
       this.dataForm.documentTypes = row.documentTypes
@@ -693,10 +661,15 @@ export default {
       this.dataForm.barCode = row.bar_code
       this.dataForm.operateUnitIds = row.operate_unit_ids
       this.dataForm.productTypeIds = row.product_type_ids
-
       this.dataForm.warehousingoutboundproductList.push(row)
       this.dataForm.warehousingoutboundproductList.splice(0, 1)
+    },
 
+    initOutboundData() {
+      const data = this.setting.selectData
+      if (data.flag == '出库通知转出库单') {
+        this.dataForm.warehousingId = data[0].id
+      }
     },
 
     changeData(model, index) {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue
index 35f8b7bb..7ba9d795 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue
@@ -21,8 +21,9 @@
           <el-col :span="8" v-if="judgeShow('warehousingStorageType')">
             <jnpf-form-tip-item label="业务类型" v-if="judgeShow('warehousingStorageType')" prop="warehousingStorageType">
               <JnpfSelect v-model="dataForm.warehousingStorageType" @change="changeData('warehousingStorageType', -1)"
-                placeholder="请选择" :disabled="judgeWrite('warehousingStorageType')" clearable :style='{ "width": "100%" }'
-                :options="warehousingStorageTypeOptions" :props="warehousingStorageTypeProps">
+                placeholder="请选择" :disabled="judgeWrite('warehousingStorageType')" clearable
+                :style='{ "width": "100%" }' :options="warehousingStorageTypeOptions"
+                :props="warehousingStorageTypeProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -195,7 +196,8 @@
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="dataForm.unit" placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="dataForm.unit" placeholder="请输入" disabled clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -255,7 +257,8 @@
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="dataForm.remark" placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="dataForm.remark" placeholder="请输入" disabled clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -322,7 +325,8 @@
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="dataForm.spec" placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="dataForm.spec" placeholder="请输入" disabled clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -369,7 +373,8 @@
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -389,8 +394,9 @@
                       :templateJson="interfaceRes.warehousingstorageproductstorageAreaId" placeholder="请选择"
                       :disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-storageAreaId')"
                       hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='cargo_name' :field="'storageAreaId' + scope.$index" interfaceId="529624294691458949"
-                      :pageSize="20" :columnOptions="warehousingstorageproductstorageAreaIdcolumnOptions" clearable
+                      relationField='cargo_name' :field="'storageAreaId' + scope.$index"
+                      interfaceId="529624294691458949" :pageSize="20"
+                      :columnOptions="warehousingstorageproductstorageAreaIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
@@ -438,7 +444,8 @@
                   <template slot-scope="scope">
                     <JnpfDatePicker v-model="scope.row.dateManufacture"
                       @change="changeData('warehousingstorageproduct-dateManufacture', scope.$index)"
-                      :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                      :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
+                      placeholder="请选择"
                       :disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-dateManufacture')"
                       clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
@@ -623,7 +630,10 @@ export default {
     }
     this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
   },
-  mounted() { },
+  mounted() {
+    this.initStorageData();
+  },
+
   methods: {
     changeDataVoucher(model, row) {
       this.dataForm.documentTypes = row.documentTypes
@@ -651,6 +661,26 @@ export default {
       this.dataForm.productTypeIds = row.product_type_ids
     },
 
+    initStorageData() {
+      const data = this.setting.selectData
+      // if (data.flag == '采购收货凭证生成采购单') {
+      //   this.dataForm.firstSubjectBasicId = data[0].supplierId
+      //   this.dataForm.enterpriseId = data[0].customerId
+      //   data.forEach(item => {
+      //     this.dataForm.businessOrderProductRelationalList = []
+      //     this.dataForm.businessOrderProductRelationalList = item.voucherProductList
+      //   });
+      // }
+      if (data.flag == '入库通知转入库单') {
+        this.dataForm.warehousingId = data[0].id
+        // this.dataForm.businessLineId = data[0].businessLineId_id
+        // this.dataForm.counterpartOrderCode = data[0].counterpartOrderCode
+        // this.dataForm.urgentOrder = data[0].urgentOrder
+        // this.deliveryType = data[0].deliveryType
+        // this.dataForm.businessOrderProductRelationalList = data[0].businessOrderProductRelationalList
+      }
+    },
+
     changeData(model, index) {
       this.isEdit = false
       this.childIndex = index
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
index f13fad6d..6494324e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
@@ -22,8 +22,7 @@
             <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="addOrUpdateHandle()">新增
             </el-button> -->
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
-              v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -39,8 +38,7 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
             </el-tooltip>
 
           </div>
@@ -91,11 +89,11 @@
 
           <el-table-column prop="flowState" label="状态" width="100">
             <template slot-scope="scope" v-if="!scope.row.top">
-              <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
-              <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
-              <el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
-              <el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
+              <el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
+              <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
@@ -109,39 +107,35 @@
                 @click="handleDel(scope.row.id)">删除
               </el-button> -->
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
-                @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
+                @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
 
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage"
-          :limit.sync="listQuery.pageSize" @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
-      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
-      lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
+      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
       <el-scrollbar class="template-list">
         <!-- <div class="template-item" v-for="item in flowList" :key="item.id"
           @click="selectFlow(item)">{{item.fullName}}
         </div> -->
 
-        <div class="template-item" v-for="item in flowList" :key="item.id"
-          @click="selectFlow(item)">{{"入库单"}}
+        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ "入库单" }}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
-      @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-      @superQuery="superQuery" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
 
     <purRouter v-if="purVisible" ref="purRouter" @refresh="initData" />
 
@@ -218,6 +212,7 @@ export default {
       flowVisible: false,
       flowListVisible: false,
       flowList: [],
+      warehousingstorageFlowList: [],
       exportBoxVisible: false,
       warehousingTypeOptions: [{ "fullName": "销售出库", "id": "8" }],
       warehousingTypeProps: { "label": "fullName", "value": "id" },
@@ -249,6 +244,17 @@ export default {
         this.$router.push('/404');
       })
     })
+
+    getFormById("529614060577116037").then(res1 => {
+      let storageFlowId = res1.data && res1.data.id
+      getFlowList(storageFlowId, '1').then(res2 => {
+        this.warehousingstorageFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
+
   },
   methods: {
 
@@ -268,13 +274,38 @@ export default {
         })
         return
       }
-      const data = this.multipleSelectionItem
+      const selectData = this.multipleSelectionItem
+      if (selectData.warehousingStatus == '4') {
+        this.$message({
+          type: 'error',
+          message: '该订单已经入库',
+          duration: 1500,
+        })
+        return
+      }
 
-      // this.multipleSelectionItem.warehousingId = this.multipleSelectionItem.id
-      // console.log(this.multipleSelectionItem);
-      this.flowListVisible = true
+      selectData.flag = '入库通知转入库单'
+      if (!this.warehousingstorageFlowList.length) {
+        this.$message({ type: 'error', message: '流程不存在' });
+      } else if (this.warehousingstorageFlowList.length === 1) {
+        this.selectFlow1(this.warehousingstorageFlowList[0], selectData)
+        console.log(this.warehousingstorageFlowList[0]);
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    selectFlow1(item, selectData) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1',
+        selectData: selectData
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
       this.$nextTick(() => {
-        this.$refs.purRouter.init(data)
+        this.$refs.FlowBox.init(data)
       })
     },
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
index 15aaefc7..8cb4ad9b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -46,8 +39,7 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
             </el-tooltip>
           </div>
         </div>
@@ -99,26 +91,26 @@
 
           <el-table-column prop="flowState" label="状态" width="100">
             <template slot-scope="scope" v-if="!scope.row.top">
-              <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
-              <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
-              <el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
-              <el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
+              <el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
+              <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
-              <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
+              <el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
               <el-button type="text" class="JNPF-table-delBtn"
-                :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
+                :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1" v-has="'btn_remove'"
                 @click="handleDel(scope.row.id)">删除
               </el-button>
 
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
-                @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
+                @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
               </el-button>
 
               <!-- <el-button type="text" icon="icon-ym icon-ym-btn-add" v-has="'btn-warehousingsale'"
@@ -128,33 +120,29 @@
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage"
-          :limit.sync="listQuery.pageSize" @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
-      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
-      lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
+      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id"
-          @click="selectFlow(item)">
+        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">
           <!-- {{item.fullName}} -->
-          {{"出库单"}}
+          {{ "出库单" }}
 
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
-      @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-      @superQuery="superQuery" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
 
     <saleRouter v-if="saleVisible" ref="saleRouter" @refresh="initData" />
 
@@ -231,6 +219,7 @@ export default {
       flowVisible: false,
       flowListVisible: false,
       flowList: [],
+      warehousingOutboundFlowList: [],
       exportBoxVisible: false,
       warehousingTypeOptions: [{ "fullName": "销售出库", "id": "8" }],
       warehousingTypeProps: { "label": "fullName", "value": "id" },
@@ -262,6 +251,17 @@ export default {
         this.$router.push('/404');
       })
     })
+
+    getFormById("529923232405409989").then(res1 => {
+      let outboundFlowId = res1.data && res1.data.id
+      getFlowList(outboundFlowId, '1').then(res2 => {
+        this.warehousingOutboundFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
+
   },
   methods: {
 
@@ -281,10 +281,38 @@ export default {
         })
         return
       }
-      const data = this.multipleSelectionItem
-      this.flowListVisible = true
+      const selectData = this.multipleSelectionItem
+      if (selectData.warehousingStatus == '4') {
+        this.$message({
+          type: 'error',
+          message: '该订单已经出库',
+          duration: 1500,
+        })
+        return
+      }
+
+      selectData.flag = '出库通知转出库单'
+      if (!this.warehousingOutboundFlowList.length) {
+        this.$message({ type: 'error', message: '流程不存在' });
+      } else if (this.warehousingOutboundFlowList.length === 1) {
+        this.selectFlow1(this.warehousingOutboundFlowList[0], selectData)
+        console.log(this.warehousingOutboundFlowList[0]);
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    selectFlow1(item, selectData) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1',
+        selectData: selectData
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
       this.$nextTick(() => {
-        this.$refs.saleRouter.init(data)
+        this.$refs.FlowBox.init(data)
       })
     },
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
index ce22bb87..2a2d962b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
@@ -476,7 +476,7 @@
 
                 <el-table-column label="操作" width="50" v-if="!judgeWrite('workorderprimaryList')">
 
-      
+
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delworkorderprimaryList(scope.$index)">删除</el-button>