diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
index 0b82d456..b760a777 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author Dreamchaser
@@ -62,6 +63,30 @@ public class MaterialController {
     }
 
 
+    /**
+     * 用于在盘点时获取到盘点位置的所有库存
+     *
+     * @param map
+     * @param request
+     * @return
+     */
+    @GetMapping("/findInventoryForStockTaking")
+    public RestResponse findInventoryForStockTaking(@RequestParam Map<String, Object> map, HttpServletRequest request) {
+        Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId"));
+        UserByPort userToken = (UserByPort) request.getAttribute("userToken");
+        if (Integer.compare(depositoryId, -1) == 0) {
+            return new RestResponse(null);
+        } else {
+            map.put("userTokenId",userToken.getId());
+            List<MaterialAndPlaceForView> inventoryForStockTaking = materialService.findInventoryForStockTaking(map);
+            return new RestResponse(inventoryForStockTaking,placeService.findPlaceAndMaterialCountByCondition(map),200);
+        }
+    }
+
+
+
+
+
     /**
      * 用于查询当前组合中物料的数量
      *
@@ -118,7 +143,7 @@ public class MaterialController {
         UserByPort userToken = (UserByPort) request.getAttribute("userToken");
         List<InventoryP> list = new ArrayList<>();
         Integer total = 0;
-        if(Integer.compare(userToken.getMaindeparment(),361) != 0){
+        if (Integer.compare(userToken.getMaindeparment(), 361) != 0) {
             // 查询当前用户管理的仓库
             List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
             // 查询当前用户部门拥有的仓库
@@ -204,8 +229,7 @@ public class MaterialController {
             ) {
                 inventoryP.setSplitInfoList(splitUnitService.findSplitInfoByMid(inventoryP.getMid()));
             }
-        }
-        else{
+        } else {
             list = materialService.findInventory(map);
             total = materialService.findInventoryCount(map);
         }
@@ -430,7 +454,7 @@ public class MaterialController {
                 depositoryIdList.add(rad.getDepositoryId());
             }
         }
-        for (Integer depositoryId :depositoryIdList
+        for (Integer depositoryId : depositoryIdList
         ) {
             param.put("depositoryId", depositoryId);
             List<InventoryP> inventoryPS = materialService.findInventory(param);
@@ -458,8 +482,7 @@ public class MaterialController {
             List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(ip.getMid());
             ip.setSplitInfoList(splitInfoByMid);
             return new RestResponse(ip, 1, 200);
-        }
-        else if ("in".equals(type)) {
+        } else if ("in".equals(type)) {
             param.put("code", code);
             materialPByCondition = materialService.findMaterialPByCondition(param);
             if (materialPByCondition.size() > 0) {
@@ -513,8 +536,8 @@ public class MaterialController {
                 depositoryIdList.add(rad.getDepositoryId());
             }
         }
-        for (Integer depositoryId :depositoryIdList
-             ) {
+        for (Integer depositoryId : depositoryIdList
+        ) {
             map.put("depositoryId", depositoryId);
             List<InventoryP> inventoryPS = materialService.findInventory(map);
             inventoryPList.addAll(inventoryPS);
@@ -566,7 +589,7 @@ public class MaterialController {
         }
         try {
             // 二维码保存信息
-            return RestResponse.CreateBarCode(qrCode,material.getMname());
+            return RestResponse.CreateBarCode(qrCode, material.getMname());
         } catch (IOException e) {
             return new RestResponse("err: " + e.getMessage(), 678, new StatusInfo("失败", "请联系开发人员"));
         }
@@ -897,12 +920,12 @@ public class MaterialController {
             depositoryIdList.add(depository.getId());
         }
         for (RoleAndDepository depository : depositoryAndRole) {
-            if(!depositoryIdList.contains(depository.getDepositoryId())){
+            if (!depositoryIdList.contains(depository.getDepositoryId())) {
                 depositoryIdList.add(depository.getDepositoryId());
             }
         }
 
-        for (Integer depositoryId:depositoryIdList){
+        for (Integer depositoryId : depositoryIdList) {
             param.put("mcode", mcode);
             param.put("depositoryId", depositoryId);
             // 获取当前仓库下是否有当前物料的库存
@@ -1214,13 +1237,13 @@ public class MaterialController {
                 depositoryIdList.add(depository.getId());
             }
             for (RoleAndDepository depository : depositoryAndRole) {
-                if(!depositoryIdList.contains(depository.getDepositoryId())){
+                if (!depositoryIdList.contains(depository.getDepositoryId())) {
                     depositoryIdList.add(depository.getDepositoryId());
                 }
             }
 
             List<PlaceP> placePList = new ArrayList<>();
-            for (Integer depositoryId:depositoryIdList) {
+            for (Integer depositoryId : depositoryIdList) {
                 Boolean isExist = false;
                 Map<String, Object> param = new HashMap<>();
                 param.put("depositoryId", depositoryId);
@@ -1310,8 +1333,8 @@ public class MaterialController {
                 if (isExist) {
                     materialList.add(mp);
                 }
-            } else {
                 // 如果当前条形码不存对应物料
+            } else {
                 barCodeListByNoMaterial.add(barCode);
             }
         }
@@ -1516,7 +1539,7 @@ public class MaterialController {
                 // 获取当前物料
                 InventoryP materialP = inventory.get(0);
                 MaterialAndPlace pm = placeService.findPlaceAndMaterialByMidAndPid(0, materialP.getId());
-                if(pm!=null) {
+                if (pm != null) {
                     Map<String, Object> paramForCode = new HashMap<>();
                     paramForCode.put("mcode", materialP.getCode());
                     paramForCode.put("codeFlag", 1);
@@ -1526,7 +1549,7 @@ public class MaterialController {
                     materialP.setMaterialAndBarCodeList(materialByBarCodeByCondition);
                     materialP.setBaseUnitQuantity(pm.getQuantity());
                     return new RestResponse(materialP, 1, 200);
-                }else {
+                } else {
                     return new RestResponse("", 0, 200);
                 }
             }
diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
index dc7b9c8a..2de8b57d 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
@@ -3,6 +3,8 @@ package com.dreamchaser.depository_manage.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PortConfig;
+import com.dreamchaser.depository_manage.entity.Inventory;
+import com.dreamchaser.depository_manage.entity.MaterialAndPlace;
 import com.dreamchaser.depository_manage.entity.Place;
 import com.dreamchaser.depository_manage.entity.UserByPort;
 import com.dreamchaser.depository_manage.pojo.RestResponse;
@@ -14,6 +16,7 @@ import com.dreamchaser.depository_manage.service.PlaceService;
 import com.dreamchaser.depository_manage.service.StockTakingService;
 import com.dreamchaser.depository_manage.service.impl.QyWxOperationService;
 import com.dreamchaser.depository_manage.utils.CrudUtil;
+import com.dreamchaser.depository_manage.utils.DateUtil;
 import com.dreamchaser.depository_manage.utils.Md5;
 import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,10 +24,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -277,9 +277,8 @@ public class StockTakingController {
         String minIds = (String) map.get("minIds");
         String[] split = minIds.split(",");
         List<Integer> minIdList = new ArrayList<>();
-        for (int i = 0; i < split.length; i++) {
-            String s = split[i];
-            if("".equals(s)){
+        for (String s : split) {
+            if ("".equals(s)) {
                 continue;
             }
             minIdList.add(ObjectFormatUtil.toInteger(s));
@@ -290,4 +289,81 @@ public class StockTakingController {
         Integer transfer = stockTakingService.stockTakingTransfer(map, userToken,crypt);
         return CrudUtil.postHandle(transfer,minIdList.size());
     }
+
+    @PostMapping("/temporaryStorageForTakingResult")
+    public void temporaryStorageForTakingResult(@RequestBody Map<String,Object> map,HttpServletRequest request){
+        // 获取当前盘点人
+        UserByPort userToken = (UserByPort) request.getAttribute("userToken");
+        // 获取当前暂存的结果id
+        String key = "wms_stockTaking_" + userToken.getId() + "_"+ DateUtil.getNowTime()+"_"+map.get("id");
+        map.put("flagForSubmit","false");
+        redisTemplateForHash.opsForHash().putAll(key,map);
+        // 存储到今天的12点
+        redisTemplateForHash.expire(key,DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS);
+
+    }
+
+
+    @PostMapping("/submitStockTaking")
+    public RestResponse submitStockTaking(@RequestBody Map<String,Object> map,HttpServletRequest request){
+        UserByPort userToken = (UserByPort) request.getAttribute("userToken");
+
+        String header = request.getHeader("user-agent");
+        String crypt = Md5.crypt(header);
+        // 获取所有有关当前key的键
+        String keyPatten = "wms_stockTaking_"+userToken.getId()+"_"+DateUtil.getNowTime()+"*";
+        Set<String> keys = redisTemplateForHash.keys(keyPatten);
+        int success = 0;
+        int size = 0;
+        if (keys != null && keys.size() > 0) {
+            size = keys.size();
+            // 定义用于插入的盘点记录
+            Map<String,Object> param = new HashMap<>();
+            // 如果存在
+            for (String key : keys) {
+                Boolean flagForSubmit = ObjectFormatUtil.toBoolean(redisTemplateForHash.opsForHash().get(key, "flagForSubmit"));
+                if(flagForSubmit != null && !flagForSubmit){
+                    // 如果是第一次提交
+
+                    // 获取盘点时的物料与库位的对应关系id
+                    Integer id = ObjectFormatUtil.toInteger(redisTemplateForHash.opsForHash().get(key, "id"));
+                    // 获取物料与库位的对应关系
+                    MaterialAndPlace placeAndMaterial = placeService.findPlaceAndMaterialById(id);
+
+                    Object unit = redisTemplateForHash.opsForHash().get(key, "unit");
+                    String takingResult = (String) redisTemplateForHash.opsForHash().get(key, "takingResult");
+                    Object number = redisTemplateForHash.opsForHash().get(key, "number");
+                    Object oldInventory = redisTemplateForHash.opsForHash().get(key, "oldInventory");
+                    Integer newInventory = ObjectFormatUtil.toInteger(oldInventory);
+                    if ("Inventory_down".equals(takingResult)) {
+                        // 如果盘亏
+                        newInventory -= ObjectFormatUtil.toInteger(number);
+
+                    }else if("Inventory_up".equals(takingResult)){
+                        // 如果盘盈
+                        newInventory += ObjectFormatUtil.toInteger(number);
+                    }
+                    param.put("newInventory", newInventory);
+                    param.put("depositoryId",map.get("depositoryId"));
+                    param.put("placeId",map.get("placeId"));
+                    param.put("departmentManager",map.get("departmentManager"));
+                    param.put("state",3);
+                    param.put("departmentManagerState",3);
+                    param.put("originator",userToken.getId());
+
+                    param.put("mid", placeAndMaterial.getMid());
+                    param.put("oldInventory", oldInventory);
+
+                    param.put("takingResult", takingResult);
+                    param.put("inventory", number);
+                    param.put("unit",unit);
+                    success += stockTakingService.insertStockTaking(param);
+                    param.remove("id");
+
+                }
+                redisTemplateForHash.opsForHash().put(key,"flagForSubmit","true");
+            }
+        }
+        return CrudUtil.putHandle(success,size);
+    }
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java b/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java
index 5136630d..4d1148fc 100644
--- a/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java
+++ b/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java
@@ -1,5 +1,6 @@
 package com.dreamchaser.depository_manage.entity;
 
+import com.dreamchaser.depository_manage.pojo.MaterialAndPlaceForView;
 import lombok.Data;
 
 import java.util.List;
@@ -150,4 +151,27 @@ public class Inventory {
      * 该物料对应的拆单记录
      */
     private List<SplitInfo> splitInfoList;
