diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java
index a6375f88..4f489c0d 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java
@@ -574,4 +574,22 @@ public class WarehousingReportlossController {
         return ActionResult.success(warehousingReportlossMap);
     }
 
+    /**
+     * 获取原材料商品的批次号列表
+     *
+     * @return
+     */
+    @Operation(summary = "获取原材料商品的批次号列表")
+    @GetMapping("/getReportlossBatnumberList")
+    public ActionResult reportlossBatnumberList(@RequestParam("warehouseId") String warehouseId,@RequestParam("warehousingReportlossProductList-productId") String productId,@RequestParam("warehousingReportlossProductList-cargoId") String cargoId) throws IOException{
+
+        QueryWrapper<InventoryEntity> inventoryEntityQueryWrapper =new QueryWrapper<>();
+        inventoryEntityQueryWrapper.lambda().eq(InventoryEntity::getWarehouseId,warehouseId);
+        inventoryEntityQueryWrapper.lambda().eq(InventoryEntity::getStorageAreaId,cargoId);
+        inventoryEntityQueryWrapper.lambda().eq(InventoryEntity::getProductId,productId);
+        List<InventoryEntity> inventoryEntityList =inventoryService.list(inventoryEntityQueryWrapper);
+        return ActionResult.success(inventoryEntityList);
+    }
+
+
 }
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 77e749f4..16a98ee3 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
@@ -1104,8 +1104,6 @@ public class WorkOrderController {
         inventoryEntityQueryWrapper.lambda().eq(InventoryEntity::getStorageAreaId,cargoId);
         inventoryEntityQueryWrapper.lambda().eq(InventoryEntity::getProductId,productId);
         List<InventoryEntity> inventoryEntityList =inventoryService.list(inventoryEntityQueryWrapper);
-
-
         return ActionResult.success(inventoryEntityList);
     }
 
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamUseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamUseEntity.java
index d824e6cd..c74a0946 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamUseEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamUseEntity.java
@@ -42,4 +42,8 @@ public class ClassTeamUseEntity  {
     private String organizeJsonId;
     @TableField("F_TENANT_ID")
     private String tenantId;
+    @TableField(value = "MOBILE_PHONE" , updateStrategy = FieldStrategy.IGNORED)
+    private String mobilePhone;
+    @TableField(value = "ORGANIZE" , updateStrategy = FieldStrategy.IGNORED)
+    private String organize;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/classteam/ClassTeamUseModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/classteam/ClassTeamUseModel.java
index e198e130..98263d88 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/classteam/ClassTeamUseModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/classteam/ClassTeamUseModel.java
@@ -1,5 +1,7 @@
 package jnpf.model.classteam;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import java.util.List;
 import java.util.Date;
@@ -22,4 +24,9 @@ public class ClassTeamUseModel  {
     @JSONField(name = "belongUserId")
     private Object belongUserId;
 
+    @JSONField(name = "mobilePhone")
+    private String mobilePhone;
+    @JSONField(name = "organize")
+    private String organize;
+
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/bom/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/bom/form.vue
index ac2c5f1d..5b12a3d8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/bom/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/bom/form.vue
@@ -58,11 +58,10 @@
                     <JnpfPopupSelect v-model="scope.row.productId" @change="productSelect"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.bomitemproductId" placeholder="请选择"
-                      :disabled="judgeWrite('bomitemList') || judgeWrite('bomitemList-productId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据商品"
-                      popupType="dialog" relationField='name' :field="'productId' + scope.$index"
-                      interfaceId="519505017699307077" :pageSize="20"
-                      :columnOptions="bomitemproductIdcolumnOptions" clearable
+                      :disabled="true" hasPage propsValue="id" popupWidth="800px"
+                      popupTitle="选择数据商品" popupType="dialog" relationField='name'
+                      :field="'productId' + scope.$index" interfaceId="519505017699307077"
+                      :pageSize="20" :columnOptions="bomitemproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
@@ -160,11 +159,10 @@
                     <JnpfPopupSelect v-model="scope.row.productId" @change="productBomSelect"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.bomitemvalueproductId" placeholder="请选择"
-                      :disabled="judgeWrite('bomitemvalueList') || judgeWrite('bomitemvalueList-productId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据商品"
-                      popupType="dialog" relationField='name' :field="'productId' + scope.$index"
-                      interfaceId="519505017699307077" :pageSize="20"
-                      :columnOptions="bomitemvalueproductIdcolumnOptions" clearable
+                      :disabled="true" hasPage propsValue="id" popupWidth="800px"
+                      popupTitle="选择数据商品" popupType="dialog" relationField='name'
+                      :field="'productId' + scope.$index" interfaceId="519505017699307077"
+                      :pageSize="20" :columnOptions="bomitemvalueproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/classteam/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/classteam/form.vue
index bd134d27..07fafe46 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/classteam/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/classteam/form.vue
@@ -487,20 +487,29 @@ export default {
       this.$emit('refreshDataList', true)
     },
     changeDataList(model, row) {
-      // request({
-      //   url: '/api/permission/Users/'+model,
-      //   method: 'get'
-      // }).then(res => {
-      //   console.log(res.data.account);
-      //   this.dataForm.classTeamUseList.account=res.data.account
-      //   console.log(this.dataForm.classTeamUseList.account);
-      // });
 
-      // console.log(model, row);
-      // this.dataForm.mobilePhone = row.mobilePhone
-      row.belongUserId = row.id
-      this.dataForm.classTeamUseList.push(row)
-      this.dataForm.classTeamUseList.splice(-2, 1)
+      // row.belongUserId = row.id
+      // this.dataForm.classTeamUseList.push(row)
+      // this.dataForm.classTeamUseList.splice(-2, 1)
+      let i = 0
+      this.dataForm.classTeamUseList.forEach((e, index) => {
+        if (e.belongUserId == model) {
+          e.mobilePhone = row.mobilePhone,
+            e.organize = row.organize,
+            i++
+        }
+        if (i > 1) {
+          setTimeout(() => {
+            e.belongUserId = undefined
+          }, 100);
+          this.$message({
+            message: '姓名不能重复',
+            type: 'error',
+            duration: 1000
+          })
+        }
+        return
+      })
     },
     userName(val, val2) {
       let i = 0
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 af241cf3..aee88523 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
@@ -32,11 +32,21 @@
           <el-col :span="8" v-if="judgeShow('inspectionType')">
             <jnpf-form-tip-item label="质检类型" v-if="judgeShow('inspectionType')"
               prop="inspectionType">
+
+              <JnpfSelect v-model="dataForm.inspectionType"
+                v-if="dataForm.inspectionType==undefined" @change="changeData('inspectionType', -1)"
+                placeholder="请选择" :disabled="judgeWrite('inspectionType')" clearable
+                :style='{ "width": "100%" }' :options="inspectionTypeOptions"
+                :props="inspectionTypeProps">
+              </JnpfSelect>
+
               <JnpfSelect v-model="dataForm.inspectionType"
-                @change="changeData('inspectionType', -1)" placeholder="请选择"
-                :disabled="judgeWrite('inspectionType')" clearable :style='{ "width": "100%" }'
-                :options="inspectionTypeOptions" :props="inspectionTypeProps">
+                v-else-if="dataForm.inspectionType!=undefined"
+                @change="changeData('inspectionType', -1)" placeholder="请选择" :disabled="true"
+                clearable :style='{ "width": "100%" }' :options="inspectionTypeOptions"
+                :props="inspectionTypeProps">
               </JnpfSelect>
+
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('belongUserId')">
@@ -93,11 +103,10 @@
                     <JnpfPopupSelect v-model="scope.row.voucheId" @change="inspectionVoucher"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.warehousinginspectionvouchervoucheId"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-voucheId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='voucher_code' :field="'voucheId' + scope.$index"
-                      interfaceId="530709323597241349" :pageSize="20"
+                      placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                      popupTitle="选择数据" popupType="dialog" relationField='voucher_code'
+                      :field="'voucheId' + scope.$index" interfaceId="530709323597241349"
+                      :pageSize="20"
                       :columnOptions="warehousinginspectionvouchervoucheIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
@@ -312,13 +321,13 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50" align="center"
+                <!-- <el-table-column label="操作" width="50" align="center"
                   v-if="!judgeWrite('warehousinginspectionproductList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousinginspectionproductList(scope.$index)">删除</el-button>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
               </el-table>
               <!-- <div class="table-actions" @click="addwarehousinginspectionproductList()"
                 v-if="!judgeWrite('warehousinginspectionproductList')">
@@ -440,24 +449,8 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <!-- <el-table-column label="创建用户"
-                  v-if="judgeShow('warehousinginspectionconclusion-creatorUserId')"
-                  prop="creatorUserId">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousinginspectionconclusionList-creatorUserId')">*</span>创建用户
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.creatorUserId"
-                      @change="changeData('warehousinginspectionconclusion-creatorUserId', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-creatorUserId')"
-                      clearable :style='{ "width": "100%" }'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column> -->
 
-                <el-table-column label="创建用户"
+                <!-- <el-table-column label="创建用户"
                   v-if="judgeShow('warehousinginspectionconclusion-creatorUserId')"
                   prop="creatorUserId">
                   <template slot="header">
@@ -472,20 +465,20 @@
                       disabled clearable :style='{"width":"100%"}'>
                     </JnpfUserSelect>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
 
-                <el-table-column label="操作" width="50"
+                <!-- <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>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
               </el-table>
-              <div class="table-actions" @click="addwarehousinginspectionconclusionList()"
+              <!-- <div class="table-actions" @click="addwarehousinginspectionconclusionList()"
                 v-if="!judgeWrite('warehousinginspectionconclusionList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
-              </div>
+              </div> -->
 
               <!-- <div class="table-actions"
                 @click="choiceProduct(this.dataForm.warehousingInspectionVoucherList[0].productId)"
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
index ec2a10de..3736bb5e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
@@ -9,14 +9,7 @@
               <el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="业务类型">
-              <JnpfSelect v-model="query.warehousingOutboundType" placeholder="请选择" clearable
-                :options="warehousingOutboundTypeOptions" :props="warehousingStorageTypeProps"
-                multiple>
-              </JnpfSelect>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="6">
             <el-form-item label="入库时间">
               <JnpfDateRangePicker v-model="query.warehousingTime" format="yyyy-MM-dd"
@@ -25,12 +18,7 @@
             </el-form-item>
           </el-col>
           <template v-if="showAll">
-            <el-col :span="6">
-              <el-form-item label="-批次号">
-                <el-input v-model="query.tableField119_batchNumber" placeholder="请输入" clearable>
-                </el-input>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="6">
               <el-form-item label="创建用户">
                 <JnpfUserSelect v-model="query.creatorUserId" placeholder="请选择" />
@@ -88,7 +76,7 @@
           <el-table-column prop="documentNo" label="单据编号" align="center" sortable width="200"
             fixed="left">
           </el-table-column>
-          <el-table-column label="业务类型" prop="warehousingOutboundType" align="center">
+          <el-table-column label="业务类型" prop="warehousingOutboundType" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.warehousingOutboundType}}
             </template>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/form.vue
index 2a9b2a49..3a1e1c0e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/form.vue
@@ -223,24 +223,6 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="批次号"
-                  v-if="judgeShow('warehousingreceiveproduct-batchNumber')" prop="batchNumber"
-                  align="center" width="200">
-
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingreceiveproductList-batchNumber')">*</span>批次号
-                  </template>
-
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.batchNumber"
-                      @change="changeData('warehousingreceiveproduct-batchNumber', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingreceiveproductList') || judgeWrite('warehousingreceiveproductList-batchNumber')"
-                      clearable :style='{ "width": "100%" }'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
 
                 <el-table-column label="货区名称" v-if="judgeShow('warehousingreceiveproduct-cargoId')"
                   prop="cargoId" align="center" width="200">
@@ -264,6 +246,25 @@
                   </template>
                 </el-table-column>
 
+                <el-table-column label="批次号"
+                  v-if="judgeShow('warehousingreceiveproduct-batchNumber')" prop="batchNumber"
+                  align="center" width="200">
+
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('warehousingreceiveproductList-batchNumber')">*</span>批次号
+                  </template>
+
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.batchNumber"
+                      @change="changeData('warehousingreceiveproduct-batchNumber', scope.$index)"
+                      placeholder="请输入"
+                      :disabled="judgeWrite('warehousingreceiveproductList') || judgeWrite('warehousingreceiveproductList-batchNumber')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+
                 <el-table-column label="操作" width="50" align="center" fixed="right"
                   v-if="!judgeWrite('warehousingreceiveproductList')">
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/form.vue
index fe8258e2..70818766 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/form.vue
@@ -237,22 +237,24 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="批次号"
-                  v-if="judgeShow('warehousingreportlossproduct-batchNumber')" prop="batchNumber"
-                  align="center" width="200">
-
+                <el-table-column label="批次号" width="200px"
+                  v-if="judgeShow('warehousingreportlossproduct-batchNumber')" prop="batchNumber">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingreportlossproductList-batchNumber')">*</span>批次号
                   </template>
-
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.batchNumber"
-                      @change="changeData('warehousingreportlossproduct-batchNumber', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingreportlossproductList') || judgeWrite('warehousingreportlossproductList-batchNumber')"
-                      clearable :style='{ "width": "100%" }'>
-                    </JnpfInput>
+                    <JnpfPopupSelect v-model="scope.row.batchNumber"
+                      @change="changeData('warehousingreportlossproduct-batchNumber',scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.warehousingreportlossproductbatchNumber"
+                      placeholder="请选择" hasPage propsValue="batchNumber" popupWidth="800px"
+                      popupTitle="选择数据" popupType="dialog" relationField='batchNumber'
+                      :field="'batchNumber'+scope.$index" interfaceId="551302018883414213"
+                      :pageSize="20"
+                      :columnOptions="warehousingreportlossproductbatchNumbercolumnOptions"
+                      clearable :style='{"width":"100%"}'>
+                    </JnpfPopupSelect>
                   </template>
                 </el-table-column>
 
@@ -397,6 +399,7 @@ export default {
       warehousingreportlossproductproductIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "商品编码", "value": "code" }, { "label": "批次号", "value": "batchNumber" },],
       warehousingreportlossproductreportlossUnitcolumnOptions: [{ "label": "单位", "value": "unit_name" },],
       warehousingreportlossproductcargoIdcolumnOptions: [{ "label": "货区名称", "value": "cargo_name" }, { "label": "描述", "value": "description" }],
