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 fd70ebf2..832ea345 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
@@ -556,6 +556,7 @@ public class MaterialController {
                 if(inventory.size() > 0){
                     // 如果存在该物料
                     MaterialP materialP = inventory.get(0);
+                    materialByBarCode.setMid(materialP.getId());
                     List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(materialP.getId(), depositoryByAdminorg.get(j).getId());
                     placePList.addAll(placeByMidAndDid);
                     isExist = true;
@@ -642,4 +643,37 @@ public class MaterialController {
         return new RestResponse(null);
     }
 
+    // 用于查看当前物料下的条形码
+    @GetMapping("/findMaterialBarCode")
+    public RestResponse findMaterialBarCode(@RequestParam Map<String,Object> map,HttpServletRequest request){
+        Integer mid = ObjectFormatUtil.toInteger(map.get("mid"));
+        Material materialById = materialService.findMaterialById(mid);
+        map.put("mcode",materialById.getCode());
+        List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(map);
+        Integer codeCountByCondition = materialService.findMaterialByBarCodeCountByCondition(map);
+        return new RestResponse(materialByBarCodeByCondition,codeCountByCondition , 200);
+    }
+    // 用于添加条形码与物料编码的对应关系
+    @PostMapping("/addBarCodeByMaterial")
+    public RestResponse addBarCodeByMaterial(@RequestBody Map<String,Object> map,HttpServletRequest request){
+        return CrudUtil.postHandle(materialService.addBarCodeByMaterial(map), 1);
+    }
+
+    @PostMapping("/delBarCodeByMaterial")
+    public RestResponse delBarCodeByMaterial(@RequestBody Map<String,Object> map,HttpServletRequest request){
+        Integer res = 0;
+        if(map.containsKey("ids")){
+            List ids = (List) map.get("ids");
+            for (int i = 0; i < ids.size(); i++) {
+                map.put("id",ids.get(i));
+                res += materialService.delBarCodeByMaterial(map);
+            }
+            return  CrudUtil.deleteHandle(res, ids.size());
+        }else if(map.containsKey("id")){
+            res += materialService.delBarCodeByMaterial(map);
+            return   CrudUtil.deleteHandle(res,1);
+        }else{
+            throw new MyException("所需请求参数缺失！");
+        }
+    }
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
index 93625630..01d0b7bd 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -1758,4 +1758,12 @@ public class PageController {
         return mv;
     }
 
+    // 当前物料所关联的条形码
+    @GetMapping("/checkBarCode")
+    public ModelAndView checkBarCode(Integer mid){
+        ModelAndView mv = new ModelAndView();
+        mv.setViewName("/pages/materialBarCode/materialBarCode_out");
+        mv.addObject("mid",mid);
+        return mv;
+    }
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
index f2614b62..d26c6de9 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
@@ -174,6 +174,12 @@ public interface MaterialMapper {
      */
     List<MaterialAndBarCode> findMaterialByBarCodeByCondition(Map<String,Object> map);
 
+    /**
+     * 通过条件获取条形码与物料的对应关系数量
+     * @param map
+     * @return
+     */
+    Integer findMaterialByBarCodeCountByCondition(Map<String,Object> map);
 
     /**
      * 添加条形码与物料编码的映射,单条数据
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
index 7440e218..48a8b558 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
@@ -279,6 +279,18 @@
         group by bmcode
     </select>
 
+    <select id="findMaterialByBarCodeCountByCondition" resultType="int" parameterType="map">
+        select count(*)
+        from barcodeandmaterial
+        where 1 = 1
+        <if test="barCode != null and barCode != ''">
+            and barCode = #{barCode}
+        </if>
+        <if test="mcode != null and mcode != ''">
+            and mcode = #{mcode}
+        </if>
+    </select>
+
     <!--    根据仓库查询物料-->
     <select id="findMaterialByDepository" resultMap="materialMap" parameterType="map">
         SELECT
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 66475247..fc88dab1 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java
@@ -196,10 +196,33 @@ public interface MaterialService {
      */
     List<MaterialAndBarCode> findMaterialByBarCodeByCondition(Map<String,Object> map);
 
+    /**
+     * 通过条件获取条形码与物料的对应关系数量
+     * @param map
+     * @return
+     */
+    Integer findMaterialByBarCodeCountByCondition(Map<String,Object> map);
+
     /**
      * 通过条形码与仓库编码获取对应关系
      * @param map
      * @return
      */
     MaterialAndBarCode findMaterialByBarCodeByBarCodeAndDepositoryId(Map<String,Object> map);
+
+
+    /**
+     * 用于添加条形码与物料编码的对应关系
+     * @param map
+     * @return
+     */
+    Integer addBarCodeByMaterial(Map<String,Object> map);
+
+
+    /**
+     * 用于删除条形码与物料的对应关系
+     * @param map
+     * @return
+     */
+    Integer delBarCodeByMaterial(Map<String,Object> map);
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index 1e38e4e2..4020516f 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -432,6 +432,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
      * @param userByPort
      * @return
      */
+    @Transactional
     @Override
     public RestResponse completeApplicationOutMinRecord(Map<String, Object> param, UserByPort userByPort) {
         // 最终返回值
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 4a7bbfa7..d85e2271 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
@@ -112,20 +112,6 @@ public class MaterialServiceImpl implements MaterialService {
             map.put("typeId", map.get("materialTypeId"));
             map.remove("materialTypeId");
         }
-        String barCode = (String) map.get("barCode");
-        if(!"0".equals(barCode)) {
-            Map<String, Object> delParam = new HashMap<>();
-            delParam.put("id", barCode);
-            materialMapper.deleteBarCodeAndMaterial(delParam);
-        }
-        if(map.containsKey("barCodeList")){
-            // 如果需要新增与条形码的映射
-            List barCodeList = (ArrayList) map.get("barCodeList");
-            Map<String,Object> param = new HashMap<>();
-            param.put("list",barCodeList);
-            param.put("code",map.get("code"));
-            materialMapper.addBarCodeAndMaterialForMoreOne(param);
-        }
         return materialMapper.updateMaterial(map);
     }
 
@@ -543,6 +529,17 @@ public class MaterialServiceImpl implements MaterialService {
         return materialMapper.findMaterialByBarCodeByCondition(map);
     }
 
+    /**
+     * 通过条件获取条形码与物料的对应关系数量
+     * @param map
+     * @return
+     */
+    @Override
+    public Integer findMaterialByBarCodeCountByCondition(Map<String, Object> map) {
+        return materialMapper.findMaterialByBarCodeCountByCondition(map);
+
+    }
+
     /**
      * 通过条形码与仓库编码获取对应关系
      * @param map
@@ -559,6 +556,32 @@ public class MaterialServiceImpl implements MaterialService {
         return null;
     }
 
+    /**
+     * 用于添加条形码与物料编码的对应关系
+     * @param map
+     * @return
+     */
+    @Override
+    public Integer addBarCodeByMaterial(Map<String, Object> map) {
+        Integer mid = ObjectFormatUtil.toInteger(map.get("mid"));
+        Material materialById = materialMapper.findMaterialById(mid);
+        List barCodeList = (ArrayList) map.get("barCodeList");
+        Map<String,Object> param = new HashMap<>();
+        param.put("list",barCodeList);
+        param.put("code",materialById.getCode());
+        return materialMapper.addBarCodeAndMaterialForMoreOne(param);
+    }
+
+    /**
+     * 用于删除条形码与物料的对应关系
+     * @param map
+     * @return
+     */
+    @Override
+    public Integer delBarCodeByMaterial(Map<String, Object> map) {
+        return materialMapper.deleteBarCodeAndMaterial(map);
+    }
+
     /**
      * 构造树形选择框
      * @return
diff --git a/src/main/resources/templates/pages/application/application-transfer.html b/src/main/resources/templates/pages/application/application-transfer.html
index 282c937a..f9d49e0d 100644
--- a/src/main/resources/templates/pages/application/application-transfer.html
+++ b/src/main/resources/templates/pages/application/application-transfer.html
@@ -433,7 +433,7 @@
                                                                    id="openSonByMaterial" lay-verify="required" value="${obj.mname}" onblur="selectMaterialByName(this)"/>
                                                  <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" value="${obj.id}"
+                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id="mid" value="${obj.mid}"
                                                                style="display: none" lay-verify="required" />
                                         </div>
                                     </div>
@@ -460,7 +460,7 @@
                                  <div class="layui-form-item">
                                         <label class="layui-form-label">所处库位:</label>
                                         <div class="layui-input-block">
-                                            <select name=`+"placeId"+NewIdNumber +` id=`+"place"+NewIdNumber +`></select>
+                                            <select name=`+"fromPlaceId"+NewIdNumber +` id=`+"place"+NewIdNumber +`></select>
                                         </div>
                                     </div>
                                  <div class="layui-form-item">
@@ -736,9 +736,6 @@
                             if(code === undefined){
                                 code = "";
                             }
-                            console.log(d)
-                            console.log(codeItem)
-                            console.log(codeValue)
                             codeValue.value = code;
                             $('#place').empty();
                             $.each(placeList, function (index, item) {
diff --git a/src/main/resources/templates/pages/material/material-out.html b/src/main/resources/templates/pages/material/material-out.html
index 6d9e5f76..bface218 100644
--- a/src/main/resources/templates/pages/material/material-out.html
+++ b/src/main/resources/templates/pages/material/material-out.html
@@ -495,7 +495,7 @@
       if(obj.elem.checked){
         req["state"] = 1
       }
-      req["id"] = this.value
+      req["id"] = this.value;
       $.ajax({
         url: "/material/material_edit",
         type: 'post',
diff --git a/src/main/resources/templates/pages/material/material-view.html b/src/main/resources/templates/pages/material/material-view.html
index a06acdc7..6e041d31 100644
--- a/src/main/resources/templates/pages/material/material-view.html
+++ b/src/main/resources/templates/pages/material/material-view.html
@@ -38,7 +38,7 @@
     <div class="layui-form-item" style="display: none">
         <label class="layui-form-label">物料编号</label>
         <div class="layui-input-block">
-            <input type="text" th:value="${record.getId()}" name="id" required lay-verify="required" autocomplete="off"
+            <input id="mid" type="text" th:value="${record.getId()}" name="id" required lay-verify="required" autocomplete="off"
                    class="layui-input" readonly="readonly">
         </div>
     </div>
@@ -59,7 +59,7 @@
     <div class="layui-form-item">
         <label class="layui-form-label">规格型号</label>
         <div class="layui-input-inline">
-            <input type="text" th:value="${record.getVersion()}" name="version" required autocomplete="off"
+            <input type="text" th:value="${record.getVersion()}" name="version"  autocomplete="off"
                    class="layui-input">
         </div>
     </div>
@@ -77,7 +77,7 @@
     <div class="layui-form-item">
         <label class="layui-form-label">材质</label>
         <div class="layui-input-inline">
-            <input type="text" th:value="${record.getTexture()}" name="texture" required autocomplete="off"
+            <input type="text" th:value="${record.getTexture()}" name="texture"  autocomplete="off"
                    class="layui-input">
 
         </div>
@@ -98,16 +98,8 @@
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label">条形码</label>
-        <div class="layui-input-inline">
-            <div class="inputdiv">
-                <select name="barCode" id="barCode">
-                    <OPTION VALUE="0">请选择要删除的条形码</OPTION>
-                    <option th:each="barCode,iterStar:${barCodeList}" th:value="${barCode?.getId()}"
-                            th:text="${barCode?.getBmcode()}"></option>
-                </select>
-                <img src="/static/images/search.ico" height="16" width="16" style="margin-top: 10px"
-                     onclick="scanBarCode(this)">
-            </div>
+        <div class="layui-input-block">
+            <input class="layui-btn layui-btn-warm" type="button" onclick="checkBarCode()" value="查看">
         </div>
     </div>
     <div class="layui-form-item" style="display: none">
@@ -179,33 +171,22 @@
             });
             return false;
         });
-        scanBarCode = function () {
+
+
+        checkBarCode = function () {
+            var mid = $("#mid").val();
             layer.open({
                 type: 2,
-                title: '扫码',
+                title: '详情',
                 skin: 'layui-layer-rim',
                 maxmin: true,
                 shadeClose: true, //点击遮罩关闭层
                 area: ['100%', '100%'],
                 move: '.layui-layer-title',
                 fixed: false,
-                content: '/scanBarCodeByNew',
-                end: function () {
-                    var barCodeList = $("#barCodeList").val();
-                    // 根据&符合分割字符串并删除空
-                    var strings = barCodeList.split(",");
-                    strings = strings.filter(item => item && item.trim());
-                    barCode = strings;
-                    // 用于将扫描结果输出
-                    $.each(strings, function (index, item) {
-                        $("#barCode").append(new Option(item, index));//往下拉菜单里添加元素
-                    });
-                    flag = true;
-                    form.render();
-                }
+                content: '/checkBarCode?mid='+mid,
             })
-        };
-
+        }
 
     });
 </script>
diff --git a/src/main/resources/templates/pages/materialBarCode/materialBarCode_out.html b/src/main/resources/templates/pages/materialBarCode/materialBarCode_out.html
new file mode 100644
index 00000000..813873d0
--- /dev/null
+++ b/src/main/resources/templates/pages/materialBarCode/materialBarCode_out.html
@@ -0,0 +1,282 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <title>layui</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
+    <link rel="stylesheet" href="/static/css/public.css" media="all">
+</head>
+<body>
+<div class="layuimini-container">
+    <div class="layuimini-main">
+
+        <!--    状态展示-->
+        <input th:value="${mid}" style="display: none" id="mid">
+        <input  style="display: none" id="barCodeList">
+        <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"> 添加</button>
+                <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"> 删除</button>
+            </div>
+        </script>
+
+        <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
+
+        <script type="text/html" id="currentTableBar">
+            <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+        </script>
+    </div>
+</div>
+<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
+<script>
+
+    var barCode = [];
+    function notice(){
+
+    };
+    function addBarCodeByMid(){
+
+    };
+
+    layui.use(['form', 'table','upload'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            upload = layui.upload;
+
+        var mid = $("#mid").val();
+        table.render({
+            elem: "#currentTableId",
+            url: '/material/findMaterialBarCode',
+            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
+            },
+            where: {
+                mid:mid
+            },
+            response: {
+                statusName: 'status' //规定数据状态的字段名称，默认：code
+                ,statusCode: 200 //规定成功的状态码，默认：0
+                ,msgName: 'message' //规定状态信息的字段名称，默认：msg
+                ,countName: 'count' //规定数据总数的字段名称，默认：count
+                ,dataName: 'data' //规定数据列表的字段名称，默认：data
+            },
+            toolbar: '#toolbarDemo',
+            defaultToolbar: ['filter', 'exports', 'print'],
+            cols: [ [
+                {type: "checkbox", width: 50},
+                {field: 'id',width:50,title:'id'},
+                {field: 'mcode',width: 150,title: '存货编码',sort: true},
+                {field: 'bmcode',width: 150,title: '条形码',sort: true},
+                {field: 'mname', width: 120, title: '物料名称', sort: false},
+                {field: 'version',width: 200,title: '规格型号',sort: false},
+                {field: 'texture',width: 100,title: '材质'},
+                {field: 'unit',width: 150,title: '计量单位'},
+                {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"}
+            ]],
+            limits: [10, 15, 20, 25, 50],
+            limit: 10,
+            page: true,
+            skin: 'line',
+            done:function () {
+                $("[data-field='id']").css('display','none');
+
+            }
+        });
+
+
+        //监听表格复选框选择
+        table.on('checkbox(currentTableFilter)', function (obj) {
+            console.log(obj)
+        });
+
+        // 用于添加关联
+        addBarCodeByMid = function(){
+            var mid = $("#mid").val();
+            var req = {};
+            req.mid = mid;
+            req.barCodeList = barCode ;
+            $.ajax({
+                url:"/material/addBarCodeByMaterial",
+                type:"post",
+                data:JSON.stringify(req),
+                dataType:"json",
+                contentType: "application/json;charset=utf-8",
+                success:function (d) {
+                    table.reload('currentTableId', {
+                        url: '/material/findMaterialBarCode',
+                        page: {
+                            curr: 1
+                        },
+                        where:{"mid":mid}
+                    });
+                }
+            })
+        };
+
+
+        notice = function(obj){
+            //用于弹出扫码的结果
+            var context = "<div style='padding: 50px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;'><ul>";
+            for (let i = 0; i < obj.length; i++) {
+                context += "<li>"+obj[i]+"</li>";
+            }
+            context += "</ul></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: context
+                ,success: function(layero){
+                    var btn = layero.find('.layui-layer-btn');
+                    btn.find('.layui-layer-btn0').attr({
+                       onclick:"addBarCodeByMid()"
+                    });
+                }
+            });
+        };
+
+
+
+        /**
+         * toolbar监听事件
+         */
+        table.on('toolbar(currentTableFilter)', function (obj) {
+            if (obj.event === 'add') {  // 监听添加操作
+                layer.open({
+                    type: 2,
+                    title: '扫码',
+                    skin: 'layui-layer-rim',
+                    maxmin: true,
+                    shadeClose: true, //点击遮罩关闭层
+                    area: ['100%', '100%'],
+                    move: '.layui-layer-title',
+                    fixed: false,
+                    content: '/scanBarCodeByNew',
+                    end: function () {
+                        var barCodeList = $("#barCodeList").val();
+                        // 根据&符合分割字符串并删除空
+                        var strings = barCodeList.split(",");
+                        strings = strings.filter(item => item && item.trim());
+                        barCode = strings;
+                        notice(strings);
+                        table.reload('currentTableId', {
+                            url: '/material/findMaterialBarCode',
+                            page: {
+                                curr: 1
+                            },
+                            where:{"mid":mid}
+                        });
+                    }
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+            else if(obj.event === 'delete'){
+                var checkStatus = table.checkStatus('currentTableId')
+                    , data = checkStatus.data;
+                var req={};
+                req.ids=[];
+                for (i=0,len=data.length;i<len;i++){
+                    req.ids[i]=data[i].id;
+                }
+                if(req.ids.length > 0){
+                    layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) {
+                        $.ajax({
+                            url: '/material/delBarCodeByMaterial',
+                            dataType: 'json',
+                            type: 'POST',
+                            contentType: "application/json;charset=utf-8",
+                            data: JSON.stringify(req),
+                            beforeSend: function () {
+                                this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+                            },
+                            success:function(data){
+                                layer.close(this.layerIndex);
+                                if(data.status >= 300){
+                                    layer.msg(data.statusInfo.message);//失败的表情
+                                    return;
+                                }else{
+                                    layer.msg("删除成功", {
+                                        icon: 6,//成功的表情
+                                        time: 500 //1秒关闭（如果不配置，默认是3秒）
+                                    });
+                                    //执行搜索重载
+                                    table.reload('currentTableId', {
+                                        url: '/material/findMaterialBarCode',
+                                        page: {
+                                            curr: 1
+                                        },
+                                        where:{"mid":mid}
+                                    });
+                                    return false;
+                                }
+                            }
+                        })
+                    })
+                }else{
+                    layer.msg("未选中记录，请确认！");
+                    return false;
+                }
+            }
+        })
+
+        table.on('tool(currentTableFilter)', function (obj) {
+            let data = obj.data;
+
+            if (obj.event === 'delete') {
+                var req={};
+                req.id=data.id;
+                layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) {
+                    $.ajax({
+                        url: '/material/delBarCodeByMaterial',
+                        dataType:'json',
+                        type:'POST',
+                        contentType: "application/json;charset=utf-8",
+                        data:JSON.stringify(req),
+                        beforeSend:function () {
+                            this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
+                        },
+                        success:function(data){
+                            layer.close(this.layerIndex);
+                            if(data.status >= 300){
+                                layer.msg(data.statusInfo.message);//失败的表情
+                                return;
+                            }else{
+                                obj.del();
+                                layer.msg("删除成功", {
+                                    icon: 6,//成功的表情
+                                    time: 500 //1秒关闭（如果不配置，默认是3秒）
+                                });
+                            }
+                        }
+                    })
+                });
+            }
+
+        });
+
+    });
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
index 7440e218..48a8b558 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
@@ -279,6 +279,18 @@
         group by bmcode
     </select>
 