+
+
+    public Inventory() {
+    }
+
+    public Inventory(MaterialAndPlaceForView mpv) {
+        this.id = mpv.getIid();
+        this.mid = mpv.getMid();
+        this.mname = mpv.getMname();
+        this.code = mpv.getMcode();
+        this.materialTypeId = Long.valueOf(mpv.getType_id());
+        this.typeName = mpv.getTname();
+        this.version = mpv.getVersion();
+        this.quantity = mpv.getInventory();
+    }
+
+    public Inventory(MaterialAndPlace mp) {
+        this.id = mp.getMid();
+        this.quantity = mp.getQuantity();
+    }
+
+
+
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java
index dd99cc1d..2c3d2257 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java
@@ -143,6 +143,19 @@ public interface PlaceMapper {
      */
     List<MaterialAndPlaceForView> findPlaceAndMaterialByDidAndMid(Map<String,Object> map);
 
+    /**
+     * 根据条件获取对应库位存储的物料
+     * @param map 待查询条件
+     * @return
+     */
+    List<MaterialAndPlaceForView> findPlaceAndMaterialByCondition(Map<String,Object> map);
+
+    /**
+     * 根据条件获取对应库位存储的物料数量
+     * @param map 待查询条件
+     * @return
+     */
+   Integer findPlaceAndMaterialCountByCondition(Map<String,Object> map);
     /**
      * 根据当前库位编号及物料编号获取具体库位
      */
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
index 20bb1ade..9854eb80 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
@@ -115,6 +115,48 @@
         and pstate != 3
     </select>
 
+    <select id="findPlaceAndMaterialByCondition" parameterType="map" resultMap="MaterialAndPlaceForViewMap">
+        select
+        <include refid="allColumnsForView"/>
+        FROM materialandplaceinfo  WHERE 1 = 1
+        <if test="depositoryId != null and depositoryId != ''">
+            and depository_id = #{depositoryId}
+        </if>
+        <if test="placeId != null and placeId != ''">
+            and pid = #{placeId}
+        </if>
+        <if test="mcode != null and mcode != ''">
+            and mcode = #{mcode}
+        </if>
+        <if test="mname != null and mname != ''">
+            and mname like CONCAT('%',#{mname},'%')
+        </if>
+        and pstate != 3
+        <if test="begin != null and size != null">
+            LIMIT #{begin},#{size}
+        </if>
+    </select>
+
+
+    <select id="findPlaceAndMaterialCountByCondition" parameterType="map" resultType="int">
+        select
+        count(*)
+        FROM materialandplaceinfo  WHERE 1 = 1
+        <if test="depositoryId != null and depositoryId != ''">
+            and depository_id = #{depositoryId}
+        </if>
+        <if test="placeId != null and placeId != ''">
+            and pid = #{placeId}
+        </if>
+        <if test="mcode != null and mcode != ''">
+            and mcode = #{mcode}
+        </if>
+        <if test="mname != null and mname != ''">
+            and mname like CONCAT('%',#{mname},'%')
+        </if>
+        and pstate != 3
+    </select>
+
     <!-- 根据条件参数查询列表 -->
     <select id="findPlaceByCondition" resultMap="placeMap" parameterType="map">
         SELECT
@@ -399,4 +441,5 @@
 
     </select>
 
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialAndPlaceForView.java b/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialAndPlaceForView.java
index 0c1b8d3d..087cefb0 100644
--- a/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialAndPlaceForView.java
+++ b/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialAndPlaceForView.java
@@ -1,7 +1,11 @@
 package com.dreamchaser.depository_manage.pojo;
 
+import com.dreamchaser.depository_manage.entity.SplitInfo;
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 @Data
 public class MaterialAndPlaceForView {
     /**
@@ -82,5 +86,40 @@ public class MaterialAndPlaceForView {
     private String mname;
 
 
+    /**
+     * 盘点数量
+     */
+    private Integer stockTakingQuantity;
+
+    /**
+     * 盘点结果
+     */
+    private String takingResult;
+
+    /**
+     * 盈亏数量
+     */
+    private String takingInventory;
+
+    /**
+     * 盘点结果（用于展示）
+     */
+    private String takingResultString;
+
+    /**
+     * 盘点单位
+     */
+    private String takingUnit;
+
+    /**
+     * 拆单单位
+     */
+    private List<SplitInfo> splitInfoList;
+
+    /**
+     * 对应库存
+     */
+    private Map<String,Integer> splitInventory;
+
 
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java b/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java
index 9304457c..90d77325 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java
@@ -2,6 +2,7 @@ package com.dreamchaser.depository_manage.service;
 
 import com.dreamchaser.depository_manage.entity.*;
 import com.dreamchaser.depository_manage.pojo.InventoryP;
+import com.dreamchaser.depository_manage.pojo.MaterialAndPlaceForView;
 import com.dreamchaser.depository_manage.pojo.MaterialP;
 
 import java.util.List;
@@ -409,4 +410,12 @@ public interface MaterialService {
      * @return
      */
     Integer findInventoryCountByDepository(List<Integer> depositoryIds);
+
+
+    /**
+     * 用于获取当前盘点位置的库存计量
+     * @param map 具体条件
+     * @return
+     */
+    List<MaterialAndPlaceForView> findInventoryForStockTaking(Map<String,Object> map);
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java b/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java
index fbefe6e3..ec288ffb 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java
@@ -124,6 +124,22 @@ public interface PlaceService {
      */
     List<MaterialAndPlaceForView> findPlaceAndMaterialByDidAndMid(Integer did, Integer mid);
 
+    /**
+     * 根据条件获取对应库位存储的物料
+     * @param map 待查询条件
+     * @return
+             */
+    List<MaterialAndPlaceForView> findPlaceAndMaterialByCondition(Map<String,Object> map);
+    /**
+     * 根据条件获取对应库位存储的物料数量
+     * @param map 待查询条件
+     * @return
+     */
+    Integer findPlaceAndMaterialCountByCondition(Map<String,Object> map);
+
+
+
+
     /**
      * 根据当前库位编号及物料编号获取具体库位
      */
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
index b5c01ab8..014f5b47 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
@@ -113,7 +113,6 @@ public class ExcelServiceImpl implements ExcelService {
         }
         log.info("【导入Excel文件】删除临时文件成功，临时文件路径为：{}", filePath);
         return ResultVoUtil.returnResultVo(200, readResult, "结果");
-//        return ResultVoUtil.success(excelVos);
     }
 
     /**
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
index 8fe35df8..08c176d8 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
@@ -14,6 +14,7 @@ import com.dreamchaser.depository_manage.utils.DateUtil;
 import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -2591,6 +2592,87 @@ public class MaterialServiceImpl implements MaterialService {
         return materialMapper.findInventoryCountByDepository(depositoryIds);
     }
 
+    /**
+     * 用于获取当前盘点位置的库存计量
+     *
+     * @param map 具体条件
+     * @return
+     */
+    @Override
+    public List<MaterialAndPlaceForView> findInventoryForStockTaking(Map<String, Object> map) {
+        Integer size = 10, page = 1;
+        if (map.containsKey("size")) {
+            size = ObjectFormatUtil.toInteger(map.get("size"));
+            map.put("size", size);
+        }
+        if (map.containsKey("page")) {
+            page = ObjectFormatUtil.toInteger(map.get("page"));
+            map.put("begin", (page - 1) * size);
+        }
+        Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId"));
+        if (Integer.compare(placeId, 0) == 0) {
+            map.remove("placeId");
+        }
+        List<MaterialAndPlaceForView> placeAndMaterialByCondition = placeService.findPlaceAndMaterialByCondition(map);
+
+        for (MaterialAndPlaceForView mpv : placeAndMaterialByCondition
+        ) {
+            // 获取其对应的拆单记录
+            List<SplitInfo> list = splitUnitMapper.findSplitInfoByMid(mpv.getMid());
+            // 用于获取对应的拆单记录库存
+            Map<String, Integer> splitInventory = new HashMap<>();
+            // 获取对应物料
+            MaterialAndPlace placeAndMaterial = placeService.findPlaceAndMaterialById(mpv.getId());
+            for (SplitInfo si : list
+            ) {
+                // 获取当前拆单单位对应的库存数
+                int allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterial, si.getId(), 0, true);
+                splitInventory.put(si.getNewUnit(), allInventoryForSplitInfo);
+            }
+            // 创建默认单位的拆单信息
+            SplitInfo s = new SplitInfo();
+            s.setNewUnit(mpv.getUnit());
+            list.add(s);
+            splitInventory.put(mpv.getUnit(), mpv.getInventory());
+            // 设置拆单对应的库存
+            mpv.setSplitInventory(splitInventory);
+            // 设置拆单记录
+            mpv.setSplitInfoList(list);
+            // 定义存储在redis中的hash的key
+            String key = "wms_stockTaking_" + map.get("userTokenId") + "_" + DateUtil.getNowTime() + "_" + mpv.getId();
+            // 获取用于展示的盘点结果
+            String takingResultString = (String) redisTemplate.opsForHash().get(key, "takingResultString");
+            // 获取盘点结果
+            String takingResult = (String) redisTemplate.opsForHash().get(key, "takingResult");
+            // 获取盈亏数量
+            String number = (String) redisTemplate.opsForHash().get(key, "number");
+            // 获取盘点时的计量单位
+            String unit = (String) redisTemplate.opsForHash().get(key, "unit");
+            // 设置盘点单位
+            mpv.setTakingUnit(unit);
+            // 设置盈亏数量
+            if (number != null) {
+                mpv.setTakingInventory(number);
+                if ("Inventory_down".equals(takingResult)) {
+                    // 如果盘亏
+                    mpv.setStockTakingQuantity(splitInventory.get(unit) - ObjectFormatUtil.toInteger(number));
+                }else if("Inventory_up".equals(takingResult)){
+                    // 如果盘盈
+                    mpv.setStockTakingQuantity(splitInventory.get(unit) + ObjectFormatUtil.toInteger(number));
+                }else{
+                    // 如果正常
+                    mpv.setStockTakingQuantity(splitInventory.get(unit));
+
+                }
+            }
+            // 设置用于展示的盘点结果
+            mpv.setTakingResultString(takingResultString);
+            // 设置盘点结果
+            mpv.setTakingResult(takingResult);
+        }
+        return placeAndMaterialByCondition;
+    }
+
     // 构造树形组件数据模板（通过物料名称搜索)
     public Map<String, Object> InitTreeMenusForSelectName(MaterialType mt, List<Object> children) {
         if (mt != null) {
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java
index 39461ac0..56bf1057 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java
@@ -287,6 +287,27 @@ public class PlaceServiceImpl implements PlaceService {
         return placeMapper.findPlaceAndMaterialByDidAndMid(map);
     }
 
+    /**
+     * 根据条件获取对应库位存储的物料
+     * @param map 待查询条件
+     * @return
+     */
+    @Override
+    public List<MaterialAndPlaceForView> findPlaceAndMaterialByCondition(Map<String,Object> map) {
+        return placeMapper.findPlaceAndMaterialByCondition(map);
+    }
+
+    /**
+     * 根据条件获取对应库位存储的物料数量
+     * @param map 待查询条件
+     * @return
+     */
+    @Override
+    public Integer findPlaceAndMaterialCountByCondition(Map<String, Object> map) {
+        return placeMapper.findPlaceAndMaterialCountByCondition(map);
+    }
+
+
     /**
      * 根据当前库位编号及物料编号获取具体库位
      */
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
index 3db447bc..3f1f3de2 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
@@ -362,14 +362,11 @@ public class StockTakingServiceImpl implements StockTakingService {
             // 获取库位详情
             Place placeById = placeMapper.findPlaceById(placeId);
             Integer depositoryId = mainRecord.getDepositoryId();
-            // 获取仓库详情
-            Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId);
 
             // 获取所有子单
             List<StockTakingChildP> minRecordList = stockTakingMapper.selectStockTakingChildByMainId(mainId);
-            for (int i = 0; i < minRecordList.size(); i++) {
+            for (StockTakingChildP minRecord : minRecordList) {
                 // 获取子单详情
-                StockTakingChildP minRecord = minRecordList.get(i);
                 // 获取盘点的物料详情
 
                 // 获取当前盘点结果
@@ -393,20 +390,8 @@ public class StockTakingServiceImpl implements StockTakingService {
 
                 // 根据盘点结果重新计算物料的单价
 
-                // 数据库中的总额
-                Double amounts = (inventoryById.getAmounts() / 100);
 
                 Integer newInventory = minRecord.getNewInventory();
-                Double avgPrice = 0.0;
-                if (Integer.compare(newInventory, 0) != 0) {
-                    // 如果新的库存不是0
-
-                    // 新的均价
-                    avgPrice = (amounts / newInventory) * 100;
-                    BigDecimal bg = new BigDecimal(avgPrice);
-                    avgPrice = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                }
-                inventoryById.setPrice(avgPrice);
 
                 // 获取当前库位上物料数量
                 Integer oldQuantity = inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity();
@@ -415,9 +400,9 @@ public class StockTakingServiceImpl implements StockTakingService {
 
 
                 // 用于计算新的库位数量
-                Integer newNumberForPlace = 0;
+                int newNumberForPlace = 0;
                 // 用于计算新的库位与物料对应关系的数量
-                Integer newNumberForMatrialAndPlace = 0;
+                int newNumberForMatrialAndPlace = 0;
                 if ("Inventory_up".equals(takingResult)) {
                     // 如果盘盈
 
@@ -639,8 +624,6 @@ public class StockTakingServiceImpl implements StockTakingService {
             Long producedDate = minRecord.getProducedDate();
 
 
-            // 数据库中的总额
-            double amounts = (inventoryById.getAmounts() / 100);
             // 当前盘点数目
             Integer newInventory = minRecord.getNewInventory();
 
@@ -679,18 +662,8 @@ public class StockTakingServiceImpl implements StockTakingService {
                     inventoryById.setQuantity(inventoryById.getQuantity() - oldInventroy + newInventory);
                 }
 
-                // 定义平均价格
-                Double avgPrice = 0.0;
                 // 获取当前物料数目
                 Integer quantity = inventoryById.getQuantity();
-                if (quantity > 0) {
-                    // 如果当前物料数目不为零
-                    avgPrice = amounts / quantity;
-                    BigDecimal bg = new BigDecimal(avgPrice);
-                    avgPrice = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                }
-                // 更新物料单价
-                inventoryById.setPrice(avgPrice);
 
                 materialMapper.updateMaterialAndProducedDate(materialAndProducedDate);
             } else {
@@ -701,18 +674,6 @@ public class StockTakingServiceImpl implements StockTakingService {
                 // 获取新的物料数目
                 int quantity = oldQuantity + newInventory;
 
-                // 平均价格
-                Double avgPrice = 0.0;
-                if (Integer.compare(newInventory, 0) != 0) {
-                    // 如果新的库存不是0
-
-                    // 新的均价
-                    avgPrice = (amounts / (quantity)) * 100;
-                    BigDecimal bg = new BigDecimal(avgPrice);
-                    avgPrice = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                }
-                // 更新物料单价
-                inventoryById.setPrice(avgPrice);
 
                 // 更新物料数目
                 inventoryById.setQuantity(quantity);
@@ -798,7 +759,6 @@ public class StockTakingServiceImpl implements StockTakingService {
                             splitUnitMapper.updateSplitInventory(splitInventory);
                             if (splitInfo.getParentId() != null) {
                                 SplitInfo parentSplitInfo = splitUnitMapper.findSplitInfoById(splitInfo.getParentId());
-                                map.put("price", String.valueOf(inventoryById.getPrice() / 100));
                                 map.put("quantity", String.valueOf(disposeQuantity));
                                 splitUnitService.updateSplitInfoSaveQuantity(parentSplitInfo, disposeQuantity, placeAndMaterialByMidAndPid.getId(), map, inventory, splitInfo);
                             } else {
@@ -1517,20 +1477,9 @@ public class StockTakingServiceImpl implements StockTakingService {
 
                     // 根据盘点结果重新计算物料的单价
 
-                    // 数据库中的总额
-                    Double amounts = (inventoryById.getAmounts() / 100);
+
 
                     Integer newInventory = minRecord.getNewInventory();
-                    Double avgPrice = 0.0;
-                    if (Integer.compare(newInventory, 0) != 0) {
-                        // 如果新的库存不是0
-
-                        // 新的均价
-                        avgPrice = (amounts / newInventory) * 100;
-                        BigDecimal bg = new BigDecimal(avgPrice);
-                        avgPrice = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                    }
-                    inventoryById.setPrice(avgPrice);
 
                     // 获取当前库位上物料数量
                     Integer oldQuantity = inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity();
@@ -2606,22 +2555,10 @@ public class StockTakingServiceImpl implements StockTakingService {
 
                 // 根据盘点结果重新计算物料的单价
 
-                // 数据库中的总额
-                Double amounts = (materialById.getAmounts() / 100);
 
-                Integer newInventory = minRecord.getNewInventory();
-                Double avgPrice = 0.0;
-                if (Integer.compare(newInventory, 0) != 0) {
-                    // 如果新的库存不是0
-
-                    // 新的均价
-                    avgPrice = (amounts / newInventory) * 100;
-                    BigDecimal bg = new BigDecimal(avgPrice);
-                    avgPrice = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                }
 
+                Integer newInventory = minRecord.getNewInventory();
 
-                materialById.setPrice(avgPrice);
 
                 // 获取当前库位上物料数量
                 Integer oldQuantity = materialById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity();
diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java
index 202eb0cf..26f89939 100644
--- a/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java
+++ b/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java
@@ -170,8 +170,7 @@ public class DateUtil {
     public static String getNowTime(){
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
         Calendar instance = Calendar.getInstance();
-        String format = simpleDateFormat.format(instance.getTime());
-        return format;
+        return simpleDateFormat.format(instance.getTime());
     }
 
     // 获取本周周一
diff --git a/src/main/resources/templates/pages/stockTaking/stockTaking.html b/src/main/resources/templates/pages/stockTaking/stockTaking.html
index f0f4ca18..a5a972d2 100644
--- a/src/main/resources/templates/pages/stockTaking/stockTaking.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTaking.html
@@ -43,79 +43,76 @@
     </style>
 </head>
 <body>
+
 <div class="layuimini-container">
     <div class="layuimini-main">
 
         <div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto; ">
             <div carousel-item style="overflow: inherit">
                 <div>
-                    <fieldset class="table-search-fieldset" style="padding-left: 0px;padding-right: 0px">
-                        <legend>库存盘点</legend>
-                        <div class="layui-fluid">
-                            <div class="layui-card">
-                                <form class="layui-form"
-                                      style="margin: 0 auto;max-width: 700px;"
-                                      lay-filter="form1" id="form1">
-                                    <div class="layui-card-body" id="takingHeader" style="padding-right: 0px">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label" style="height: 40px;">盘点位置:</label>
-                                            <div class="layui-input-block">
-                                                <div class="inputdiv">
-                                                    <input type="text" placeholder="请选择盘点位置" class="layui-input"
-                                                           style="border-style: none"
-                                                           id="openSonByDepository" readonly
-                                                           lay-verify="required"/>
-                                                    <img src="/static/images/search.ico" height="16" width="16"
-                                                         id="scanCodeImg"
-                                                         style="margin-top: 10px" onclick="scanCode(this)">
-                                                </div>
-                                                <input type="text" name="depositoryId" class="layui-input"
-                                                       id="depositoryId"
-                                                       style="display: none" lay-verify="required"/>
-                                                <input type="text" name="placeId" class="layui-input" id="placeId"
-                                                       style="display: none" lay-verify="required"/>
+                    <div class="layui-fluid">
+                        <div class="layui-card">
+                            <form class="layui-form"
+                                  style="margin: 0 auto;max-width: 700px;"
+                                  lay-filter="form1" id="form1">
+                                <div class="layui-card-body" id="takingHeader" style="padding-right: 0px">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="height: 40px;">盘点位置:</label>
+                                        <div class="layui-input-block">
+                                            <div class="inputdiv">
+                                                <input type="text" placeholder="请选择盘点位置" class="layui-input"
+                                                       style="border-style: none"
+                                                       id="openSonByDepository" readonly
+                                                       lay-verify="required"/>
+                                                <img src="/static/images/search.ico" height="16" width="16"
+                                                     id="scanCodeImg"
+                                                     style="margin-top: 10px" onclick="scanCode(this)">
                                             </div>
+                                            <input type="text" name="depositoryId" class="layui-input"
+                                                   id="depositoryId"
+                                                   style="display: none" lay-verify="required"/>
+                                            <input type="text" name="placeId" class="layui-input" id="placeId"
+                                                   style="display: none" lay-verify="required"/>
                                         </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label" style="height: 40px;">负责人：</label>
-                                            <div class="layui-input-block">
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="height: 40px;">负责人：</label>
+                                        <div class="layui-input-block">
 
-                                                <div class="fairy-tag-container" style="border-style: none">
-                                                    <div class="inputdiv">
-                                                        <input type="text" id="departmentManager" style="display: none"
-                                                               th:value="${departmentHeadName}"/>
-                                                        <i class="layui-icon layui-icon-search"
-                                                           style="display: inline;right: 0;position: absolute;"
-                                                           id="selectdepartmentManager"></i>
-                                                        <input type="text" id="departmentManagerId"
-                                                               name="departmentManagerId"
-                                                               th:value="${departmentHeadId}"
-                                                               class="layui-input" style="display: none"
-                                                               lay-verify="required"/>
-                                                    </div>
+                                            <div class="fairy-tag-container" style="border-style: none">
+                                                <div class="inputdiv">
+                                                    <input type="text" id="departmentManager" style="display: none"
+                                                           th:value="${departmentHeadName}"/>
+                                                    <i class="layui-icon layui-icon-search"
+                                                       style="display: inline;right: 0;position: absolute;"
+                                                       id="selectdepartmentManager"></i>
+                                                    <input type="text" id="departmentManagerId"
+                                                           name="departmentManagerId"
+                                                           th:value="${departmentHeadId}"
+                                                           class="layui-input" style="display: none"
+                                                           lay-verify="required"/>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-
-                                    <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
-
-                                    <!--                                        提交按钮-->
-                                    <div class="layui-form-item" style="margin-top: 10px;">
-                                        <div class="layui-input-block">
-                                            <button type="button" class="layui-btn layui-btn-normal layui-btn-lg"
-                                                    lay-submit
-                                                    lay-filter="formStep">
-                                                &emsp;提交&emsp;
-                                            </button>
-                                        </div>
-                                    </div>
-                                </form>
+                                </div>
+                            </form>
+                            <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"
+                                   style="margin-top: 123px"></table>
+                            <!--   提交按钮-->
+                            <div class="layui-form-item" style="margin-top: 10px;">
+                                <div class="layui-input-block">
+                                    <button type="button" class="layui-btn layui-btn-normal layui-btn-lg"
+                                            lay-submit
+                                            lay-filter="formStep">
+                                        &emsp;提交&emsp;
+                                    </button>
+                                </div>
                             </div>
                         </div>
-                    </fieldset>
+                    </div>
                 </div>
-                <!--                            下一步-->
+                <!-- 下一步-->
                 <div>
                     <form class="layui-form" style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
                         <div style="text-align: center;margin-top: 90px;">
@@ -136,6 +133,10 @@
         </div>
     </div>
 </div>
+
+<script id="changeUnit" type="text/html">
+    <a class="layui-btn layui-btn-xs" lay-event="more">{{d.unit}}<i class="layui-icon layui-icon-down"></i></a>
+</script>
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
@@ -167,46 +168,27 @@
     function selectCode(obj) {
     }
 
-    // 用于扫描物料编码
-    function scanMaterialCodeForTaking() {
-
-    }
-
-    // 用于扫描条形码
-    function scanBarCodeForTaking() {
+    // 用于计算盘点结果
+    function calculate(obj) {
 
     }
 
-    // 用于二次渲染页面
-    function Coverpage() {
+    function updateTableShow() {
 
     }
 
-    // 用于计算盘点结果
-    function calculate(obj) {
-
-    }
-
-    // 用于暂存卡片个数
-    let params = [];
-    // 用于卡片编号
-    var NewIdNumber = 1;
 
     // 用于存储当前选择的盘点位置
     let depositoryId;
     let placeId;
     // 用于存储当前选择的负责人
     let departmentManagerId;
-
-    // 用于存储没有对应关系的物料
-    let barCodeList = {};
-
-    let needToUpdate = {};
-    layui.use(['form', 'step', 'flow', 'laydate', 'inputTag'], function () {
+    layui.use(['form', 'step', 'flow', 'table', 'inputTag'], function () {
         var $ = layui.$,
             form = layui.form,
-            laydate = layui.laydate,
+            table = layui.table,
             inputTag = layui.inputTag,
+            dropdown = layui.dropdown, //下拉菜单
             step = layui.step;
         departmentManagerId = $("#departmentManagerId").val();
 
@@ -279,14 +261,88 @@
                         $("#openSonByDepository").val(nowDepositoryName);
                         form.render();
                     }
-                    depositoryId = nowDepositoryId;
-                    placeId = nowPlaceId;
+                    if (nowDepositoryId !== null && nowDepositoryId !== "") {
+                        depositoryId = nowDepositoryId;
+                        placeId = nowPlaceId;
+                        updateTableShow();
+                    }
 
                 }
             });
         });
 
 
+        updateTableShow = function () {
+            let req = {};
+            req.depositoryId = depositoryId;
+            req.placeId = placeId;
+            table.reload('currentTableId', {
+                url: '/material/findInventoryForStockTaking',
+                page: {
+                    curr: 1
+                },
+                where: req
+            }, 'data');
+        };
+
+        table.render({
+            elem: "#currentTableId",
+            url: '/material/findInventoryForStockTaking',
+            parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "status": res.status, //解析接口状态
+                    "message": res.statusInfo.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.data //解析数据列表
+                };
+            },
+            request: {
+                pageName: 'page', //页码的参数名称，默认：page
+                limitName: 'size' //每页数据量的参数名，默认：limit
+            },
+            response: {
+                statusName: 'status' //规定数据状态的字段名称，默认：code
+                , statusCode: 200 //规定成功的状态码，默认：0
+                , msgName: 'message' //规定状态信息的字段名称，默认：msg
+                , countName: 'count' //规定数据总数的字段名称，默认：count
+                , dataName: 'data' //规定数据列表的字段名称，默认：data
+            },
+            where: {
+                depositoryId: "-1"
+            },
+            height: 'full-255',//固定高度-即固定表头固定第一行首行
+            cols: [
+                [
+                    {field: 'mcode', width: 150, title: '存货编码', fixed: 'left'},
+                    {field: 'mname', width: 150, title: '物料名称'},
+                    {field: 'typeName', width: 100, title: '物料种类'},
+                    {field: 'version', width: 150, title: '规格型号',},
+                    {title: '计量单位', width: 200, templet: '#changeUnit', align: "center"},
+                    {field: 'inventory', width: 100, title: '库存数'},
+                    {field: 'stockTakingQuantity', width: 100, title: '盘点数', edit: 'quantity'},
+                    {field: 'takingResultString', width: 100, title: '盘点结果'},
+                    {field: 'takingInventory', width: 100, title: '盈亏数量'},
+                ]
+            ],
+            limits: [10, 15, 20, 25, 50, 100],
+            limit: 10,
+            page: true,
+            skin: 'line',
+            done: function (res, curr, count) {
+                $.each(res['data'], function (i, j) {
+                    let takingUnit = j["takingUnit"];
+                    if (takingUnit !== null) {
+                        let parentItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")");
+                        let unitHandleItem = parentItem.children()[4];
+                        let quantityHandleItem = parentItem.children()[5];
+                        unitHandleItem.childNodes[0].childNodes[1].childNodes[0].data = takingUnit;
+                        quantityHandleItem.childNodes[0].innerText = j["splitInventory"][takingUnit];
+                    }
+                });
+            }
+        });
+
+
         // 用于打开负责人树形菜单
         $("#selectdepartmentManager").on('click', function () {
             layer.open({
@@ -317,12 +373,12 @@
         // 用于提交盘点情况
         form.on('submit(formStep)', function (data) {
             data = data.field;
-            data.params = params;
-            data.needToUpdate = needToUpdate;
-            data.barCodeListByNoMaterial = barCodeList;
-            data.departmentManagerId = departmentManagerId;
+            data.depositoryId = depositoryId;
+            data.placeId = placeId;
+            data.departmentManager = departmentManagerId;
+
             $.ajax({
-                url: "/stockTaking/addStockTakingRecord",
+                url: "/stockTaking/submitStockTaking",
                 type: 'post',
                 dataType: 'json',
                 contentType: "application/json;charset=utf-8",
@@ -357,160 +413,6 @@
         $('.next').click(function () {
             step.next('#stepForm');
         });
-        // 实现卡片添加
-        addItem = function (obj) {
-            // 获取父元素id
-            var parentId = obj.parentNode.id;
-            NewIdNumber = NewIdNumber + 1;
-            var materialItem = `
-                                    <div class="layui-card-body" id=` + "InventoryDetails" + NewIdNumber + ` style="padding-right: 0px">
-                                    <hr>
-                                    <i class="layui-icon layui-icon-subtraction" style="display: inline"
-                                       onclick="deleteItem(this)"></i>
-
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">物料名称:</label>
-
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <input type="text" placeholder="请选择物料" class="layui-input"
-                                                       style="border-style: none"
-                                                       id="openSonByMaterial" onblur="selectMaterialByName(this)"
-                                                       lay-verify="required"/>
-                                                <i class="layui-icon layui-icon-search" style="display: inline"
-                                                   id="selectMaterial" onclick="selectMaterial(this)"></i>
-                                            </div>
-                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber + `
-                                                   style="display: none" lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <input id=` + "code" + NewIdNumber + ` name= ` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value=""
-                                                       onblur="selectCode(this)"
-                                                       class="layui-input" lay-verify="required"
-                                                       style="border-style: none">
-                                                <img src="/static/images/search.ico" height="16" width="16"
-                                                     style="margin-top: 10px" onclick="scanMaterialCodeForTaking(this)">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <select id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + `
-
-                                                       style="border-style: none">
-                                                       </select>
-                                                <img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
-                                                     style="margin-top: 10px" onclick="scanBarCodeForTaking(this)">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">物料类型：</label>
-                                        <div class="layui-input-block">
-                                            <input type="text"  placeholder="请选择物料类型"  class="layui-input" id="openSonByMateralType" readonly
-                                                   lay-verify="required"/>
-                                            <input type="text" id=` + "materialTypeId" + NewIdNumber + `  name=` + "typeId" + NewIdNumber + ` placeholder="请选择物料类型"  class="layui-input"  style="display: none"  lay-verify="required"/>
-
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">材质:</label>
-                                        <div class="layui-input-block">
-                                            <input name=` + "texture" + NewIdNumber + ` type="text" placeholder="请填写材质名称" class="layui-input" />
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">规格型号:</label>
-                                        <div class="layui-input-block">
-                                            <input name=` + "version" + NewIdNumber + ` type="text" placeholder="请填写规格型号" class="layui-input"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">计量单位:</label>
-                                        <div class="layui-input-block">
-                                            <select name=` + "unit" + NewIdNumber + ` id=` + "unit" + NewIdNumber + `></select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item" style="display: none" id=` + "producedDateItem" + NewIdNumber + `>
-                                        <label class="layui-form-label">生产日期:</label>
-                                        <div class="layui-input-block">
-                                            <select name=` + "producedDate" + NewIdNumber + ` id=` + "producedDate" + NewIdNumber + ` >
-
-                                                    </select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">库存数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input" readonly
-                                                   name=` + "oldInventory" + NewIdNumber + ` id=` + "oldInventory" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盘点数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input"  onblur="calculate(this)"
-                                                   name=` + "newInventory" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盘点结果:</label>
-                                        <div class="layui-input-block">
-                                            <select name=` + "takingResult" + NewIdNumber + ` id=` + "result" + NewIdNumber + `>
-
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盈亏数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input" readonly id=` + "Inventory_number" + NewIdNumber + `
-                                                   name=` + "inventory" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <i class="layui-icon layui-icon-addition" style="display: inline"
-                                       onclick="addItem(this)"></i>
-                                </div>
-            `;
-            // 获取当前高度
-            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            params.push(NewIdNumber);
-            // $("#form1").css("height", height + 682 + 'px');
-            $("#stepForm").css("height", height + 735 + 'px');
-            $("#" + parentId).after(materialItem);
-        };
-
-        // 实现卡片删除
-        deleteItem = function (obj) {
-            // 获取父节点
-            var parent = obj.parentNode;
-            var parentId = parent.id;
-            parentId = parseInt(parentId.split("InventoryDetails")[1]);
-            // 获取祖父节点
-            var reparent = parent.parentNode;
-            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            $("#stepForm").css("height", height - 735 + 'px');
-            params = remove(params, parentId);
-            reparent.removeChild(parent);
-        };
-
-        //删除数组中指定元素
-        function remove(arr, item) {
-            var result = [];
-            for (let i = 0; i < arr.length; i++) {
-                if (arr[i] === item) {
-                    continue;
-                }
-                result.push(arr[i]);
-            }
-            return result;
-        }
 
 
         // 扫码盘点位置
@@ -539,6 +441,10 @@
                                 layer.msg("并未查询到对应位置，请重新扫描", {
                                     icon: 0,
                                     time: 1000
+                                }, function () {
+                                    depositoryId = -1;
+                                    placeId = -1;
+
                                 });
                             } else if (flag === 1) {
                                 // 如果获取到的是库位
@@ -560,849 +466,87 @@
                                 placeId = "0";
 
                             }
+                            updateTableShow();
                         }
                     })
                 }
             })
         };
 
+        table.on('edit(currentTableFilter)', function (obj) {
+            obj.update({stockTakingQuantity: obj.value});//修改当前行数据
+            calculate(obj);
+        });
 
-        // 用于打开物料树形菜单
-        selectMaterial = function (obj) {
-            if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
-                var parent = obj.parentNode.parentNode.parentNode.parentNode;
-                var parentId = parent.id;
-                // 物料编码父级
-                var codeChildren = parent.childNodes[7];
-                // 物料名称父级
-                var materialChildren = parent.childNodes[5];
-                // 物料类型父级
-                var typeChildren = parent.childNodes[11];
-                // 材质父级
-                var textureChildren = parent.childNodes[13];
-                // 规格型号父级
-                var versionChildren = parent.childNodes[15];
-                // 计量单位父级
-                var unitChildren = parent.childNodes[17];
-                // 库存数量父级
-                var inventoryChildren = parent.childNodes[21];
-
-                // 条形码父级
-                var barCodeChildren = parent.childNodes[9];
-                // 编码条目
-                var codeItem = codeChildren.childNodes[3].childNodes[1];
-                // 具体条码
-                var codeValue = codeItem.childNodes[1];
-
-                // 物料条目
-                var materialItem = materialChildren.childNodes[3].childNodes;
-                // 物料名称
-                var materialName = materialItem[1].childNodes[1];
-                // 物料编码
-                var materialId = materialItem[3];
-                // 输入的物料名称
-                var mname = materialName.value;
-                // 物料种类条目
-                var materialTypeItem = typeChildren.childNodes[3].childNodes;
-
-                // 条形码条目
-                var barCodeItem = barCodeChildren.childNodes[3];
-                layer.open({
-                    type: 2,
-                    title: '弹窗内容',
-                    skin: 'layui-layer-rim',
-                    maxmin: true,
-                    shadeClose: true, //点击遮罩关闭层
-                    area: ['70%', '70%'],
-                    move: '.layui-layer-title',
-                    fixed: false,
-                    content: '/getMaterialAll?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId,
-                    // content: '/selectMaterialByCardForTaking?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId,
-                    success: function (layero, index) {
-                        var children = layero.children();
-                        var content = $(children[1]);
-                        var iframeChildren = $(content.children());
-                        content.css('height', '100%');
-                        iframeChildren.css('height', '100%');
-                    },
-                    end: function () {
-                        var mid = materialId.value;
-                        if (mid !== '') {
-                            $.ajax({
-                                url: "/material/findInventoryByIdAndPid?mid=" + mid + "&pid=" + placeId,
-                                type: "get",
-                                dataType: 'json',
-                                contentType: "application/json;charset=utf-8",
-                                success: function (d) {
-                                    var material = d.data.materialById;
-                                    var code = material.code;
-                                    if (code === undefined) {
-                                        code = "";
-                                    }
-                                    codeValue.value = code;
-                                    materialTypeItem[1].value = material.typeName;
-                                    materialTypeItem[3].value = material.typeId;
-                                    textureChildren.childNodes[3].childNodes[1].value = material.texture === null || material.texture === undefined ? '' : material.texture;
-                                    versionChildren.childNodes[3].childNodes[1].value = material.version === null || material.version === undefined ? '' : material.version;
-                                    inventoryChildren.childNodes[3].childNodes[1].value = material.quantity;
-                                    var materialAndBarCodeList = material.materialAndBarCodeList;
-                                    var idNumber = materialId.name.split("mid")[1];
-                                    if (materialAndBarCodeList.length > 0) {
-                                        // 如果有对应的条形码
-                                        var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
-                                        var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
-                                        var id = barCodeInput.id;
-
-                                        form.render();
-                                        $.each(materialAndBarCodeList, function (index, item) {
-                                            $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
-                                        });
-                                        form.render();
-                                    }
-                                    let unitItem = $("#unit" + idNumber);
-                                    unitItem.empty();
-                                    unitItem.append(new Option(material.unit, "-1"));
-                                    let splitInfoList = material.splitInfoList;
-                                    if (splitInfoList.length > 0) {
-                                        $.each(splitInfoList, function (index, item) {
-                                            unitItem.append(new Option(item.newUnit, item.newUnit));
-                                        })
-                                    }
-                                    form.render();
-                                    var shelfLife = material.shelfLife;
-                                    if (shelfLife !== null && shelfLife !== undefined) {
-                                        $("#" + "producedDateItem" + idNumber).show();
-                                        var producedDateList = d.data['producedDateList'];
-                                        if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) {
-                                            $.each(producedDateList, function (index, item) {
-                                                $("#" + "producedDate" + idNumber).append(new Option(item, item));
-                                            })
-                                        }
-                                        form.render();
-                                    } else {
-                                        $("#" + "producedDateItem" + idNumber).hide();
-                                        form.render();
-                                    }
-
-                                }
-                            });
-                        }
-                    }
-                });
-            } else {
-                layer.msg("请先选择盘点位置或负责人", {
-                    icon: 0,
-                    time: 500
-                })
-            }
-        };
-
-
-        // 用于实现通过编码查询物料
-        selectCode = function (obj) {
-            if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
-                // 输入code
-                var code = obj.value;
-                var parent = obj.parentNode.parentNode.parentNode.parentNode;
-                var parentId = parent.id;
-                // 物料编码父级
-                var codeChildren = parent.childNodes[7];
-                // 物料名称父级
-                var materialChildren = parent.childNodes[5];
-                // 物料类型父级
-                var typeChildren = parent.childNodes[11];
-                // 材质父级
-                var textureChildren = parent.childNodes[13];
-                // 规格型号父级
-                var versionChildren = parent.childNodes[15];
-                // 计量单位父级
-                var unitChildren = parent.childNodes[17];
-                // 库存数量父级
-                var inventoryChildren = parent.childNodes[21];
-
-                // 条形码父级
-                var barCodeChildren = parent.childNodes[9];
-                // 编码条目
-                var codeItem = codeChildren.childNodes[3].childNodes[1];
-                // 具体条码
-                var codeValue = codeItem.childNodes[1];
-
-                // 物料条目
-                var materialItem = materialChildren.childNodes[3].childNodes;
-                // 物料名称
-                var materialName = materialItem[1].childNodes[1];
-                // 物料编码
-                var materialId = materialItem[3];
-                // 物料种类条目
-                var materialTypeItem = typeChildren.childNodes[3].childNodes;
-
-                // 条形码条目
-                var barCodeItem = barCodeChildren.childNodes[3];
-                // 获取对应元素
-                var req = {};
-                req.code = code;
-                req.depositoryId = depositoryId;
-                req.placeId = placeId;
-                $.ajax({
-                    url: "/material/findMatrialByCodeForTaking",
-                    type: "post",
-                    dataType: 'json',
-                    data: JSON.stringify(req),
-                    contentType: "application/json;charset=utf-8",
-                    success: function (d) {
-                        var d = d.data;
-                        if (d == null) {
-                            layer.msg("该位置暂未该物品，请确认是否输入正确");
-                            materialName.value = "";
-                            materialId.value = "";
-                            obj.value = "";
-                            materialTypeItem[1].value = "";
-                            materialTypeItem[3].value = "";
-                            textureChildren.childNodes[3].childNodes[1].value = "";
-                            versionChildren.childNodes[3].childNodes[1].value = "";
-                            unitChildren.childNodes[3].childNodes[1].value = "";
-                            inventoryChildren.childNodes[3].childNodes[1].value = "";
-                        } else {
-                            materialName.value = d.mname;
-                            materialId.value = d.id;
-                            materialTypeItem[1].value = d.typeName;
-                            materialTypeItem[3].value = d.typeId;
-                            textureChildren.childNodes[3].childNodes[1].value = d.texture === null || d.texture === undefined ? '' : d.texture;
-                            versionChildren.childNodes[3].childNodes[1].value = d.version === null || d.version === undefined ? '' : d.version;
-                            inventoryChildren.childNodes[3].childNodes[1].value = d.quantity;
-                            // 获取物料与条形码的对应关系
-                            var materialAndBarCodeList = d["materialAndBarCodeList"];
-                            var idNumber = materialId.name.split("mid")[1];
-                            let unit = $("#unit" + idNumber);
-                            var barCode = $("#barCode" + idNumber);
-                            if (barCode.length > 0) {
-                                barCode.empty();
-                            }
-                            unit.empty();
-                            unit.append(new Option(d.baseUnit, "-1"));
-                            if (d.splitInfoList !== null && d.splitInfoList.length > 0) {
-                                $.each(d.splitInfoList, function (index, item) {
-                                    unit.append(new Option(item.newUnit, item.newUnit));//往下拉菜单里添加元素
-                                });
-                                form.render();
-                            }
-                            if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
-                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
-                                var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
-                                var id = barCodeInput.id;
-                                form.render();
-                                $.each(materialAndBarCodeList, function (index, item) {
-                                    $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
-                                });
-                                form.render();
-                            }
-                            var producedDateItem = $("#producedDate" + idNumber);
-                            if (producedDateItem.length > 0) {
-                                producedDateItem.empty();
-                            }
-                            var shelfLife = d.shelfLife;
-                            if (shelfLife !== null && shelfLife !== undefined) {
-                                $("#" + "producedDateItem" + idNumber).show();
-                                var producedDateList = d['producedDateList'];
-                                if (producedDateList != null && producedDateList != undefined && producedDateList.length > 0) {
-                                    $.each(producedDateList, function (index, item) {
-                                        $("#" + "producedDate" + idNumber).append(new Option(item, item));
-                                    })
-                                }
-                                form.render();
-                            } else {
-                                $("#" + "producedDateItem" + idNumber).hide();
-                                form.render();
-                            }
 
-                        }
+        // 用于监听下拉菜单
+        table.on('tool(currentTableFilter)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'more') {
+                let splitInfoList = obj.data.splitInfoList;
+                if (splitInfoList.length > 0) {
+                    let dropDownDataList = [];
+                    for (var i = 0; i < splitInfoList.length; i++) {
+                        let dropDownData = {};
+                        dropDownData.title = splitInfoList[i].newUnit;
+                        dropDownData.id = obj.data.id;
+                        dropDownDataList.push(dropDownData);
                     }
-                });
-            } else {
-                layer.msg("请先选择盘点位置或负责人", {
-                    icon: 0,
-                    time: 500
-                })
-            }
-        };
-
-
-        // 通过物料名称获取物料
-        selectMaterialByName = function (obj) {
-            if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
-                // 如果已经选择盘点的位置
-
-                // 输入物料名称
-                var data = obj.value;
-                var parent = obj.parentNode.parentNode.parentNode.parentNode;
-                var parentId = parent.id;
-                // 物料编码父级
-                var codeChildren = parent.childNodes[7];
-                // 物料名称父级
-                var materialChildren = parent.childNodes[5];
-                // 物料类型父级
-                var typeChildren = parent.childNodes[11];
-                // 材质父级
-                var textureChildren = parent.childNodes[13];
-                // 规格型号父级
-                var versionChildren = parent.childNodes[15];
-                // 计量单位父级
-                var unitChildren = parent.childNodes[17];
-                // 库存数量父级
-                var inventoryChildren = parent.childNodes[21];
-
-                // 条形码父级
-                var barCodeChildren = parent.childNodes[9];
-                // 编码条目
-                var codeItem = codeChildren.childNodes[3].childNodes[1];
-                // 具体条码
-                var codeValue = codeItem.childNodes[1];
-
-                // 物料条目
-                var materialItem = materialChildren.childNodes[3].childNodes;
-                // 物料名称
-                var materialName = materialItem[1].childNodes[1];
-                // 物料编码
-                var materialId = materialItem[3];
-                // 物料种类条目
-                var materialTypeItem = typeChildren.childNodes[3].childNodes;
-
-                // 条形码条目
-                var barCodeItem = barCodeChildren.childNodes[3];
-
-                var req = {};
-                data = data.split(",")[0];
-                if(data !== ""){
-                    req.mname = data;
-                    req.depositoryId = depositoryId;
-                    req.placeId = placeId;
-                    $.ajax({
-                        url: "/material/findMaterialForTaking",
-                        type: "post",
-                        dataType: 'json',
-                        data: JSON.stringify(req),
-                        contentType: "application/json;charset=utf-8",
-                        success: function (d) {
-                            if (d.count > 1) {
-                                layer.msg("请点击右侧搜索确定物品");
-                                materialId.value = "";
-                                codeValue.value = "";
-                                textureChildren.childNodes[3].childNodes[1].value = "";
-                                versionChildren.childNodes[3].childNodes[1].value = "";
-                                unitChildren.childNodes[3].childNodes[1].value = "";
-                                inventoryChildren.childNodes[3].childNodes[1].value = "";
-                                return false;
-                            } else if (d.count === 0) {
-                                layer.msg("没有该物品，请确认输入是否正确");
-                                materialId.value = "";
-                                codeValue.value = "";
-                                materialName.value = "";
-                                materialTypeItem[1].value = '';
-                                materialTypeItem[3].value = "";
-                                textureChildren.childNodes[3].childNodes[1].value = "";
-                                versionChildren.childNodes[3].childNodes[1].value = "";
-                                unitChildren.childNodes[3].childNodes[1].value = "";
-                                inventoryChildren.childNodes[3].childNodes[1].value = "";
-                                return false;
-                            } else {
-                                var material = d.data;
-                                materialName.value = material.mname;
-                                materialId.value = material.id;
-                                codeValue.value = material.code;
-                                materialTypeItem[1].value = material.typeName;
-                                materialTypeItem[3].value = material.typeId;
-                                textureChildren.childNodes[3].childNodes[1].value = material.texture === null || material.texture === undefined ? '' : material.texture;
-                                versionChildren.childNodes[3].childNodes[1].value = material.version === null || material.version === undefined ? '' : material.version;
-                                inventoryChildren.childNodes[3].childNodes[1].value = material.baseUnitQuantity;
-                                var idNumber = materialId.name.split("mid")[1];
-                                // 获取物料与条形码的对应关系
-                                var materialAndBarCodeList = material["materialAndBarCodeList"];
-                                if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
-                                    var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
-                                    var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
-                                    var id = barCodeInput.id;
-                                    form.render();
-                                    $.each(materialAndBarCodeList, function (index, item) {
-                                        $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
-                                    });
-                                    form.render();
-                                }
-                                let unitItem = $("#unit" + idNumber);
-                                unitItem.empty();
-                                unitItem.append(new Option(material.baseUnit, "-1"));
-                                let splitInfoList = material.splitInfoList;
-                                if (splitInfoList.length > 0) {
-                                    $.each(splitInfoList, function (index, item) {
-                                        unitItem.append(new Option(item.newUnit, item.newUnit));
-                                    })
-                                }
-                                var shelfLife = d.shelfLife;
-                                if (shelfLife !== null && shelfLife !== undefined) {
-                                    $("#" + "producedDateItem" + idNumber).show();
-                                    var producedDateList = d['producedDateList'];
-                                    if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) {
-                                        $.each(producedDateList, function (index, item) {
-                                            $("#" + "producedDate" + idNumber).append(new Option(item, item));
-                                        })
-                                    }
-                                    form.render();
-                                } else {
-                                    $("#" + "producedDateItem" + idNumber).hide();
-                                    form.render();
-                                }
-                            }
+                    dropdown.render({
+                        elem: this //触发事件的 DOM 对象
+                        , show: true //外部事件触发即显示
+                        , data: dropDownDataList
+                        , click: function (unit) {
+                            this.elem[0].childNodes[0].data = unit.title;
+                            obj.tr[0].childNodes[5].childNodes[0].innerText = obj.data.splitInventory[unit.title];
                         }
-                    });
+                        , align: 'right' //右对齐弹出（v2.6.8 新增）
+                        , style: 'box-shadow: 1px 1px 10px rgb(0 0 0 / 12%);' //设置额外样式
+                    })
                 }
+                //下拉菜单
 
-            } else {
-                layer.msg("请先选择盘点位置或负责人", {
-                    icon: 0,
-                    time: 500
-                })
-            }
-
-        };
-
-
-        // 用于二次渲染页面
-        Coverpage = function (num, obj) {
-
-            // 获取待添加父类
-            NewIdNumber = num;
-            if (num === 0) { // 如果是第一个
-                NewIdNumber = "";
-            }
-            var texture = obj.texture === null || obj.texture === undefined ? "" : obj.texture;
-            var version = obj.version === null || obj.version === undefined ? "" : obj.version;
-            var unit = obj.unit === null || obj.unit === undefined ? "" : obj.unit;
-            var materialItem = `
-                                    <div class="layui-card-body" id=` + "InventoryDetails" + NewIdNumber + ` style="padding-right: 0px">
-                                    <hr>
-                                    <i class="layui-icon layui-icon-subtraction" style="display: inline"
-                                       onclick="deleteItem(this)"></i>
-
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">物料名称:</label>
-
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <input type="text" placeholder="请选择物料" class="layui-input" value="${obj.mname}"
-                                                       style="border-style: none"
-                                                       id="openSonByMaterial" onblur="selectMaterialByName(this)"
-                                                       lay-verify="required"/>
-                                                <i class="layui-icon layui-icon-search" style="display: inline"
-                                                   id="selectMaterial" onclick="selectMaterial(this)"></i>
-                                            </div>
-                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber + `
-                                                   value="${obj.mid}" style="display: none" lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <input id=` + "code" + NewIdNumber + ` name= ` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码"
-                                                       onblur="selectCode(this)" value="${obj.code}"
-                                                       class="layui-input" lay-verify="required"
-                                                       style="border-style: none">
-                                                <img src="/static/images/search.ico" height="16" width="16"
-                                                     style="margin-top: 10px" onclick="scanMaterialCodeForTaking(this)">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <select id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + `
-
-                                                       style="border-style: none">
-                                                       </select>
-                                                <img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
-                                                     style="margin-top: 10px" onclick="scanBarCodeForTaking(this)">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">物料类型：</label>
-                                        <div class="layui-input-block">
-                                            <input type="text"  placeholder="请选择物料类型"  class="layui-input" id="openSonByMateralType" readonly
-                                                  value="${obj.typeName}" lay-verify="required"/>
-                                            <input type="text" id=` + "materialTypeId" + NewIdNumber + `  name=` + "typeId" + NewIdNumber + `  value="${obj.typeId}"
-                                            placeholder="请选择物料类型"  class="layui-input"  style="display: none"  lay-verify="required"/>
-
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">材质:</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" placeholder="请填写材质名称" class="layui-input" value="${texture}"
-                                                   name=` + "texture" + NewIdNumber + `/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">规格型号:</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" placeholder="请填写规格型号" class="layui-input" value="${version}"
-                                                   name=` + "version" + NewIdNumber + `/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">计量单位:</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" placeholder="请填写计量单位" class="layui-input" value="${unit}"
-                                                   name=` + "unit" + NewIdNumber + `/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">库存数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input" readonly  value="${obj.quantity}"
-                                                   name=` + "oldInventory" + NewIdNumber + ` id=` + "oldInventory" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盘点数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input" onblur="calculate(this)"
-                                                   name=` + "newInventory" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盘点结果:</label>
-                                        <div class="layui-input-block">
-                                            <select name=` + "takingResult" + NewIdNumber + ` id=` + "result" + NewIdNumber + `>
-
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盈亏数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input" readonly id=` + "Inventory_number" + NewIdNumber + `
-                                                   name=` + "Inventory_number" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <i class="layui-icon layui-icon-addition" style="display: inline"
-                                       onclick="addItem(this)"></i>
-                                </div>
-            `;
-            // 获取当前高度
-            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            if (NewIdNumber !== "") {
-                params.push(NewIdNumber)
             }
-            $("#stepForm").css("height", height + 682 + 'px');
-            var oldIdNumber = NewIdNumber - 1;
-            if (oldIdNumber === 0) {
-                oldIdNumber = "";
-            }
-            $("#InventoryDetails" + oldIdNumber).after(materialItem);
-        };
-
-        // 用于扫描物料编码
-        scanMaterialCodeForTaking = function (obj) {
-            if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
-
-                parent.wx.scanQRCode({
-                    desc: 'scanQRCode desc',
-                    needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-                    scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
-                    success: function (res) {
-                        // 回调
-                        var result = res.resultStr;//当needResult为1时返回处理结果
-                        var req = {};
-                        req.qrCode = result;
-                        req.placeId = placeId;
-                        req.depositoryId = depositoryId;
-                        req.codeFlag = 2;
-                        $.ajax({
-                            url: "/material/qywxStockTakingScanQrCode",
-                            type: "post",
-                            dataType: 'json',
-                            data: JSON.stringify(req),
-                            contentType: "application/json;charset=utf-8",
-                            success: function (d) {
-                                var data = d.data;
-                                if (data == null) {
-                                    layer.msg("对于编码：" + result + ",并未发现对应的物料", {
-                                        icon: 0,
-                                        time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
-                                    }, function () {
-                                    })
-                                } else {
-
-                                    var parent = obj.parentNode.parentNode.parentNode.parentNode;
-                                    var parentId = parent.id;
-                                    // 物料编码父级
-                                    var codeChildren = parent.childNodes[7];
-                                    // 物料名称父级
-                                    var materialChildren = parent.childNodes[5];
-
-                                    // 物料类型父级
-                                    var typeChildren = parent.childNodes[11];
-                                    // 材质父级
-                                    var textureChildren = parent.childNodes[13];
-                                    // 规格型号父级
-                                    var versionChildren = parent.childNodes[15];
-                                    // 计量单位父级
-                                    var unitChildren = parent.childNodes[17];
-                                    // 库存数量父级
-                                    var inventoryChildren = parent.childNodes[21];
-
-                                    // 条形码父级
-                                    var barCodeChildren = parent.childNodes[9];
-                                    // 编码条目
-                                    var codeItem = codeChildren.childNodes[3].childNodes[1];
-                                    // 具体条码
-                                    var codeValue = codeItem.childNodes[1];
-
-                                    // 物料条目
-                                    var materialItem = materialChildren.childNodes[3].childNodes;
-                                    // 物料名称
-                                    var materialName = materialItem[1].childNodes[1];
-                                    // 物料编码
-                                    var materialId = materialItem[3];
-                                    // 物料种类条目
-                                    var materialTypeItem = typeChildren.childNodes[3].childNodes;
-
-                                    // 条形码条目
-                                    var barCodeItem = barCodeChildren.childNodes[3];
-
-                                    materialName.value = data.mname;
-                                    materialId.value = data.id;
-
-                                    materialTypeItem[1].value = data.typeName;
-                                    materialTypeItem[3].value = data.typeId;
-                                    codeValue.value = data.code;
-                                    textureChildren.childNodes[3].childNodes[1].value = data.texture === null || data.texture === undefined ? '' : data.texture;
-                                    versionChildren.childNodes[3].childNodes[1].value = data.version === null || data.version === undefined ? '' : data.version;
-                                    unitChildren.childNodes[3].childNodes[1].value = data.unit === null || data.unit === undefined ? '' : data.unit;
-                                    inventoryChildren.childNodes[3].childNodes[1].value = data.quantity;
-                                    // 获取物料与条形码的对应关系
-                                    var materialAndBarCodeList = data["materialAndBarCodeList"];
-                                    var idNumber = materialId.name.split("mid")[1];
-                                    $("#barCode" + idNumber).empty();
-                                    if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
-                                        var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
-                                        var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
-                                        var id = barCodeInput.id;
-                                        form.render();
-                                        $.each(materialAndBarCodeList, function (index, item) {
-                                            $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
-                                        });
-                                        form.render();
-                                    }
-                                    var unitItem = $("#unit" + idNumber);
-                                    unitItem.empty();
-                                    unitItem.append(new Option(data.unit, "-1"));
-                                    let splitInfoList = data.splitInfoList;
-                                    if (splitInfoList.length > 0) {
-                                        $.each(splitInfoList, function (index, item) {
-                                            unitItem.append(new Option(item.newUnit, item.newUnit));
-                                        })
-                                    }
-                                    form.render();
-                                    var shelfLife = data.shelfLife;
-                                    if (shelfLife !== null && shelfLife !== undefined) {
-                                        $("#" + "producedDateItem" + idNumber).show();
-                                        var producedDateList = data['producedDateList'];
-                                        if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) {
-                                            $.each(producedDateList, function (index, item) {
-                                                $("#" + "producedDate" + idNumber).append(new Option(item, item));
-                                            })
-                                        }
-                                        form.render();
-                                    } else {
-                                        $("#" + "producedDateItem" + idNumber).hide();
-                                        form.render();
-                                    }
-                                }
-                            }
-                        })
-                    }
-                })
-
-            } else {
-                layer.msg("请先选择盘点位置或负责人", {
-                    icon: 0,
-                    time: 500
-                })
-            }
-        };
-        // 用于扫描条形码
-        scanBarCodeForTaking = function (obj) {
-            var id = obj.id;
-            id = id.split("barCodeImg")[1];
-            if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
-                parent.wx.scanQRCode({
-                    desc: 'scanQRCode desc',
-                    needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-                    scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
-                    success: function (res) {
-                        // 回调
-                        var result = res.resultStr;//当needResult为1时返回处理结果
-                        var req = {};
-                        req.qrCode = result;
-                        req.depositoryId = depositoryId;
-                        req.placeId = placeId;
-                        req.codeFlag = 1;
-                        $.ajax({
-                            url: "/material/qywxStockTakingScanBarCode",
-                            type: "post",
-                            dataType: 'json',
-                            data: JSON.stringify(req),
-                            contentType: "application/json;charset=utf-8",
-                            success: function (d) {
-                                var data = d.data;
-                                var material = data["material"];
-                                var barCodeListByNoMaterial = data["barCodeListByNoMaterial"];
-                                if (material !== null) {
-                                    var parent = obj.parentNode.parentNode.parentNode.parentNode;
-                                    var parentId = parent.id;
-                                    // 物料编码父级
-                                    var codeChildren = parent.childNodes[7];
-                                    // 物料名称父级
-                                    var materialChildren = parent.childNodes[5];
-                                    // 物料类型父级
-                                    var typeChildren = parent.childNodes[11];
-                                    // 材质父级
-                                    var textureChildren = parent.childNodes[13];
-                                    // 规格型号父级
-                                    var versionChildren = parent.childNodes[15];
-                                    // 计量单位父级
-                                    var unitChildren = parent.childNodes[17];
-                                    // 库存数量父级
-                                    var inventoryChildren = parent.childNodes[21];
-
-                                    // 条形码父级
-                                    var barCodeChildren = parent.childNodes[9];
-                                    // 编码条目
-                                    var codeItem = codeChildren.childNodes[3].childNodes[1];
-                                    // 具体条码
-                                    var codeValue = codeItem.childNodes[1];
-
-                                    // 物料条目
-                                    var materialItem = materialChildren.childNodes[3].childNodes;
-                                    // 物料名称
-                                    var materialName = materialItem[1].childNodes[1];
-                                    // 物料编码
-                                    var materialId = materialItem[3];
-                                    // 物料种类条目
-                                    var materialTypeItem = typeChildren.childNodes[3].childNodes;
-
-
-                                    materialName.value = material.mname;
-                                    materialId.value = material.id;
-                                    codeValue.value = material.code;
-                                    materialTypeItem[1].value = material.typeName;
-                                    materialTypeItem[3].value = material.typeId;
-                                    textureChildren.childNodes[3].childNodes[1].value = material.texture === null || material.texture === undefined ? '' : material.texture;
-                                    versionChildren.childNodes[3].childNodes[1].value = material.version === null || material.version === undefined ? '' : material.version;
-                                    inventoryChildren.childNodes[3].childNodes[1].value = material.quantity;
-                                    $("#barCode" + id).empty();
-                                    $("#barCode" + id).append(new Option(result, 0));//往下拉菜单里添加元素
-                                    var shelfLife = material.shelfLife;
-                                    if (shelfLife !== null && shelfLife !== undefined) {
-                                        $("#" + "producedDateItem" + id).show();
-                                        var producedDateList = material['producedDateList'];
-                                        if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) {
-                                            $.each(producedDateList, function (index, item) {
-                                                $("#" + "producedDate" + id).append(new Option(item, item));
-                                            })
-                                        }
-                                        form.render();
-                                    } else {
-                                        $("#" + "producedDateItem" + id).hide();
-                                        form.render();
-                                    }
-                                    form.render();
-                                    var unitItem = $("#unit" + id);
-                                    unitItem.empty();
-                                    unitItem.append(new Option(material.unit, "-1"));
-                                    let splitInfoList = material.splitInfoList;
-                                    if (splitInfoList.length > 0) {
-                                        $.each(splitInfoList, function (index, item) {
-                                            unitItem.append(new Option(item.newUnit, item.newUnit));
-                                        })
-                                    }
-                                    form.render();
-
-                                }
-                                if (barCodeListByNoMaterial.length > 0) {
-                                    // 如果扫描的条形码没有对应的物料
-                                    var content = '<div style="padding: 50px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">' +
-                                        '<p>未发现的条码，是否需要添加对应关系</p><hr>' +
-                                        '<table>';
-                                    for (let i = 0; i < barCodeListByNoMaterial.length; i++) {
-                                        var item = "<tr><td>" + barCodeListByNoMaterial[i] + "</td></tr>";
-                                        content += item;
-                                    }
-                                    content += '</table></div>';
-                                    layer.open({
-                                        type: 1
-                                        , title: false //不显示标题栏
-                                        , closeBtn: false
-                                        , area: '300px;'
-                                        , shade: 0.8
-                                        , id: 'LAY_layuipro' //设定一个id，防止重复弹出
-                                        , btn: ['添加', '取消']
-                                        , btnAlign: 'c'
-                                        , moveType: 1 //拖拽模式，0或者1
-                                        , content: content
-                                        , success: function (layero) {
-                                            var btn = layero.find('.layui-layer-btn');
-                                            btn.find('.layui-layer-btn0').click(function () {
-                                                $.each(barCodeListByNoMaterial, function (index, item) {
-                                                    $("#barCode" + id).append(new Option(item, item));//往下拉菜单里添加元素
-                                                });
-                                                barCodeList["barCode" + id] = barCodeListByNoMaterial;
-                                                needToUpdate["barCode" + id] = true;
-                                                form.render()
-                                            });
-                                        }
-                                    });
-
-                                }
-                            }
-                        })
-                    }
-                });
-            } else {
-                layer.msg("请先选择盘点位置或负责人", {
-                    icon: 0,
-                    time: 500
-                })
-            }
-        };
+        });
 
         // 用于计算盘点结果
         calculate = function (obj) {
-            var parent = obj.parentNode.parentNode.parentNode;
-
-            var oldInventoryItem = parent.childNodes[21].childNodes[3].childNodes[1];
-            var nowInventoryItem = parent.childNodes[23].childNodes[3].childNodes[1];
-            var resultItem = parent.childNodes[25].childNodes[3].childNodes[1];
-            var InventoryItem = parent.childNodes[27].childNodes[3].childNodes[1];
-
-            var oldInventory = Number(oldInventoryItem.value);
-            var nowInventory = Number(nowInventoryItem.value);
-            $('#' + resultItem.id).empty();
-            if (oldInventory > nowInventory) {
-                // 如果盘点数目小于库存数目
-                $('#' + resultItem.id).append(new Option("盘亏", 'Inventory_down'));//往下拉菜单里添加元素
-                $("#" + InventoryItem.id).val(oldInventory - nowInventory);
-            } else if (oldInventory < nowInventory) {
-                // 如果盘点数目大于库存数目
-                $('#' + resultItem.id).append(new Option("盘盈", 'Inventory_up'));//往下拉菜单里添加元素
-                $("#" + InventoryItem.id).val(nowInventory - oldInventory);
+            let oldInventory = Number(obj.tr[0].childNodes[5].childNodes[0].innerText);
+            let nowInventory = Number(obj.value);
+            let number = 0;
+            let takingResult = '';
+            let takingResultString = '';
+            let req = {};
+            if ((oldInventory) > (nowInventory)) {
+                number = oldInventory - nowInventory;
+                takingResult = "Inventory_down";
+                takingResultString = "盘亏";
+            } else if ((oldInventory) < (nowInventory)) {
+                number = nowInventory - oldInventory;
+                takingResult = "Inventory_up";
+                takingResultString = "盘盈";
             } else {
-                // 如果盘点数目等于库存数目
-                $('#' + resultItem.id).append(new Option("正常", 'Inventory_normal'));//往下拉菜单里添加元素
-                $("#" + InventoryItem.id).val(nowInventory - oldInventory);
+                takingResult = "Inventory_normal";
+                takingResultString = "正常";
             }
-            form.render();
+            obj.tr[0].childNodes[7].childNodes[0].innerText = takingResultString;
+            obj.tr[0].childNodes[8].childNodes[0].innerText = number;
+            obj.update({takingResult: takingResult});
+            obj.update({takingInventory: number});
+            req.number = number + "";
+            req.takingResult = takingResult;
+            req.takingResultString = takingResultString;
+            req.id = obj.data.id + "";
+            req.unit = obj.tr[0].childNodes[4].childNodes[0].innerText;
+            req.oldInventory = oldInventory+"";
+            $.ajax({
+                url: "/stockTaking/temporaryStorageForTakingResult",
+                dataType: "json",
+                data: JSON.stringify(req),
+                type: "POST",
+                contentType: "application/json;charset=utf-8"
+            });
         };
 
 
@@ -1423,8 +567,7 @@
                         $("#" + "oldInventory" + idNumber).val(d.data)
                     }
                 });
-            }
-            else if (id.includes("unit")) {
+            } else if (id.includes("unit")) {
                 let idNumber = id.split("unit")[1]; // 得到当前id对应数字
                 req.mid = $("#" + "mid" + idNumber).val();
                 req.unit = data.value;
diff --git a/src/main/resources/templates/pages/stockTaking/stockTakingReview.html b/src/main/resources/templates/pages/stockTaking/stockTakingReview.html
index d811269b..ef7ec4ff 100644
--- a/src/main/resources/templates/pages/stockTaking/stockTakingReview.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTakingReview.html
@@ -45,7 +45,7 @@
                         <div class="layui-fluid">
                             <div class="layui-card">
                                 <form class="layui-form"
-                                      style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px"
+                                      style="margin: 0 auto;max-width: 700px;"
                                       lay-filter="form1" id="form1">
                                     <div class="layui-card-body" id="takingHeader" style="padding-right: 0px">
                                         <div class="layui-form-item">
@@ -219,37 +219,38 @@
                                         </div>
                                     </fieldset>
 
-                                    <div id="review">
-                                        <div class="layui-form"
-                                             style="margin: 0 auto;max-width: 900px;padding-top: 40px;">
 
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">审核备注:</label>
-                                                <div class="layui-input-block">
-                                                    <input id="auditOpinion" name="auditOpinion"
-                                                              placeholder="请填写相关原因及申请原因" value=""
-                                                              class="layui-input"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-row layui-col-space15">
-                                                <div class="layui-input-block">
-                                                    <div class="layui-col-xs12 layui-col-md3" style="padding: 7.5px">
-                                                        <button type="button" class="layui-btn" onclick="review(1)">
-                                                            &emsp;同意&emsp;
-                                                        </button>
-                                                    </div>
-                                                    <div class="layui-col-xs12 layui-col-md3" style="padding: 7.5px">
-                                                        <button type="button" class="layui-btn layui-btn-danger"
-                                                                onclick="review(2)">
-                                                            &emsp;驳回&emsp;
-                                                        </button>
-                                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                        <div id="review">
+                            <div class="layui-form"
+                                 style="margin: 0 auto;max-width: 900px;padding-top: 40px;">
 
-                                                </div>
-                                            </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">审核备注:</label>
+                                    <div class="layui-input-block">
+                                        <input id="auditOpinion" name="auditOpinion"
+                                               placeholder="请填写相关原因及申请原因" value=""
+                                               class="layui-input"/>
+                                    </div>
+                                </div>
+                                <div class="layui-row layui-col-space15">
+                                    <div class="layui-input-block">
+                                        <div class="layui-col-xs12 layui-col-md3" style="padding: 7.5px">
+                                            <button type="button" class="layui-btn" onclick="review(1)">
+                                                &emsp;同意&emsp;
+                                            </button>
                                         </div>
+                                        <div class="layui-col-xs12 layui-col-md3" style="padding: 7.5px">
+                                            <button type="button" class="layui-btn layui-btn-danger"
+                                                    onclick="review(2)">
+                                                &emsp;驳回&emsp;
+                                            </button>
+                                        </div>
+
                                     </div>
-                                </form>
+                                </div>
                             </div>
                         </div>
                     </fieldset>
diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
index 79d7780e..3e57bd25 100644
--- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
+++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
@@ -7,10 +7,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -18,45 +21,15 @@ public class TestForOther {
 
 
     @Autowired
-    DepositoryMapper depositoryMapper;
+    RedisTemplate<String, String> redisTemplate;
 
     @Test
     public void run() {
-        Depository depositoryById = depositoryMapper.findDepositoryById(9);
-        List<Integer> childForDepositoryByParent = findChildForDepositoryByParent(depositoryById);
-        System.out.println(childForDepositoryByParent);
-    }
-
-    // 根据id获取子类
-    public List<Integer> findChildForDepositoryByParent(Depository depository) {
-        List<Integer> result = new ArrayList<>();
-        result.add(depository.getId());
-        List<Integer> parentId = new ArrayList<>();
-        parentId.add(depository.getId());
-        List<Depository> depositoryAll = depositoryMapper.findDepositoryAll();
-        for (Depository d : depositoryAll) {
-            if (parentId.contains(d.getParentId())) {
-                parentId.add(d.getId());
-                result.add(d.getId());
-            }
-        }
-        return result;
-    }
-
-
-    /**
-     * 判断当前id是否在ids中
-     *
-     * @param parentList
-     * @param id
-     * @return
-     */
-    public Boolean isTrueForParent(List<Integer> parentList, Integer id) {
-        for (Integer aLong : parentList) {
-            if (Integer.compare(aLong, id) == 0) {
-                return true;
+        Set<String> keys = redisTemplate.keys("wms_stockTaking_78_20230306*");
+        if (keys != null) {
+            for (String key : keys) {
+                System.out.println(key);
             }
         }
-        return false;
     }
 }
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
index 20bb1ade..9854eb80 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
@@ -115,6 +115,48 @@
         and pstate != 3
     </select>
 
+    <select id="findPlaceAndMaterialByCondition" parameterType="map" resultMap="MaterialAndPlaceForViewMap">
+        select
+        <include refid="allColumnsForView"/>
+        FROM materialandplaceinfo  WHERE 1 = 1
+        <if test="depositoryId != null and depositoryId != ''">
+            and depository_id = #{depositoryId}
+        </if>
+        <if test="placeId != null and placeId != ''">
+            and pid = #{placeId}
+        </if>
+        <if test="mcode != null and mcode != ''">
+            and mcode = #{mcode}
+        </if>
+        <if test="mname != null and mname != ''">
+            and mname like CONCAT('%',#{mname},'%')
+        </if>
+        and pstate != 3
+        <if test="begin != null and size != null">
+            LIMIT #{begin},#{size}
+        </if>
+    </select>
+
+
+    <select id="findPlaceAndMaterialCountByCondition" parameterType="map" resultType="int">
+        select
+        count(*)
+        FROM materialandplaceinfo  WHERE 1 = 1
+        <if test="depositoryId != null and depositoryId != ''">
+            and depository_id = #{depositoryId}
+        </if>
+        <if test="placeId != null and placeId != ''">
+            and pid = #{placeId}
+        </if>
+        <if test="mcode != null and mcode != ''">
+            and mcode = #{mcode}
+        </if>
+        <if test="mname != null and mname != ''">
+            and mname like CONCAT('%',#{mname},'%')
+        </if>
+        and pstate != 3
+    </select>
+
     <!-- 根据条件参数查询列表 -->
     <select id="findPlaceByCondition" resultMap="placeMap" parameterType="map">
         SELECT
@@ -399,4 +441,5 @@
 
     </select>
 
+
 </mapper>
\ No newline at end of file
diff --git a/target/classes/templates/pages/depository/table-stock.html b/target/classes/templates/pages/depository/table-stock.html
index 348a422a..0fef16fb 100644
--- a/target/classes/templates/pages/depository/table-stock.html
+++ b/target/classes/templates/pages/depository/table-stock.html
@@ -30,19 +30,22 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">物料名称</label>
                             <div class="layui-input-block">
-                                <input type="text" name="mname" autocomplete="off" class="layui-input" placeholder="请填写物料名称">
+                                <input type="text" name="mname" autocomplete="off" class="layui-input"
+                                       placeholder="请填写物料名称">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">存货编码</label>
                             <div class="layui-input-block">
-                                <input type="text" name="code" autocomplete="off" class="layui-input" placeholder="请填写物料编码">
+                                <input type="text" name="code" autocomplete="off" class="layui-input"
+                                       placeholder="请填写物料编码">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">型号</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请填写物料型号"/>
+                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off"
+                                       placeholder="请填写物料型号"/>
                             </div>
                         </div>
 
@@ -92,6 +95,10 @@
     function changeUnit() {
     }
 
+    function bindTableToolbarFunction() {
+
+    }
+
     layui.use(['form', 'table', 'upload'], function () {
         var $ = layui.jquery,
             form = layui.form,
@@ -197,7 +204,7 @@
 
 
                 });
-
+                bindTableToolbarFunction();
             }
         });
 
@@ -247,7 +254,7 @@
             if (data.code !== '') {
                 req.mcode = data.code.trim();
             }
-            if(data.version !== ''){
+            if (data.version !== '') {
                 req.version = data.version.trim();
             }
             //执行搜索重载
@@ -332,8 +339,8 @@
                     layer.full(index);
                 });
                 return false;
-            }else if (obj.event === 'downloadFile') {
-                window.open("/download/inventoryImportDownload","_self");
+            } else if (obj.event === 'downloadFile') {
+                window.open("/download/inventoryImportDownload", "_self");
             }
         });
 