+      warehousingreportlossproductbatchNumbercolumnOptions: [{ "label": "批次号", "value": "batchNumber" }, { "label": "商品名称", "value": "name" },],
 
       childIndex: -1,
       isEdit: false,
@@ -411,7 +414,10 @@ export default {
         warehousingreportlossproductreportlossUnit: [],
         warehousingreportlossproductreportlossNumber: [],
         warehousingreportlossproductcargoId: [{ "fieldName": "", "field": "businessOrganizeId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "AyAmdw1", "relationField": "warehouseId", "required": "0" }],
-
+        warehousingreportlossproductbatchNumber: [
+          { "fieldName": "", "field": "warehouseId", "defaultValue": "warehouseId", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "TGHGo32", "relationField": "warehouseId", "required": "0" },
+          { "fieldName": "", "field": "cargoId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "fFKGo32", "relationField": "warehousingReportlossProductList-cargoId", "required": "0" },
+          { "fieldName": "", "field": "productId", "defaultValue": "productId", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "SsNGo32", "relationField": "warehousingReportlossProductList-productId", "required": "0" }],
       },
     }
   },
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
index e12743e9..3313db6a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
@@ -24,12 +24,7 @@
             </el-form-item>
           </el-col>
           <template v-if="showAll">
-            <el-col :span="6">
-              <el-form-item label="-批次号">
-                <el-input v-model="query.tableField119_batchNumber" placeholder="请输入" clearable>
-                </el-input>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="6">
               <el-form-item label="创建用户">
                 <JnpfUserSelect v-model="query.creatorUserId" placeholder="请选择" />
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 e1c20a7a..aa1d4f6b 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
@@ -622,11 +622,11 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="批次号选择" v-if="judgeShow('workorderprimary-batchNumber')"
+                <el-table-column label="批次号" v-if="judgeShow('workorderprimary-batchNumber')"
                   width="180px" prop="batchNumber">
                   <template slot="header">
                     <span class="required-sign"
-                      v-if="judgeRequired('workorderprimaryList-batchNumber')">*</span>批次号选择
+                      v-if="judgeRequired('workorderprimaryList-batchNumber')">*</span>批次号
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.batchNumber"