+    <select id="findMaterialByBarCodeCountByCondition" resultType="int" parameterType="map">
+        select count(*)
+        from barcodeandmaterial
+        where 1 = 1
+        <if test="barCode != null and barCode != ''">
+            and barCode = #{barCode}
+        </if>
+        <if test="mcode != null and mcode != ''">
+            and mcode = #{mcode}
+        </if>
+    </select>
+
     <!--    根据仓库查询物料-->
     <select id="findMaterialByDepository" resultMap="materialMap" parameterType="map">
         SELECT
diff --git a/target/classes/templates/pages/application/application-transfer.html b/target/classes/templates/pages/application/application-transfer.html
index 282c937a..f9d49e0d 100644
--- a/target/classes/templates/pages/application/application-transfer.html
+++ b/target/classes/templates/pages/application/application-transfer.html
@@ -433,7 +433,7 @@
                                                                    id="openSonByMaterial" lay-verify="required" value="${obj.mname}" onblur="selectMaterialByName(this)"/>
                                                  <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" value="${obj.id}"
+                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id="mid" value="${obj.mid}"
                                                                style="display: none" lay-verify="required" />
                                         </div>
                                     </div>
@@ -460,7 +460,7 @@
                                  <div class="layui-form-item">
                                         <label class="layui-form-label">所处库位:</label>
                                         <div class="layui-input-block">