@@ -376,7 +383,7 @@
 
                 // 获取当前showQuantity 的长度
                 let length = Object.getOwnPropertyNames(showQuantity).length;
-                if (length> 0) {
+                if (length > 0) {
 
 
                     if (clickNum < length) {
@@ -451,52 +458,55 @@
         };
 
         //用于导入数据
-        var upLoader = upload.render({
-            elem: "#u_fileUpload", // 绑定元素
-            url: '/excel/importInventory', // 上传接口
-            accept: 'file', // 允许上传的格式,
-            before: function (obj) { //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
-                layer.load(); //上传loading
-            },
-            exts: 'xls|xlsx|csv',
-            done: function (res) {
-                layer.closeAll('loading'); //关闭loading
-                //如果上传成功
-                if (res.code === 200) {
-                    var re = "";
-                    for (let i = 0; i < res.data.errMsg.length; i++) {
-                        var show = "<p style='color: #ff211e'>" + res.data.errMsg[i] + "：错误" + "</p>";
-                        re += show
-                    }
-                    for (let i = 0; i < res.data.dataList.length; i++) {
-                        var code = res.data.dataList[i]["code"] === null ? '' : res.data.dataList[i]["code"];
-                        var mname = res.data.dataList[i]["mname"];
-                        var version = res.data.dataList[i]["version"] === null ? '' : res.data.dataList[i]["version"];
-                        var quantity = res.data.dataList[i]["quantity"];
-                        var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：成功" + "</p>";
-                        re += show
+        function bindTableToolbarFunction() {
+            var upLoader = upload.render({
+                elem: "#u_fileUpload", // 绑定元素
+                url: '/excel/importInventory', // 上传接口
+                accept: 'file', // 允许上传的格式,
+                before: function (obj) { //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
+                    layer.load(); //上传loading
+                },
+                exts: 'xls|xlsx|csv',
+                done: function (res) {
+                    layer.closeAll('loading'); //关闭loading
+                    //如果上传成功
+                    if (res.code === 200) {
+                        var re = "";
+                        for (let i = 0; i < res.data.errMsg.length; i++) {
+                            var show = "<p style='color: #ff211e'>" + res.data.errMsg[i] + "：错误" + "</p>";
+                            re += show
+                        }
+                        for (let i = 0; i < res.data.dataList.length; i++) {
+                            var code = res.data.dataList[i]["code"] === null ? '' : res.data.dataList[i]["code"];
+                            var mname = res.data.dataList[i]["mname"];
+                            var version = res.data.dataList[i]["version"] === null ? '' : res.data.dataList[i]["version"];
+                            var quantity = res.data.dataList[i]["quantity"];
+                            var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：成功" + "</p>";
+                            re += show
+                        }
+
+                        layer.open({
+                            type: 1,
+                            skin: 'layui-layer-rim', //加上边框
+                            area: ['500px', '500px'], //宽高
+                            content: re
+                        })
+                    } else {
+                        layer.msg(res.msg)
                     }
 
-                    layer.open({
-                        type: 1,
-                        skin: 'layui-layer-rim', //加上边框
-                        area: ['500px', '500px'], //宽高
-                        content: re
+                },
+                error: function () {
+                    layer.closeAll('loading'); //关闭loading
+                    var demoText = $('#demoText');
+                    demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+                    demoText.find('.demo-reload').on('click', function () {
+                        upLoader.upload()
                     })
-                } else {
-                    layer.msg(res.msg)
                 }
+            })
+        }
 
-            },
-            error: function () {
-                layer.closeAll('loading'); //关闭loading
-                var demoText = $('#demoText');
-                demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
-                demoText.find('.demo-reload').on('click', function () {
-                    upLoader.upload()
-                })
-            }
-        })
     });
 </script>
 
diff --git a/target/classes/templates/pages/material/material-out.html b/target/classes/templates/pages/material/material-out.html
index b5494059..87668265 100644
--- a/target/classes/templates/pages/material/material-out.html
+++ b/target/classes/templates/pages/material/material-out.html
@@ -104,6 +104,9 @@
 </div>
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
+    function bindTableToolbarFunction(){
+
+    }
     layui.use(['form', 'table', 'upload'], function () {
         var $ = layui.jquery,
             form = layui.form,
@@ -208,6 +211,7 @@
                         let col =  {field: 'price', width: 150, title: '物料单价'};
                         cols.splice(6,0,col);
                         table.reload('currentTableId',{cols:[cols]});
+                        bindTableToolbarFunction();
                     }
 
                 }
@@ -217,6 +221,59 @@
 
         });
 
+        //用于导入数据
+        function bindTableToolbarFunction() {
+            var upLoader = upload.render({
+                elem: "#u_fileUpload", // 绑定元素
+                url: '/excel/importExcelByMaterial', // 上传接口
+                accept: 'file', // 允许上传的格式,
+                before: function (obj) { //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
+                    layer.load(); //上传loading
+                },
+                exts: 'xls|xlsx|csv',
+                done: function (res) {
+                    layer.closeAll('loading'); //关闭loading
+
+                    //如果上传成功
+                    var re = "";
+                    for (let i = 0; i < res.data.errMsg.length; i++) {
+                        var show = "<p style='color: #ff211e'>" + res.data.errMsg[i] + "：错误" + "</p>";
+                        re += show
+                    }
+                    if (res.code === 200) {
+                        for (let i = 0; i < res.data.dataList.length; i++) {
+                            var mname = res.data.dataList[i]["mname"];
+                            var code = res.data.dataList[i]["code"] == null || res.data.dataList[i]["code"] === undefined ? "" : res.data.dataList[i]["code"];
+                            var version = res.data.dataList[i]["version"] == null || res.data.dataList[i]["version"] === undefined ? "" : res.data.dataList[i]["version"];
+                            var texture = res.data.dataList[i]["texture"] == null || res.data.dataList[i]["texture"] === undefined ? "" : res.data.dataList[i]["texture"];
+                            var unit = res.data.dataList[i]["unit"] == null || res.data.dataList[i]["unit"] === undefined ? "" : res.data.dataList[i]["unit"];
+                            var typeId = res.data.dataList[i]["typeId"] == null || res.data.dataList[i]["typeId"] === undefined ? "" : res.data.dataList[i]["typeId"];
+                            var show = "<p style='color: #00FF00'>" + mname + " " + version + " " + code + " " + texture + " " + unit + " " + typeId + " ：成功" + "</p>";
+                            re += show
+                        }
+
+                        layer.open({
+                            type: 1,
+                            skin: 'layui-layer-rim', //加上边框
+                            area: ['500px', '500px'], //宽高
+                            content: re
+                        })
+                    } else {
+                        layer.msg(res.msg)
+                    }
+
+                },
+                error: function () {
+                    layer.closeAll('loading'); //关闭loading
+                    var demoText = $('#demoText');
+                    demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+                    demoText.find('.demo-reload').on('click', function () {
+                        upLoader.upload()
+                    })
+                }
+            });
+        }
+
 
 
         // 监听搜索操作
@@ -362,56 +419,7 @@
             }
         });
 
-        //用于导入数据
-        var upLoader = upload.render({
-            elem: "#u_fileUpload", // 绑定元素
-            url: '/excel/importExcelByMaterial', // 上传接口
-            accept: 'file', // 允许上传的格式,
-            before: function (obj) { //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
-                layer.load(); //上传loading
-            },
-            exts: 'xls|xlsx|csv',
-            done: function (res) {
-                layer.closeAll('loading'); //关闭loading
-
-                //如果上传成功
-                var re = "";
-                for (let i = 0; i < res.data.errMsg.length; i++) {
-                    var show = "<p style='color: #ff211e'>" + res.data.errMsg[i] + "：错误" + "</p>";
-                    re += show
-                }
-                if (res.code === 200) {
-                    for (let i = 0; i < res.data.dataList.length; i++) {
-                        var mname = res.data.dataList[i]["mname"];
-                        var code = res.data.dataList[i]["code"] == null || res.data.dataList[i]["code"] == undefined ? "" : res.data.dataList[i]["code"];
-                        var version = res.data.dataList[i]["version"] == null || res.data.dataList[i]["version"] == undefined ? "" : res.data.dataList[i]["version"];
-                        var texture = res.data.dataList[i]["texture"] == null || res.data.dataList[i]["texture"] == undefined ? "" : res.data.dataList[i]["texture"];
-                        var unit = res.data.dataList[i]["unit"] == null || res.data.dataList[i]["unit"] == undefined ? "" : res.data.dataList[i]["unit"];
-                        var typeId = res.data.dataList[i]["typeId"] == null || res.data.dataList[i]["typeId"] == undefined ? "" : res.data.dataList[i]["typeId"];
-                        var show = "<p style='color: #00FF00'>" + mname + " " + version + " " + code + " " + texture + " " + unit + " " + typeId + " ：成功" + "</p>";
-                        re += show
-                    }
-
-                    layer.open({
-                        type: 1,
-                        skin: 'layui-layer-rim', //加上边框
-                        area: ['500px', '500px'], //宽高
-                        content: re
-                    })
-                } else {
-                    layer.msg(res.msg)
-                }
 
-            },
-            error: function () {
-                layer.closeAll('loading'); //关闭loading
-                var demoText = $('#demoText');
-                demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
-                demoText.find('.demo-reload').on('click', function () {
-                    upLoader.upload()
-                })
-            }
-        });
 
         //监听表格复选框选择
         table.on('checkbox(currentTableFilter)', function (obj) {
diff --git a/target/classes/templates/pages/materialtype/materialType_view.html b/target/classes/templates/pages/materialtype/materialType_view.html
index dcba61b7..d71e828b 100644
--- a/target/classes/templates/pages/materialtype/materialType_view.html
+++ b/target/classes/templates/pages/materialtype/materialType_view.html
@@ -59,8 +59,12 @@
 
         <script type="text/html" id="toolbarDemo">
             <div class="layui-btn-container">
-                <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" th:style="'display:'+${display}"> 添加</button>
-                <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete" th:style="'display:'+${display}"> 删除</button>
+                <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"
+                        th:style="'display:'+${display}"> 添加
+                </button>
+                <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"
+                        th:style="'display:'+${display}"> 删除
+                </button>
                 <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" id="u_fileUpload"
                         lay-event="import">导入数据
                 </button>
@@ -73,8 +77,10 @@
 
         <script type="text/html" id="currentTableBar">
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子类型</a>
-            <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="detail" th:style="'display:'+${display}">详情</a>
-            <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete" th:style="'display:'+${display}">删除</a>
+            <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="detail"
+               th:style="'display:'+${display}">详情</a>
+            <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete"
+               th:style="'display:'+${display}">删除</a>
             <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
                lay-event="realDelete">彻底删除</a>
         </script>
@@ -83,6 +89,9 @@
 </div>
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
+    function bindTableToolbarFunction(){
+
+    }
     layui.use(['form', 'table', 'upload'], function () {
         var $ = layui.jquery,
             form = layui.form,
@@ -132,6 +141,7 @@
             page: true,
             skin: 'line',
             done: function () {
+                bindTableToolbarFunction();
             }
         });
 
@@ -175,8 +185,7 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
-            }
-            else if (obj.event === 'delete') {  // 监听删除操作
+            } else if (obj.event === 'delete') {  // 监听删除操作
                 var checkStatus = table.checkStatus('currentTableId')
                     , data = checkStatus.data;
                 var req = {};
@@ -221,55 +230,57 @@
                     layer.msg("未选中记录，请确认！");
                     return false;
                 }
-            }
-            else if (obj.event === 'downloadFile') {
-                window.open("/download/materialTypeImportDownload","_self");
+            } else if (obj.event === 'downloadFile') {
+                window.open("/download/materialTypeImportDownload", "_self");
             }
         });
 
 