-                                            <select name=`+"placeId"+NewIdNumber +` id=`+"place"+NewIdNumber +`></select>
+                                            <select name=`+"fromPlaceId"+NewIdNumber +` id=`+"place"+NewIdNumber +`></select>
                                         </div>
                                     </div>
                                  <div class="layui-form-item">
@@ -736,9 +736,6 @@
                             if(code === undefined){
                                 code = "";
                             }
-                            console.log(d)
-                            console.log(codeItem)
-                            console.log(codeValue)
                             codeValue.value = code;
                             $('#place').empty();
                             $.each(placeList, function (index, item) {
diff --git a/target/classes/templates/pages/material/material-out.html b/target/classes/templates/pages/material/material-out.html
index 6d9e5f76..bface218 100644
--- a/target/classes/templates/pages/material/material-out.html
+++ b/target/classes/templates/pages/material/material-out.html
@@ -495,7 +495,7 @@
       if(obj.elem.checked){
         req["state"] = 1
       }
-      req["id"] = this.value
+      req["id"] = this.value;
       $.ajax({
         url: "/material/material_edit",
         type: 'post',
diff --git a/target/classes/templates/pages/material/material-view.html b/target/classes/templates/pages/material/material-view.html
index a06acdc7..6e041d31 100644
--- a/target/classes/templates/pages/material/material-view.html
+++ b/target/classes/templates/pages/material/material-view.html
@@ -38,7 +38,7 @@
     <div class="layui-form-item" style="display: none">
         <label class="layui-form-label">物料编号</label>
         <div class="layui-input-block">
-            <input type="text" th:value="${record.getId()}" name="id" required lay-verify="required" autocomplete="off"
+            <input id="mid" type="text" th:value="${record.getId()}" name="id" required lay-verify="required" autocomplete="off"
                    class="layui-input" readonly="readonly">
         </div>
     </div>
@@ -59,7 +59,7 @@
     <div class="layui-form-item">
         <label class="layui-form-label">规格型号</label>
         <div class="layui-input-inline">
-            <input type="text" th:value="${record.getVersion()}" name="version" required autocomplete="off"
+            <input type="text" th:value="${record.getVersion()}" name="version"  autocomplete="off"
                    class="layui-input">
         </div>
     </div>
@@ -77,7 +77,7 @@
     <div class="layui-form-item">
         <label class="layui-form-label">材质</label>
         <div class="layui-input-inline">
-            <input type="text" th:value="${record.getTexture()}" name="texture" required autocomplete="off"
+            <input type="text" th:value="${record.getTexture()}" name="texture"  autocomplete="off"
                    class="layui-input">
 
         </div>
@@ -98,16 +98,8 @@
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label">条形码</label>
-        <div class="layui-input-inline">
-            <div class="inputdiv">
-                <select name="barCode" id="barCode">
-                    <OPTION VALUE="0">请选择要删除的条形码</OPTION>
-                    <option th:each="barCode,iterStar:${barCodeList}" th:value="${barCode?.getId()}"
-                            th:text="${barCode?.getBmcode()}"></option>
-                </select>
-                <img src="/static/images/search.ico" height="16" width="16" style="margin-top: 10px"
-                     onclick="scanBarCode(this)">
-            </div>
+        <div class="layui-input-block">
+            <input class="layui-btn layui-btn-warm" type="button" onclick="checkBarCode()" value="查看">
         </div>
     </div>
     <div class="layui-form-item" style="display: none">
@@ -179,33 +171,22 @@
             });
             return false;
         });
-        scanBarCode = function () {
+
+
+        checkBarCode = function () {
+            var mid = $("#mid").val();
             layer.open({
                 type: 2,
-                title: '扫码',
+                title: '详情',
                 skin: 'layui-layer-rim',
                 maxmin: true,
                 shadeClose: true, //点击遮罩关闭层
                 area: ['100%', '100%'],
                 move: '.layui-layer-title',
                 fixed: false,
-                content: '/scanBarCodeByNew',
-                end: function () {
-                    var barCodeList = $("#barCodeList").val();
-                    // 根据&符合分割字符串并删除空
-                    var strings = barCodeList.split(",");
-                    strings = strings.filter(item => item && item.trim());
-                    barCode = strings;
-                    // 用于将扫描结果输出
-                    $.each(strings, function (index, item) {
-                        $("#barCode").append(new Option(item, index));//往下拉菜单里添加元素
-                    });
-                    flag = true;
-                    form.render();
-                }
+                content: '/checkBarCode?mid='+mid,
             })
-        };
-
+        }
 
     });
 </script>