-        //用于导入数据
-        var upLoader = upload.render({
-            elem: "#u_fileUpload", // 绑定元素
-            url: '/excel/importExcelByMT', // 上传接口
-            accept: 'file', // 允许上传的格式,
-            exts: 'xls|xlsx|csv',
-            done: function (res) {
-                //如果上传成功
-                if (res.code == 200) {
-                    var re = "";
-                    for (let i = 0; i < res.data.errMsg.length; i++) {
-                        var show = "<p style='color: #ff211e'>" + res.data.errMsg[i] + "：错误" + "</p>";
-                        re += show
-                    }
-                    for (let i = 0; i < res.data.dataList.length; i++) {
-                        var tname = res.data.dataList[i]["tname"];
-                        var id = res.data.dataList[i]["oldId"];
-                        var parentId = res.data.dataList[i]["parentId"] == null ? "" : res.data.dataList[i]["parentId"];
-                        var introduce = res.data.dataList[i]["introduce"] == null ? "" : res.data.dataList[i]["introduce"];
-                        var show = "<p style='color: #00FF00'>" + tname + " " + id + " " + parentId + "成功" + "</p>";
-                        re += show
+       //用于导入数据
+        function bindTableToolbarFunction() {
+            var upLoader = upload.render({
+                elem: "#u_fileUpload", // 绑定元素
+                url: '/excel/importExcelByMT', // 上传接口
+                accept: 'file', // 允许上传的格式,
+                exts: 'xls|xlsx|csv',
+                done: function (res) {
+                    //如果上传成功
+                    if (res.code == 200) {
+                        var re = "";
+                        for (let i = 0; i < res.data.errMsg.length; i++) {
+                            var show = "<p style='color: #ff211e'>" + res.data.errMsg[i] + "：错误" + "</p>";
+                            re += show
+                        }
+                        for (let i = 0; i < res.data.dataList.length; i++) {
+                            var tname = res.data.dataList[i]["tname"];
+                            var id = res.data.dataList[i]["oldId"];
+                            var parentId = res.data.dataList[i]["parentId"] == null ? "" : res.data.dataList[i]["parentId"];
+                            var introduce = res.data.dataList[i]["introduce"] == null ? "" : res.data.dataList[i]["introduce"];
+                            var show = "<p style='color: #00FF00'>" + tname + " " + id + " " + parentId + "成功" + "</p>";
+                            re += show
+                        }
+
+                        layer.open({
+                            type: 1,
+                            skin: 'layui-layer-rim', //加上边框
+                            area: ['500px', '500px'], //宽高
+                            content: re
+                        })
+                    } else {
+                        layer.msg(res.msg)
                     }
 
-                    layer.open({
-                        type: 1,
-                        skin: 'layui-layer-rim', //加上边框
-                        area: ['500px', '500px'], //宽高
-                        content: re
+                },
+                error: function () {
+                    var demoText = $('#demoText');
+                    demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+                    demoText.find('.demo-reload').on('click', function () {
+                        upLoader.upload()
                     })
-                } else {
-                    layer.msg(res.msg)
                 }
+            });
+        }
 
-            },
-            error: function () {
-                var demoText = $('#demoText');
-                demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
-                demoText.find('.demo-reload').on('click', function () {
-                    upLoader.upload()
-                })
-            }
-        });
 
         //监听表格复选框选择
         table.on('checkbox(currentTableFilter)', function (obj) {
diff --git a/target/classes/templates/pages/stockTaking/stockTaking.html b/target/classes/templates/pages/stockTaking/stockTaking.html
index f0f4ca18..a5a972d2 100644
--- a/target/classes/templates/pages/stockTaking/stockTaking.html
+++ b/target/classes/templates/pages/stockTaking/stockTaking.html
@@ -43,79 +43,76 @@
     </style>
 </head>
 <body>
+
 <div class="layuimini-container">
     <div class="layuimini-main">
 
         <div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto; ">
             <div carousel-item style="overflow: inherit">
                 <div>
-                    <fieldset class="table-search-fieldset" style="padding-left: 0px;padding-right: 0px">
-                        <legend>库存盘点</legend>
-                        <div class="layui-fluid">
-                            <div class="layui-card">
-                                <form class="layui-form"
-                                      style="margin: 0 auto;max-width: 700px;"
-                                      lay-filter="form1" id="form1">
-                                    <div class="layui-card-body" id="takingHeader" style="padding-right: 0px">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label" style="height: 40px;">盘点位置:</label>
-                                            <div class="layui-input-block">
-                                                <div class="inputdiv">
-                                                    <input type="text" placeholder="请选择盘点位置" class="layui-input"
-                                                           style="border-style: none"
-                                                           id="openSonByDepository" readonly
-                                                           lay-verify="required"/>
-                                                    <img src="/static/images/search.ico" height="16" width="16"
-                                                         id="scanCodeImg"
-                                                         style="margin-top: 10px" onclick="scanCode(this)">
-                                                </div>
-                                                <input type="text" name="depositoryId" class="layui-input"
-                                                       id="depositoryId"
-                                                       style="display: none" lay-verify="required"/>
-                                                <input type="text" name="placeId" class="layui-input" id="placeId"
-                                                       style="display: none" lay-verify="required"/>
+                    <div class="layui-fluid">
+                        <div class="layui-card">
+                            <form class="layui-form"
+                                  style="margin: 0 auto;max-width: 700px;"
+                                  lay-filter="form1" id="form1">
+                                <div class="layui-card-body" id="takingHeader" style="padding-right: 0px">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="height: 40px;">盘点位置:</label>
+                                        <div class="layui-input-block">
+                                            <div class="inputdiv">
+                                                <input type="text" placeholder="请选择盘点位置" class="layui-input"
+                                                       style="border-style: none"
+                                                       id="openSonByDepository" readonly
+                                                       lay-verify="required"/>
+                                                <img src="/static/images/search.ico" height="16" width="16"
+                                                     id="scanCodeImg"
+                                                     style="margin-top: 10px" onclick="scanCode(this)">
                                             </div>
+                                            <input type="text" name="depositoryId" class="layui-input"
+                                                   id="depositoryId"
+                                                   style="display: none" lay-verify="required"/>
+                                            <input type="text" name="placeId" class="layui-input" id="placeId"
+                                                   style="display: none" lay-verify="required"/>
                                         </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label" style="height: 40px;">负责人：</label>
-                                            <div class="layui-input-block">
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="height: 40px;">负责人：</label>
+                                        <div class="layui-input-block">
 
-                                                <div class="fairy-tag-container" style="border-style: none">
-                                                    <div class="inputdiv">
-                                                        <input type="text" id="departmentManager" style="display: none"
-                                                               th:value="${departmentHeadName}"/>
-                                                        <i class="layui-icon layui-icon-search"
-                                                           style="display: inline;right: 0;position: absolute;"
-                                                           id="selectdepartmentManager"></i>
-                                                        <input type="text" id="departmentManagerId"
-                                                               name="departmentManagerId"
-                                                               th:value="${departmentHeadId}"
-                                                               class="layui-input" style="display: none"
-                                                               lay-verify="required"/>
-                                                    </div>
+                                            <div class="fairy-tag-container" style="border-style: none">
+                                                <div class="inputdiv">
+                                                    <input type="text" id="departmentManager" style="display: none"
+                                                           th:value="${departmentHeadName}"/>
+                                                    <i class="layui-icon layui-icon-search"
+                                                       style="display: inline;right: 0;position: absolute;"
+                                                       id="selectdepartmentManager"></i>
+                                                    <input type="text" id="departmentManagerId"
+                                                           name="departmentManagerId"
+                                                           th:value="${departmentHeadId}"
+                                                           class="layui-input" style="display: none"
+                                                           lay-verify="required"/>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-
-                                    <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
-
-                                    <!--                                        提交按钮-->
-                                    <div class="layui-form-item" style="margin-top: 10px;">
-                                        <div class="layui-input-block">
-                                            <button type="button" class="layui-btn layui-btn-normal layui-btn-lg"
-                                                    lay-submit
-                                                    lay-filter="formStep">
-                                                &emsp;提交&emsp;
-                                            </button>
-                                        </div>
-                                    </div>
-                                </form>
+                                </div>
+                            </form>
+                            <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"
+                                   style="margin-top: 123px"></table>
+                            <!--   提交按钮-->
+                            <div class="layui-form-item" style="margin-top: 10px;">
+                                <div class="layui-input-block">
+                                    <button type="button" class="layui-btn layui-btn-normal layui-btn-lg"
+                                            lay-submit
+                                            lay-filter="formStep">
+                                        &emsp;提交&emsp;
+                                    </button>
+                                </div>
                             </div>
                         </div>
-                    </fieldset>
+                    </div>
                 </div>
-                <!--                            下一步-->
+                <!-- 下一步-->
                 <div>
                     <form class="layui-form" style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
                         <div style="text-align: center;margin-top: 90px;">
@@ -136,6 +133,10 @@
         </div>
     </div>
 </div>
+
+<script id="changeUnit" type="text/html">
+    <a class="layui-btn layui-btn-xs" lay-event="more">{{d.unit}}<i class="layui-icon layui-icon-down"></i></a>
+</script>
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
@@ -167,46 +168,27 @@
     function selectCode(obj) {
     }
 
-    // 用于扫描物料编码
-    function scanMaterialCodeForTaking() {
-
-    }
-
-    // 用于扫描条形码
-    function scanBarCodeForTaking() {
+    // 用于计算盘点结果
+    function calculate(obj) {
 
     }
 
-    // 用于二次渲染页面
-    function Coverpage() {
+    function updateTableShow() {
 
     }
 
-    // 用于计算盘点结果
-    function calculate(obj) {
-
-    }
-
-    // 用于暂存卡片个数
-    let params = [];
-    // 用于卡片编号
-    var NewIdNumber = 1;
 
     // 用于存储当前选择的盘点位置
     let depositoryId;
     let placeId;
     // 用于存储当前选择的负责人
     let departmentManagerId;
-
-    // 用于存储没有对应关系的物料
-    let barCodeList = {};
-
-    let needToUpdate = {};
-    layui.use(['form', 'step', 'flow', 'laydate', 'inputTag'], function () {
+    layui.use(['form', 'step', 'flow', 'table', 'inputTag'], function () {
         var $ = layui.$,
             form = layui.form,
-            laydate = layui.laydate,
+            table = layui.table,
             inputTag = layui.inputTag,
+            dropdown = layui.dropdown, //下拉菜单
             step = layui.step;
         departmentManagerId = $("#departmentManagerId").val();
 
@@ -279,14 +261,88 @@
                         $("#openSonByDepository").val(nowDepositoryName);
                         form.render();
                     }
-                    depositoryId = nowDepositoryId;
-                    placeId = nowPlaceId;
+                    if (nowDepositoryId !== null && nowDepositoryId !== "") {
+                        depositoryId = nowDepositoryId;
+                        placeId = nowPlaceId;
+                        updateTableShow();
+                    }
 
                 }
             });
         });
 
 
+        updateTableShow = function () {
+            let req = {};
+            req.depositoryId = depositoryId;
+            req.placeId = placeId;
+            table.reload('currentTableId', {
+                url: '/material/findInventoryForStockTaking',
+                page: {
+                    curr: 1
+                },
+                where: req
+            }, 'data');
+        };
+
+        table.render({
+            elem: "#currentTableId",
+            url: '/material/findInventoryForStockTaking',
+            parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "status": res.status, //解析接口状态
+                    "message": res.statusInfo.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.data //解析数据列表
+                };
+            },
+            request: {
+                pageName: 'page', //页码的参数名称，默认：page
+                limitName: 'size' //每页数据量的参数名，默认：limit
+            },
+            response: {
+                statusName: 'status' //规定数据状态的字段名称，默认：code
+                , statusCode: 200 //规定成功的状态码，默认：0
+                , msgName: 'message' //规定状态信息的字段名称，默认：msg
+                , countName: 'count' //规定数据总数的字段名称，默认：count
+                , dataName: 'data' //规定数据列表的字段名称，默认：data
+            },
+            where: {
+                depositoryId: "-1"
+            },
+            height: 'full-255',//固定高度-即固定表头固定第一行首行
+            cols: [
+                [
+                    {field: 'mcode', width: 150, title: '存货编码', fixed: 'left'},
+                    {field: 'mname', width: 150, title: '物料名称'},
+                    {field: 'typeName', width: 100, title: '物料种类'},
+                    {field: 'version', width: 150, title: '规格型号',},
+                    {title: '计量单位', width: 200, templet: '#changeUnit', align: "center"},
+                    {field: 'inventory', width: 100, title: '库存数'},
+                    {field: 'stockTakingQuantity', width: 100, title: '盘点数', edit: 'quantity'},
+                    {field: 'takingResultString', width: 100, title: '盘点结果'},
+                    {field: 'takingInventory', width: 100, title: '盈亏数量'},
+                ]
+            ],
+            limits: [10, 15, 20, 25, 50, 100],
+            limit: 10,
+            page: true,
+            skin: 'line',
+            done: function (res, curr, count) {
+                $.each(res['data'], function (i, j) {
+                    let takingUnit = j["takingUnit"];
+                    if (takingUnit !== null) {
+                        let parentItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")");
+                        let unitHandleItem = parentItem.children()[4];
+                        let quantityHandleItem = parentItem.children()[5];
+                        unitHandleItem.childNodes[0].childNodes[1].childNodes[0].data = takingUnit;
+                        quantityHandleItem.childNodes[0].innerText = j["splitInventory"][takingUnit];
+                    }
+                });
+            }
+        });
+
+
         // 用于打开负责人树形菜单
         $("#selectdepartmentManager").on('click', function () {
             layer.open({
@@ -317,12 +373,12 @@
         // 用于提交盘点情况
         form.on('submit(formStep)', function (data) {
             data = data.field;
-            data.params = params;
-            data.needToUpdate = needToUpdate;
-            data.barCodeListByNoMaterial = barCodeList;
-            data.departmentManagerId = departmentManagerId;
+            data.depositoryId = depositoryId;
+            data.placeId = placeId;
+            data.departmentManager = departmentManagerId;
+
             $.ajax({
-                url: "/stockTaking/addStockTakingRecord",
+                url: "/stockTaking/submitStockTaking",
                 type: 'post',
                 dataType: 'json',
                 contentType: "application/json;charset=utf-8",
@@ -357,160 +413,6 @@
         $('.next').click(function () {
             step.next('#stepForm');
         });
-        // 实现卡片添加
-        addItem = function (obj) {
-            // 获取父元素id
-            var parentId = obj.parentNode.id;
-            NewIdNumber = NewIdNumber + 1;
-            var materialItem = `
-                                    <div class="layui-card-body" id=` + "InventoryDetails" + NewIdNumber + ` style="padding-right: 0px">
-                                    <hr>
-                                    <i class="layui-icon layui-icon-subtraction" style="display: inline"
-                                       onclick="deleteItem(this)"></i>
-
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">物料名称:</label>
-
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <input type="text" placeholder="请选择物料" class="layui-input"
-                                                       style="border-style: none"
-                                                       id="openSonByMaterial" onblur="selectMaterialByName(this)"
-                                                       lay-verify="required"/>
-                                                <i class="layui-icon layui-icon-search" style="display: inline"
-                                                   id="selectMaterial" onclick="selectMaterial(this)"></i>
-                                            </div>
-                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber + `
-                                                   style="display: none" lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <input id=` + "code" + NewIdNumber + ` name= ` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value=""
-                                                       onblur="selectCode(this)"
-                                                       class="layui-input" lay-verify="required"
-                                                       style="border-style: none">
-                                                <img src="/static/images/search.ico" height="16" width="16"
-                                                     style="margin-top: 10px" onclick="scanMaterialCodeForTaking(this)">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <select id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + `
-
-                                                       style="border-style: none">
-                                                       </select>
-                                                <img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
-                                                     style="margin-top: 10px" onclick="scanBarCodeForTaking(this)">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">物料类型：</label>
-                                        <div class="layui-input-block">
-                                            <input type="text"  placeholder="请选择物料类型"  class="layui-input" id="openSonByMateralType" readonly
-                                                   lay-verify="required"/>
-                                            <input type="text" id=` + "materialTypeId" + NewIdNumber + `  name=` + "typeId" + NewIdNumber + ` placeholder="请选择物料类型"  class="layui-input"  style="display: none"  lay-verify="required"/>
-
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">材质:</label>
-                                        <div class="layui-input-block">
-                                            <input name=` + "texture" + NewIdNumber + ` type="text" placeholder="请填写材质名称" class="layui-input" />
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">规格型号:</label>
-                                        <div class="layui-input-block">
-                                            <input name=` + "version" + NewIdNumber + ` type="text" placeholder="请填写规格型号" class="layui-input"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">计量单位:</label>
-                                        <div class="layui-input-block">
-                                            <select name=` + "unit" + NewIdNumber + ` id=` + "unit" + NewIdNumber + `></select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item" style="display: none" id=` + "producedDateItem" + NewIdNumber + `>
-                                        <label class="layui-form-label">生产日期:</label>
-                                        <div class="layui-input-block">
-                                            <select name=` + "producedDate" + NewIdNumber + ` id=` + "producedDate" + NewIdNumber + ` >
-
-                                                    </select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">库存数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input" readonly
-                                                   name=` + "oldInventory" + NewIdNumber + ` id=` + "oldInventory" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盘点数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input"  onblur="calculate(this)"
-                                                   name=` + "newInventory" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盘点结果:</label>
-                                        <div class="layui-input-block">
-                                            <select name=` + "takingResult" + NewIdNumber + ` id=` + "result" + NewIdNumber + `>
-
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盈亏数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input" readonly id=` + "Inventory_number" + NewIdNumber + `
-                                                   name=` + "inventory" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <i class="layui-icon layui-icon-addition" style="display: inline"
-                                       onclick="addItem(this)"></i>
-                                </div>
-            `;
-            // 获取当前高度
-            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            params.push(NewIdNumber);
-            // $("#form1").css("height", height + 682 + 'px');
-            $("#stepForm").css("height", height + 735 + 'px');
-            $("#" + parentId).after(materialItem);
-        };
-
-        // 实现卡片删除
-        deleteItem = function (obj) {
-            // 获取父节点
-            var parent = obj.parentNode;
-            var parentId = parent.id;
-            parentId = parseInt(parentId.split("InventoryDetails")[1]);
-            // 获取祖父节点
-            var reparent = parent.parentNode;
-            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            $("#stepForm").css("height", height - 735 + 'px');
-            params = remove(params, parentId);
-            reparent.removeChild(parent);
-        };
-
-        //删除数组中指定元素
-        function remove(arr, item) {
-            var result = [];
-            for (let i = 0; i < arr.length; i++) {
-                if (arr[i] === item) {
-                    continue;
-                }
-                result.push(arr[i]);
-            }
-            return result;
-        }
 
 
         // 扫码盘点位置
@@ -539,6 +441,10 @@
                                 layer.msg("并未查询到对应位置，请重新扫描", {
                                     icon: 0,
                                     time: 1000
+                                }, function () {
+                                    depositoryId = -1;
+                                    placeId = -1;
+
                                 });
                             } else if (flag === 1) {
                                 // 如果获取到的是库位
@@ -560,849 +466,87 @@
                                 placeId = "0";
 
                             }
+                            updateTableShow();
                         }
                     })
                 }
             })
         };
 
+        table.on('edit(currentTableFilter)', function (obj) {
+            obj.update({stockTakingQuantity: obj.value});//修改当前行数据
+            calculate(obj);
+        });
 
-        // 用于打开物料树形菜单
-        selectMaterial = function (obj) {
-            if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
-                var parent = obj.parentNode.parentNode.parentNode.parentNode;
-                var parentId = parent.id;
-                // 物料编码父级
-                var codeChildren = parent.childNodes[7];
-                // 物料名称父级
-                var materialChildren = parent.childNodes[5];
-                // 物料类型父级
-                var typeChildren = parent.childNodes[11];
-                // 材质父级
-                var textureChildren = parent.childNodes[13];
-                // 规格型号父级
-                var versionChildren = parent.childNodes[15];
-                // 计量单位父级
-                var unitChildren = parent.childNodes[17];
-                // 库存数量父级
-                var inventoryChildren = parent.childNodes[21];
-
-                // 条形码父级
-                var barCodeChildren = parent.childNodes[9];
-                // 编码条目
-                var codeItem = codeChildren.childNodes[3].childNodes[1];
-                // 具体条码
-                var codeValue = codeItem.childNodes[1];
-
-                // 物料条目
-                var materialItem = materialChildren.childNodes[3].childNodes;
-                // 物料名称
-                var materialName = materialItem[1].childNodes[1];
-                // 物料编码
-                var materialId = materialItem[3];
-                // 输入的物料名称
-                var mname = materialName.value;
-                // 物料种类条目
-                var materialTypeItem = typeChildren.childNodes[3].childNodes;
-
-                // 条形码条目
-                var barCodeItem = barCodeChildren.childNodes[3];
-                layer.open({
-                    type: 2,
-                    title: '弹窗内容',
-                    skin: 'layui-layer-rim',
-                    maxmin: true,
-                    shadeClose: true, //点击遮罩关闭层
-                    area: ['70%', '70%'],
-                    move: '.layui-layer-title',
-                    fixed: false,
-                    content: '/getMaterialAll?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId,
-                    // content: '/selectMaterialByCardForTaking?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId,
-                    success: function (layero, index) {
-                        var children = layero.children();
-                        var content = $(children[1]);
-                        var iframeChildren = $(content.children());
-                        content.css('height', '100%');
-                        iframeChildren.css('height', '100%');
-                    },
-                    end: function () {
-                        var mid = materialId.value;
-                        if (mid !== '') {
-                            $.ajax({
-                                url: "/material/findInventoryByIdAndPid?mid=" + mid + "&pid=" + placeId,
-                                type: "get",
-                                dataType: 'json',
-                                contentType: "application/json;charset=utf-8",
-                                success: function (d) {
-                                    var material = d.data.materialById;
-                                    var code = material.code;
-                                    if (code === undefined) {
-                                        code = "";
-                                    }
-                                    codeValue.value = code;
-                                    materialTypeItem[1].value = material.typeName;
-                                    materialTypeItem[3].value = material.typeId;
-                                    textureChildren.childNodes[3].childNodes[1].value = material.texture === null || material.texture === undefined ? '' : material.texture;
-                                    versionChildren.childNodes[3].childNodes[1].value = material.version === null || material.version === undefined ? '' : material.version;
-                                    inventoryChildren.childNodes[3].childNodes[1].value = material.quantity;
-                                    var materialAndBarCodeList = material.materialAndBarCodeList;
-                                    var idNumber = materialId.name.split("mid")[1];
-                                    if (materialAndBarCodeList.length > 0) {
-                                        // 如果有对应的条形码
-                                        var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
-                                        var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
-                                        var id = barCodeInput.id;
-
-                                        form.render();
-                                        $.each(materialAndBarCodeList, function (index, item) {
-                                            $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
-                                        });
-                                        form.render();
-                                    }
-                                    let unitItem = $("#unit" + idNumber);
-                                    unitItem.empty();
-                                    unitItem.append(new Option(material.unit, "-1"));
-                                    let splitInfoList = material.splitInfoList;
-                                    if (splitInfoList.length > 0) {
-                                        $.each(splitInfoList, function (index, item) {
-                                            unitItem.append(new Option(item.newUnit, item.newUnit));
-                                        })
-                                    }
-                                    form.render();
-                                    var shelfLife = material.shelfLife;
-                                    if (shelfLife !== null && shelfLife !== undefined) {
-                                        $("#" + "producedDateItem" + idNumber).show();
-                                        var producedDateList = d.data['producedDateList'];
-                                        if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) {
-                                            $.each(producedDateList, function (index, item) {
-                                                $("#" + "producedDate" + idNumber).append(new Option(item, item));
-                                            })
-                                        }
-                                        form.render();
-                                    } else {
-                                        $("#" + "producedDateItem" + idNumber).hide();
-                                        form.render();
-                                    }
-
-                                }
-                            });
-                        }
-                    }
-                });
-            } else {
-                layer.msg("请先选择盘点位置或负责人", {
-                    icon: 0,
-                    time: 500
-                })
-            }
-        };
-
-
-        // 用于实现通过编码查询物料
-        selectCode = function (obj) {
-            if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
-                // 输入code
-                var code = obj.value;
-                var parent = obj.parentNode.parentNode.parentNode.parentNode;
-                var parentId = parent.id;
-                // 物料编码父级
-                var codeChildren = parent.childNodes[7];
-                // 物料名称父级
-                var materialChildren = parent.childNodes[5];
-                // 物料类型父级
-                var typeChildren = parent.childNodes[11];
-                // 材质父级
-                var textureChildren = parent.childNodes[13];
-                // 规格型号父级
-                var versionChildren = parent.childNodes[15];
-                // 计量单位父级
-                var unitChildren = parent.childNodes[17];
-                // 库存数量父级
-                var inventoryChildren = parent.childNodes[21];
-
-                // 条形码父级
-                var barCodeChildren = parent.childNodes[9];
-                // 编码条目
-                var codeItem = codeChildren.childNodes[3].childNodes[1];
-                // 具体条码
-                var codeValue = codeItem.childNodes[1];
-
-                // 物料条目
-                var materialItem = materialChildren.childNodes[3].childNodes;
-                // 物料名称
-                var materialName = materialItem[1].childNodes[1];
-                // 物料编码
-                var materialId = materialItem[3];
-                // 物料种类条目
-                var materialTypeItem = typeChildren.childNodes[3].childNodes;
-
-                // 条形码条目
-                var barCodeItem = barCodeChildren.childNodes[3];
-                // 获取对应元素
-                var req = {};
-                req.code = code;
-                req.depositoryId = depositoryId;
-                req.placeId = placeId;
-                $.ajax({
-                    url: "/material/findMatrialByCodeForTaking",
-                    type: "post",
-                    dataType: 'json',
-                    data: JSON.stringify(req),
-                    contentType: "application/json;charset=utf-8",
-                    success: function (d) {
-                        var d = d.data;
-                        if (d == null) {
-                            layer.msg("该位置暂未该物品，请确认是否输入正确");
-                            materialName.value = "";
-                            materialId.value = "";
-                            obj.value = "";
-                            materialTypeItem[1].value = "";
-                            materialTypeItem[3].value = "";
-                            textureChildren.childNodes[3].childNodes[1].value = "";
-                            versionChildren.childNodes[3].childNodes[1].value = "";
-                            unitChildren.childNodes[3].childNodes[1].value = "";
-                            inventoryChildren.childNodes[3].childNodes[1].value = "";
-                        } else {
-                            materialName.value = d.mname;
-                            materialId.value = d.id;
-                            materialTypeItem[1].value = d.typeName;
-                            materialTypeItem[3].value = d.typeId;
-                            textureChildren.childNodes[3].childNodes[1].value = d.texture === null || d.texture === undefined ? '' : d.texture;
-                            versionChildren.childNodes[3].childNodes[1].value = d.version === null || d.version === undefined ? '' : d.version;
-                            inventoryChildren.childNodes[3].childNodes[1].value = d.quantity;
-                            // 获取物料与条形码的对应关系
-                            var materialAndBarCodeList = d["materialAndBarCodeList"];
-                            var idNumber = materialId.name.split("mid")[1];
-                            let unit = $("#unit" + idNumber);
-                            var barCode = $("#barCode" + idNumber);
-                            if (barCode.length > 0) {
-                                barCode.empty();
-                            }
-                            unit.empty();
-                            unit.append(new Option(d.baseUnit, "-1"));
-                            if (d.splitInfoList !== null && d.splitInfoList.length > 0) {
-                                $.each(d.splitInfoList, function (index, item) {
-                                    unit.append(new Option(item.newUnit, item.newUnit));//往下拉菜单里添加元素
-                                });
-                                form.render();
-                            }
-                            if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
-                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
-                                var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
-                                var id = barCodeInput.id;
-                                form.render();
-                                $.each(materialAndBarCodeList, function (index, item) {
-                                    $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
-                                });
-                                form.render();
-                            }
-                            var producedDateItem = $("#producedDate" + idNumber);
-                            if (producedDateItem.length > 0) {
-                                producedDateItem.empty();
-                            }
-                            var shelfLife = d.shelfLife;
-                            if (shelfLife !== null && shelfLife !== undefined) {
-                                $("#" + "producedDateItem" + idNumber).show();
-                                var producedDateList = d['producedDateList'];
-                                if (producedDateList != null && producedDateList != undefined && producedDateList.length > 0) {
-                                    $.each(producedDateList, function (index, item) {
-                                        $("#" + "producedDate" + idNumber).append(new Option(item, item));
-                                    })
-                                }
-                                form.render();
-                            } else {
-                                $("#" + "producedDateItem" + idNumber).hide();
-                                form.render();
-                            }
 
-                        }
+        // 用于监听下拉菜单
+        table.on('tool(currentTableFilter)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'more') {
+                let splitInfoList = obj.data.splitInfoList;
+                if (splitInfoList.length > 0) {
+                    let dropDownDataList = [];
+                    for (var i = 0; i < splitInfoList.length; i++) {
+                        let dropDownData = {};
+                        dropDownData.title = splitInfoList[i].newUnit;
+                        dropDownData.id = obj.data.id;
+                        dropDownDataList.push(dropDownData);
                     }
-                });
-            } else {
-                layer.msg("请先选择盘点位置或负责人", {
-                    icon: 0,
-                    time: 500
-                })
-            }
-        };
-
-
-        // 通过物料名称获取物料
-        selectMaterialByName = function (obj) {
-            if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
-                // 如果已经选择盘点的位置
-
-                // 输入物料名称
-                var data = obj.value;
-                var parent = obj.parentNode.parentNode.parentNode.parentNode;
-                var parentId = parent.id;
-                // 物料编码父级
-                var codeChildren = parent.childNodes[7];
-                // 物料名称父级
-                var materialChildren = parent.childNodes[5];
-                // 物料类型父级
-                var typeChildren = parent.childNodes[11];
-                // 材质父级
-                var textureChildren = parent.childNodes[13];
-                // 规格型号父级
-                var versionChildren = parent.childNodes[15];
-                // 计量单位父级
-                var unitChildren = parent.childNodes[17];
-                // 库存数量父级
-                var inventoryChildren = parent.childNodes[21];
-
-                // 条形码父级
-                var barCodeChildren = parent.childNodes[9];
-                // 编码条目
-                var codeItem = codeChildren.childNodes[3].childNodes[1];
-                // 具体条码
-                var codeValue = codeItem.childNodes[1];
-
-                // 物料条目
-                var materialItem = materialChildren.childNodes[3].childNodes;
-                // 物料名称
-                var materialName = materialItem[1].childNodes[1];
-                // 物料编码
-                var materialId = materialItem[3];
-                // 物料种类条目
-                var materialTypeItem = typeChildren.childNodes[3].childNodes;
-
-                // 条形码条目
-                var barCodeItem = barCodeChildren.childNodes[3];
-
-                var req = {};
-                data = data.split(",")[0];
-                if(data !== ""){
-                    req.mname = data;
-                    req.depositoryId = depositoryId;
-                    req.placeId = placeId;
-                    $.ajax({
-                        url: "/material/findMaterialForTaking",
-                        type: "post",
-                        dataType: 'json',
-                        data: JSON.stringify(req),
-                        contentType: "application/json;charset=utf-8",
-                        success: function (d) {
-                            if (d.count > 1) {
-                                layer.msg("请点击右侧搜索确定物品");
-                                materialId.value = "";
-                                codeValue.value = "";
-                                textureChildren.childNodes[3].childNodes[1].value = "";
-                                versionChildren.childNodes[3].childNodes[1].value = "";
-                                unitChildren.childNodes[3].childNodes[1].value = "";
-                                inventoryChildren.childNodes[3].childNodes[1].value = "";
-                                return false;
-                            } else if (d.count === 0) {
-                                layer.msg("没有该物品，请确认输入是否正确");
-                                materialId.value = "";
-                                codeValue.value = "";
-                                materialName.value = "";
-                                materialTypeItem[1].value = '';
-                                materialTypeItem[3].value = "";
-                                textureChildren.childNodes[3].childNodes[1].value = "";
-                                versionChildren.childNodes[3].childNodes[1].value = "";
-                                unitChildren.childNodes[3].childNodes[1].value = "";
-                                inventoryChildren.childNodes[3].childNodes[1].value = "";
-                                return false;
-                            } else {
-                                var material = d.data;
-                                materialName.value = material.mname;
-                                materialId.value = material.id;
-                                codeValue.value = material.code;
-                                materialTypeItem[1].value = material.typeName;
-                                materialTypeItem[3].value = material.typeId;
-                                textureChildren.childNodes[3].childNodes[1].value = material.texture === null || material.texture === undefined ? '' : material.texture;
-                                versionChildren.childNodes[3].childNodes[1].value = material.version === null || material.version === undefined ? '' : material.version;
-                                inventoryChildren.childNodes[3].childNodes[1].value = material.baseUnitQuantity;
-                                var idNumber = materialId.name.split("mid")[1];
-                                // 获取物料与条形码的对应关系
-                                var materialAndBarCodeList = material["materialAndBarCodeList"];
-                                if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
-                                    var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
-                                    var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
-                                    var id = barCodeInput.id;
-                                    form.render();
-                                    $.each(materialAndBarCodeList, function (index, item) {
-                                        $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
-                                    });
-                                    form.render();
-                                }
-                                let unitItem = $("#unit" + idNumber);
-                                unitItem.empty();
-                                unitItem.append(new Option(material.baseUnit, "-1"));
-                                let splitInfoList = material.splitInfoList;
-                                if (splitInfoList.length > 0) {
-                                    $.each(splitInfoList, function (index, item) {
-                                        unitItem.append(new Option(item.newUnit, item.newUnit));
-                                    })
-                                }
-                                var shelfLife = d.shelfLife;
-                                if (shelfLife !== null && shelfLife !== undefined) {
-                                    $("#" + "producedDateItem" + idNumber).show();
-                                    var producedDateList = d['producedDateList'];
-                                    if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) {
-                                        $.each(producedDateList, function (index, item) {
-                                            $("#" + "producedDate" + idNumber).append(new Option(item, item));
-                                        })
-                                    }
-                                    form.render();
-                                } else {
-                                    $("#" + "producedDateItem" + idNumber).hide();
-                                    form.render();
-                                }
-                            }
+                    dropdown.render({
+                        elem: this //触发事件的 DOM 对象
+                        , show: true //外部事件触发即显示
+                        , data: dropDownDataList
+                        , click: function (unit) {
+                            this.elem[0].childNodes[0].data = unit.title;
+                            obj.tr[0].childNodes[5].childNodes[0].innerText = obj.data.splitInventory[unit.title];
                         }
-                    });
+                        , align: 'right' //右对齐弹出（v2.6.8 新增）
+                        , style: 'box-shadow: 1px 1px 10px rgb(0 0 0 / 12%);' //设置额外样式
+                    })
                 }
+                //下拉菜单
 
-            } else {
-                layer.msg("请先选择盘点位置或负责人", {
-                    icon: 0,
-                    time: 500
-                })
-            }
-
-        };
-
-
-        // 用于二次渲染页面
-        Coverpage = function (num, obj) {
-
-            // 获取待添加父类
-            NewIdNumber = num;
-            if (num === 0) { // 如果是第一个
-                NewIdNumber = "";
-            }
-            var texture = obj.texture === null || obj.texture === undefined ? "" : obj.texture;
-            var version = obj.version === null || obj.version === undefined ? "" : obj.version;
-            var unit = obj.unit === null || obj.unit === undefined ? "" : obj.unit;
-            var materialItem = `
-                                    <div class="layui-card-body" id=` + "InventoryDetails" + NewIdNumber + ` style="padding-right: 0px">
-                                    <hr>
-                                    <i class="layui-icon layui-icon-subtraction" style="display: inline"
-                                       onclick="deleteItem(this)"></i>
-
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">物料名称:</label>
-
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <input type="text" placeholder="请选择物料" class="layui-input" value="${obj.mname}"
-                                                       style="border-style: none"
-                                                       id="openSonByMaterial" onblur="selectMaterialByName(this)"
-                                                       lay-verify="required"/>
-                                                <i class="layui-icon layui-icon-search" style="display: inline"
-                                                   id="selectMaterial" onclick="selectMaterial(this)"></i>
-                                            </div>
-                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber + `
-                                                   value="${obj.mid}" style="display: none" lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <input id=` + "code" + NewIdNumber + ` name= ` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码"
-                                                       onblur="selectCode(this)" value="${obj.code}"
-                                                       class="layui-input" lay-verify="required"
-                                                       style="border-style: none">
-                                                <img src="/static/images/search.ico" height="16" width="16"
-                                                     style="margin-top: 10px" onclick="scanMaterialCodeForTaking(this)">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
-                                        <div class="layui-input-block" style="margin: 0px;">
-                                            <div class="inputdiv">
-                                                <select id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + `
-
-                                                       style="border-style: none">
-                                                       </select>
-                                                <img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
-                                                     style="margin-top: 10px" onclick="scanBarCodeForTaking(this)">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">物料类型：</label>
-                                        <div class="layui-input-block">
-                                            <input type="text"  placeholder="请选择物料类型"  class="layui-input" id="openSonByMateralType" readonly
-                                                  value="${obj.typeName}" lay-verify="required"/>
-                                            <input type="text" id=` + "materialTypeId" + NewIdNumber + `  name=` + "typeId" + NewIdNumber + `  value="${obj.typeId}"
-                                            placeholder="请选择物料类型"  class="layui-input"  style="display: none"  lay-verify="required"/>
-
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">材质:</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" placeholder="请填写材质名称" class="layui-input" value="${texture}"
-                                                   name=` + "texture" + NewIdNumber + `/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">规格型号:</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" placeholder="请填写规格型号" class="layui-input" value="${version}"
-                                                   name=` + "version" + NewIdNumber + `/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">计量单位:</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" placeholder="请填写计量单位" class="layui-input" value="${unit}"
-                                                   name=` + "unit" + NewIdNumber + `/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">库存数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input" readonly  value="${obj.quantity}"
-                                                   name=` + "oldInventory" + NewIdNumber + ` id=` + "oldInventory" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盘点数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input" onblur="calculate(this)"
-                                                   name=` + "newInventory" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盘点结果:</label>
-                                        <div class="layui-input-block">
-                                            <select name=` + "takingResult" + NewIdNumber + ` id=` + "result" + NewIdNumber + `>
-
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">盈亏数量:</label>
-                                        <div class="layui-input-block">
-                                            <input type="number"  class="layui-input" readonly id=` + "Inventory_number" + NewIdNumber + `
-                                                   name=` + "Inventory_number" + NewIdNumber + ` lay-verify="required"/>
-                                        </div>
-                                    </div>
-                                    <i class="layui-icon layui-icon-addition" style="display: inline"
-                                       onclick="addItem(this)"></i>
-                                </div>
-            `;
-            // 获取当前高度
-            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            if (NewIdNumber !== "") {
-                params.push(NewIdNumber)
             }
-            $("#stepForm").css("height", height + 682 + 'px');
-            var oldIdNumber = NewIdNumber - 1;
-            if (oldIdNumber === 0) {
-                oldIdNumber = "";
-            }
-            $("#InventoryDetails" + oldIdNumber).after(materialItem);
-        };
-
-        // 用于扫描物料编码
-        scanMaterialCodeForTaking = function (obj) {
-            if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
-
-                parent.wx.scanQRCode({
-                    desc: 'scanQRCode desc',
-                    needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-                    scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
-                    success: function (res) {
-                        // 回调
-                        var result = res.resultStr;//当needResult为1时返回处理结果
-                        var req = {};
-                        req.qrCode = result;
-                        req.placeId = placeId;
-                        req.depositoryId = depositoryId;
-                        req.codeFlag = 2;
-                        $.ajax({
-                            url: "/material/qywxStockTakingScanQrCode",
-                            type: "post",
-                            dataType: 'json',
-                            data: JSON.stringify(req),
-                            contentType: "application/json;charset=utf-8",
-                            success: function (d) {
-                                var data = d.data;
-                                if (data == null) {
-                                    layer.msg("对于编码：" + result + ",并未发现对应的物料", {
-                                        icon: 0,
-                                        time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
-                                    }, function () {
-                                    })
-                                } else {
-
-                                    var parent = obj.parentNode.parentNode.parentNode.parentNode;
-                                    var parentId = parent.id;
-                                    // 物料编码父级
-                                    var codeChildren = parent.childNodes[7];
-                                    // 物料名称父级
-                                    var materialChildren = parent.childNodes[5];
-
-                                    // 物料类型父级
-                                    var typeChildren = parent.childNodes[11];
-                                    // 材质父级
-                                    var textureChildren = parent.childNodes[13];
-                                    // 规格型号父级
-                                    var versionChildren = parent.childNodes[15];
-                                    // 计量单位父级
-                                    var unitChildren = parent.childNodes[17];
-                                    // 库存数量父级
-                                    var inventoryChildren = parent.childNodes[21];
-
-                                    // 条形码父级
-                                    var barCodeChildren = parent.childNodes[9];
-                                    // 编码条目
-                                    var codeItem = codeChildren.childNodes[3].childNodes[1];
-                                    // 具体条码
-                                    var codeValue = codeItem.childNodes[1];
-
-                                    // 物料条目
-                                    var materialItem = materialChildren.childNodes[3].childNodes;
-                                    // 物料名称
-                                    var materialName = materialItem[1].childNodes[1];
-                                    // 物料编码
-                                    var materialId = materialItem[3];
-                                    // 物料种类条目
-                                    var materialTypeItem = typeChildren.childNodes[3].childNodes;
-
-                                    // 条形码条目
-                                    var barCodeItem = barCodeChildren.childNodes[3];
-
-                                    materialName.value = data.mname;
-                                    materialId.value = data.id;
-
-                                    materialTypeItem[1].value = data.typeName;
-                                    materialTypeItem[3].value = data.typeId;
-                                    codeValue.value = data.code;
-                                    textureChildren.childNodes[3].childNodes[1].value = data.texture === null || data.texture === undefined ? '' : data.texture;
-                                    versionChildren.childNodes[3].childNodes[1].value = data.version === null || data.version === undefined ? '' : data.version;
-                                    unitChildren.childNodes[3].childNodes[1].value = data.unit === null || data.unit === undefined ? '' : data.unit;
-                                    inventoryChildren.childNodes[3].childNodes[1].value = data.quantity;
-                                    // 获取物料与条形码的对应关系
-                                    var materialAndBarCodeList = data["materialAndBarCodeList"];
-                                    var idNumber = materialId.name.split("mid")[1];
-                                    $("#barCode" + idNumber).empty();
-                                    if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
-                                        var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
-                                        var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
-                                        var id = barCodeInput.id;
-                                        form.render();
-                                        $.each(materialAndBarCodeList, function (index, item) {
-                                            $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
-                                        });
-                                        form.render();
-                                    }
-                                    var unitItem = $("#unit" + idNumber);
-                                    unitItem.empty();
-                                    unitItem.append(new Option(data.unit, "-1"));
-                                    let splitInfoList = data.splitInfoList;
-                                    if (splitInfoList.length > 0) {
-                                        $.each(splitInfoList, function (index, item) {
-                                            unitItem.append(new Option(item.newUnit, item.newUnit));
-                                        })
-                                    }
-                                    form.render();
-                                    var shelfLife = data.shelfLife;
-                                    if (shelfLife !== null && shelfLife !== undefined) {
-                                        $("#" + "producedDateItem" + idNumber).show();
-                                        var producedDateList = data['producedDateList'];
-                                        if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) {
-                                            $.each(producedDateList, function (index, item) {
-                                                $("#" + "producedDate" + idNumber).append(new Option(item, item));
-                                            })
-                                        }
-                                        form.render();
-                                    } else {
-                                        $("#" + "producedDateItem" + idNumber).hide();
-                                        form.render();
-                                    }
-                                }
-                            }
-                        })
-                    }
-                })
-
-            } else {
-                layer.msg("请先选择盘点位置或负责人", {
-                    icon: 0,
-                    time: 500
-                })
-            }
-        };
-        // 用于扫描条形码
-        scanBarCodeForTaking = function (obj) {
-            var id = obj.id;
-            id = id.split("barCodeImg")[1];
-            if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
-                parent.wx.scanQRCode({
-                    desc: 'scanQRCode desc',
-                    needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-                    scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
-                    success: function (res) {
-                        // 回调
-                        var result = res.resultStr;//当needResult为1时返回处理结果
-                        var req = {};
-                        req.qrCode = result;
-                        req.depositoryId = depositoryId;
-                        req.placeId = placeId;
-                        req.codeFlag = 1;
-                        $.ajax({
-                            url: "/material/qywxStockTakingScanBarCode",
-                            type: "post",
-                            dataType: 'json',
-                            data: JSON.stringify(req),
-                            contentType: "application/json;charset=utf-8",
-                            success: function (d) {
-                                var data = d.data;
-                                var material = data["material"];
-                                var barCodeListByNoMaterial = data["barCodeListByNoMaterial"];
-                                if (material !== null) {
-                                    var parent = obj.parentNode.parentNode.parentNode.parentNode;
-                                    var parentId = parent.id;
-                                    // 物料编码父级
-                                    var codeChildren = parent.childNodes[7];
-                                    // 物料名称父级
-                                    var materialChildren = parent.childNodes[5];
-                                    // 物料类型父级
-                                    var typeChildren = parent.childNodes[11];
-                                    // 材质父级
-                                    var textureChildren = parent.childNodes[13];
-                                    // 规格型号父级
-                                    var versionChildren = parent.childNodes[15];
-                                    // 计量单位父级
-                                    var unitChildren = parent.childNodes[17];
-                                    // 库存数量父级
-                                    var inventoryChildren = parent.childNodes[21];
-
-                                    // 条形码父级
-                                    var barCodeChildren = parent.childNodes[9];
-                                    // 编码条目
-                                    var codeItem = codeChildren.childNodes[3].childNodes[1];
-                                    // 具体条码
-                                    var codeValue = codeItem.childNodes[1];
-
-                                    // 物料条目
-                                    var materialItem = materialChildren.childNodes[3].childNodes;
-                                    // 物料名称
-                                    var materialName = materialItem[1].childNodes[1];
-                                    // 物料编码
-                                    var materialId = materialItem[3];
-                                    // 物料种类条目
-                                    var materialTypeItem = typeChildren.childNodes[3].childNodes;
-
-
-                                    materialName.value = material.mname;
-                                    materialId.value = material.id;
-                                    codeValue.value = material.code;
-                                    materialTypeItem[1].value = material.typeName;
-                                    materialTypeItem[3].value = material.typeId;
-                                    textureChildren.childNodes[3].childNodes[1].value = material.texture === null || material.texture === undefined ? '' : material.texture;
-                                    versionChildren.childNodes[3].childNodes[1].value = material.version === null || material.version === undefined ? '' : material.version;
-                                    inventoryChildren.childNodes[3].childNodes[1].value = material.quantity;
-                                    $("#barCode" + id).empty();
-                                    $("#barCode" + id).append(new Option(result, 0));//往下拉菜单里添加元素
-                                    var shelfLife = material.shelfLife;
-                                    if (shelfLife !== null && shelfLife !== undefined) {
-                                        $("#" + "producedDateItem" + id).show();
-                                        var producedDateList = material['producedDateList'];
-                                        if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) {
-                                            $.each(producedDateList, function (index, item) {
-                                                $("#" + "producedDate" + id).append(new Option(item, item));
-                                            })
-                                        }
-                                        form.render();
-                                    } else {
-                                        $("#" + "producedDateItem" + id).hide();
-                                        form.render();
-                                    }
-                                    form.render();
-                                    var unitItem = $("#unit" + id);
-                                    unitItem.empty();
-                                    unitItem.append(new Option(material.unit, "-1"));
-                                    let splitInfoList = material.splitInfoList;
-                                    if (splitInfoList.length > 0) {
-                                        $.each(splitInfoList, function (index, item) {
-                                            unitItem.append(new Option(item.newUnit, item.newUnit));
-                                        })
-                                    }
-                                    form.render();
-
-                                }
-                                if (barCodeListByNoMaterial.length > 0) {
-                                    // 如果扫描的条形码没有对应的物料
-                                    var content = '<div style="padding: 50px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">' +
-                                        '<p>未发现的条码，是否需要添加对应关系</p><hr>' +
-                                        '<table>';
-                                    for (let i = 0; i < barCodeListByNoMaterial.length; i++) {
-                                        var item = "<tr><td>" + barCodeListByNoMaterial[i] + "</td></tr>";
-                                        content += item;
-                                    }
-                                    content += '</table></div>';
-                                    layer.open({
-                                        type: 1
-                                        , title: false //不显示标题栏
-                                        , closeBtn: false
-                                        , area: '300px;'
-                                        , shade: 0.8
-                                        , id: 'LAY_layuipro' //设定一个id，防止重复弹出
-                                        , btn: ['添加', '取消']
-                                        , btnAlign: 'c'
-                                        , moveType: 1 //拖拽模式，0或者1
-                                        , content: content
-                                        , success: function (layero) {
-                                            var btn = layero.find('.layui-layer-btn');
-                                            btn.find('.layui-layer-btn0').click(function () {
-                                                $.each(barCodeListByNoMaterial, function (index, item) {
-                                                    $("#barCode" + id).append(new Option(item, item));//往下拉菜单里添加元素
-                                                });
-                                                barCodeList["barCode" + id] = barCodeListByNoMaterial;
-                                                needToUpdate["barCode" + id] = true;
-                                                form.render()
-                                            });
-                                        }
-                                    });
-
-                                }
-                            }
-                        })
-                    }
-                });
-            } else {
-                layer.msg("请先选择盘点位置或负责人", {
-                    icon: 0,
-                    time: 500
-                })
-            }
-        };
+        });
 
         // 用于计算盘点结果
         calculate = function (obj) {
-            var parent = obj.parentNode.parentNode.parentNode;
-
-            var oldInventoryItem = parent.childNodes[21].childNodes[3].childNodes[1];
-            var nowInventoryItem = parent.childNodes[23].childNodes[3].childNodes[1];
-            var resultItem = parent.childNodes[25].childNodes[3].childNodes[1];
-            var InventoryItem = parent.childNodes[27].childNodes[3].childNodes[1];
-
-            var oldInventory = Number(oldInventoryItem.value);
-            var nowInventory = Number(nowInventoryItem.value);
-            $('#' + resultItem.id).empty();
-            if (oldInventory > nowInventory) {
-                // 如果盘点数目小于库存数目
-                $('#' + resultItem.id).append(new Option("盘亏", 'Inventory_down'));//往下拉菜单里添加元素
-                $("#" + InventoryItem.id).val(oldInventory - nowInventory);
-            } else if (oldInventory < nowInventory) {
-                // 如果盘点数目大于库存数目
-                $('#' + resultItem.id).append(new Option("盘盈", 'Inventory_up'));//往下拉菜单里添加元素
-                $("#" + InventoryItem.id).val(nowInventory - oldInventory);
+            let oldInventory = Number(obj.tr[0].childNodes[5].childNodes[0].innerText);
+            let nowInventory = Number(obj.value);
+            let number = 0;
+            let takingResult = '';
+            let takingResultString = '';
+            let req = {};
+            if ((oldInventory) > (nowInventory)) {
+                number = oldInventory - nowInventory;
+                takingResult = "Inventory_down";
+                takingResultString = "盘亏";
+            } else if ((oldInventory) < (nowInventory)) {
+                number = nowInventory - oldInventory;
+                takingResult = "Inventory_up";
+                takingResultString = "盘盈";
             } else {
-                // 如果盘点数目等于库存数目
-                $('#' + resultItem.id).append(new Option("正常", 'Inventory_normal'));//往下拉菜单里添加元素
-                $("#" + InventoryItem.id).val(nowInventory - oldInventory);
+                takingResult = "Inventory_normal";
+                takingResultString = "正常";
             }
-            form.render();
+            obj.tr[0].childNodes[7].childNodes[0].innerText = takingResultString;
+            obj.tr[0].childNodes[8].childNodes[0].innerText = number;
+            obj.update({takingResult: takingResult});
+            obj.update({takingInventory: number});
+            req.number = number + "";
+            req.takingResult = takingResult;
+            req.takingResultString = takingResultString;
+            req.id = obj.data.id + "";
+            req.unit = obj.tr[0].childNodes[4].childNodes[0].innerText;
+            req.oldInventory = oldInventory+"";
+            $.ajax({
+                url: "/stockTaking/temporaryStorageForTakingResult",
+                dataType: "json",
+                data: JSON.stringify(req),
+                type: "POST",
+                contentType: "application/json;charset=utf-8"
+            });
         };
 
 
@@ -1423,8 +567,7 @@
                         $("#" + "oldInventory" + idNumber).val(d.data)
                     }
                 });
-            }
-            else if (id.includes("unit")) {
+            } else if (id.includes("unit")) {
                 let idNumber = id.split("unit")[1]; // 得到当前id对应数字
                 req.mid = $("#" + "mid" + idNumber).val();
                 req.unit = data.value;
diff --git a/target/classes/templates/pages/stockTaking/stockTakingReview.html b/target/classes/templates/pages/stockTaking/stockTakingReview.html
index d811269b..ef7ec4ff 100644
--- a/target/classes/templates/pages/stockTaking/stockTakingReview.html
+++ b/target/classes/templates/pages/stockTaking/stockTakingReview.html
@@ -45,7 +45,7 @@
                         <div class="layui-fluid">
                             <div class="layui-card">
                                 <form class="layui-form"
-                                      style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px"
+                                      style="margin: 0 auto;max-width: 700px;"
                                       lay-filter="form1" id="form1">
                                     <div class="layui-card-body" id="takingHeader" style="padding-right: 0px">
                                         <div class="layui-form-item">
@@ -219,37 +219,38 @@
                                         </div>
                                     </fieldset>
 
-                                    <div id="review">
-                                        <div class="layui-form"
-                                             style="margin: 0 auto;max-width: 900px;padding-top: 40px;">
 
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">审核备注:</label>
-                                                <div class="layui-input-block">
-                                                    <input id="auditOpinion" name="auditOpinion"
-                                                              placeholder="请填写相关原因及申请原因" value=""
-                                                              class="layui-input"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-row layui-col-space15">
-                                                <div class="layui-input-block">
-                                                    <div class="layui-col-xs12 layui-col-md3" style="padding: 7.5px">
-                                                        <button type="button" class="layui-btn" onclick="review(1)">
-                                                            &emsp;同意&emsp;
-                                                        </button>
-                                                    </div>
-                                                    <div class="layui-col-xs12 layui-col-md3" style="padding: 7.5px">
-                                                        <button type="button" class="layui-btn layui-btn-danger"
-                                                                onclick="review(2)">
-                                                            &emsp;驳回&emsp;
-                                                        </button>
-                                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                        <div id="review">
+                            <div class="layui-form"
+                                 style="margin: 0 auto;max-width: 900px;padding-top: 40px;">
 
-                                                </div>
-                                            </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">审核备注:</label>
+                                    <div class="layui-input-block">
+                                        <input id="auditOpinion" name="auditOpinion"
+                                               placeholder="请填写相关原因及申请原因" value=""
+                                               class="layui-input"/>
+                                    </div>
+                                </div>
+                                <div class="layui-row layui-col-space15">
+                                    <div class="layui-input-block">
+                                        <div class="layui-col-xs12 layui-col-md3" style="padding: 7.5px">
+                                            <button type="button" class="layui-btn" onclick="review(1)">
+                                                &emsp;同意&emsp;
+                                            </button>
                                         </div>
+                                        <div class="layui-col-xs12 layui-col-md3" style="padding: 7.5px">
+                                            <button type="button" class="layui-btn layui-btn-danger"
+                                                    onclick="review(2)">
+                                                &emsp;驳回&emsp;
+                                            </button>
+                                        </div>
+
                                     </div>
-                                </form>
+                                </div>
                             </div>
                         </div>
                     </fieldset>