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 66870bfa..b0430115 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
@@ -254,7 +254,7 @@ public class MaterialController {
         }*/
         if (!"".equals(mname)) {
             // 如果是出入库
-            list = materialService.InitTreeForSelectName(mname.split(",")[0], type,map);
+            list = materialService.InitTreeForSelectName(mname.split(",")[0], type, map);
         } else {
             list = materialService.InitTreeMenus_Test();
         }
@@ -262,7 +262,6 @@ public class MaterialController {
     }
 
 
-
     /**
      * 根据id获取物料
      *
@@ -295,7 +294,7 @@ public class MaterialController {
         List<InventoryP> inventory = materialService.findInventory(param);
         Map<String, Object> paramByBarcode = new HashMap<>();
         paramByBarcode.put("mcode", mcode);
-        paramByBarcode.put("codeFlag",1);
+        paramByBarcode.put("codeFlag", 1);
         List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode);
         if (inventory.size() > 0) {
             InventoryP materialP = inventory.get(0);
@@ -323,8 +322,8 @@ public class MaterialController {
      */
     @GetMapping("/findInventoryByIdAndPid")
     public RestResponse findInventoryByIdAndPid(@RequestParam(value = "mid", required = false) String mid,
-                                              @RequestParam(value = "pid", required = false) String pid,
-                                              HttpServletRequest request) {
+                                                @RequestParam(value = "pid", required = false) String pid,
+                                                HttpServletRequest request) {
         UserByPort userToken = (UserByPort) request.getAttribute("userToken");
         if ("".equals(mid)) {
             return new RestResponse("", 0, 200);
@@ -341,7 +340,7 @@ public class MaterialController {
         param.put("code", inventory.getCode());
         Map<String, Object> paramByBarcode = new HashMap<>();
         paramByBarcode.put("mcode", inventory.getCode());
-        paramByBarcode.put("codeFlag",1);
+        paramByBarcode.put("codeFlag", 1);
         List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode);
         inventory.setMaterialAndBarCodeList(materialByBarCodeByCondition);
         MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toInteger(pid), inventory.getId());
@@ -414,7 +413,7 @@ public class MaterialController {
             }
             paramByPrice.put("mcode", ip.getCode());
             // 获取条形码与物料对应关系
-            paramByPrice.put("codeFlag",1);
+            paramByPrice.put("codeFlag", 1);
             List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByPrice);
             ip.setMaterialAndBarCodeList(materialByBarCodeByCondition);
             List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(ip.getMid());
@@ -430,7 +429,7 @@ public class MaterialController {
                 paramByPrice.put("mcode", mp.getCode());
                 paramByPrice.remove("code");
                 // 获取条形码与物料对应关系
-                paramByPrice.put("codeFlag",1);
+                paramByPrice.put("codeFlag", 1);
                 List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByPrice);
                 mp.setMaterialAndBarCodeList(materialByBarCodeByCondition);
             }
@@ -470,7 +469,7 @@ public class MaterialController {
             List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryP.getMid());
             inventoryP.setSplitInfoList(splitInfoByMid);
             paramByBarcode.put("mcode", inventoryP.getCode());
-            paramByBarcode.put("codeFlag",1);
+            paramByBarcode.put("codeFlag", 1);
             List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode);
             inventoryP.setMaterialAndBarCodeList(materialByBarCodeByCondition);
             List<PlaceP> placeList = new ArrayList<>();
@@ -651,7 +650,7 @@ public class MaterialController {
 
                                 if (placeAndMaterialByMidAndPid != null) {
                                     SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), splitInfo.getId());
-                                    if(splitInventory != null) {
+                                    if (splitInventory != null) {
                                         saveQuantity += (splitInventory.getSaveQuantity() - splitInventory.getOutQuantity());
 
                                         SplitInfo parentSplitInfo = splitUnitService.findSplitInfoById(splitInfo.getParentId());
@@ -744,7 +743,7 @@ public class MaterialController {
             param.put("mcode", material.getString("code"));
             MaterialP mp = new MaterialP(materialService.findMaterialById(material.getInteger("mid")));
             // 获取物料与条形码的对应关系
-            param.put("codeFlag",1);
+            param.put("codeFlag", 1);
             List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
             for (int j = 0; j < depositoryByAdminorg.size(); j++) {
                 Depository depository = depositoryByAdminorg.get(j);
@@ -772,16 +771,16 @@ public class MaterialController {
         List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
         // 获取当前扫描的码值
         String qrCode = (String) map.get("qrCode");
-        int codeFlag =  ObjectFormatUtil.toInteger(map.get("codeFlag"));
+        int codeFlag = ObjectFormatUtil.toInteger(map.get("codeFlag"));
         // 根据扫描的二维码获取对应的物料编码
         String mcode = materialService.findMaterialCodeByQrCode(qrCode);
         // 根据物料编码获取物料
         Material material = materialService.findMaterialByCode(mcode);
-        if(material != null) {
+        if (material != null) {
             Map<String, Object> param = new HashMap<>();
             List<PlaceP> placePList = new ArrayList<>();
             param.put("mcode", mcode);
-            param.put("codeFlag",1);
+            param.put("codeFlag", 1);
             InventoryP ip = null;
             // 获取物料与条形码的对应关系
             List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
@@ -812,8 +811,7 @@ public class MaterialController {
                 mp.setSplitInfoList(splitInfoByMid);
                 return new RestResponse(mp);
             }
-        }
-        else{
+        } else {
             return new RestResponse(null);
         }
 
@@ -835,7 +833,7 @@ public class MaterialController {
         Map<String, Object> param = new HashMap<>();
         List<PlaceP> placePList = new ArrayList<>();
         param.put("mcode", mcode);
-        param.put("codeFlag",1);
+        param.put("codeFlag", 1);
         InventoryP mp = null;
         // 获取物料与条形码的对应关系
         List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
@@ -882,7 +880,7 @@ public class MaterialController {
         Map<String, Object> param = new HashMap<>();
         List<PlaceP> placePList = new ArrayList<>();
         param.put("mcode", mcode);
-        param.put("codeFlag",1);
+        param.put("codeFlag", 1);
         InventoryP mp = null;
         // 获取物料与条形码的对应关系
         List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
@@ -934,7 +932,7 @@ public class MaterialController {
             param.put("mcode", material.getString("code"));
             InventoryP mp = new InventoryP(materialService.findInventoryById(material.getInteger("mid")));
             // 获取物料与条形码的对应关系
-            param.put("codeFlag",1);
+            param.put("codeFlag", 1);
             List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
             param.put("mcode", material.getString("code"));
             param.put("depositoryId", map.get("depositoryId"));
@@ -992,7 +990,7 @@ public class MaterialController {
         // 用于标识是否成功获取
         boolean flag = true;
         param.put("mcode", material.getCode());
-        param.put("codeFlag",1);
+        param.put("codeFlag", 1);
 //        MaterialP mp = new MaterialP(material);
         InventoryP mp = new InventoryP();
         // 获取物料与条形码的对应关系
@@ -1119,9 +1117,10 @@ public class MaterialController {
             // 如果没有获取到
             materialByBarCode = materialService.findMaterialByBarCode(qrCode);
         }
-
-        List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialByBarCode.getMid());
-        materialByBarCode.setSplitInfoList(splitInfoByMid);
+        if (materialByBarCode != null) {
+            List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialByBarCode.getMid());
+            materialByBarCode.setSplitInfoList(splitInfoByMid);
+        }
         result.put("material", materialByBarCode);
         return new RestResponse(result);
     }
@@ -1285,7 +1284,7 @@ public class MaterialController {
                     InventoryP materialP = inventory.get(0);
                     Map<String, Object> paramByBarCode = new HashMap<>();
                     paramByBarCode.put("mcode", materialP.getCode());
-                    paramByBarCode.put("codeFlag",1);
+                    paramByBarCode.put("codeFlag", 1);
                     List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarCode);
                     materialP.setMaterialAndBarCodeList(materialByBarCodeByCondition);
                     isExist = true;
@@ -1332,7 +1331,7 @@ public class MaterialController {
                 param.put("mcode", material.getString("code"));
                 InventoryP mp = new InventoryP(materialService.findInventoryById(material.getInteger("mid")));
                 // 获取物料与条形码的对应关系
-                param.put("codeFlag",1);
+                param.put("codeFlag", 1);
                 List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
                 param.put("mcode", material.getString("code"));
                 param.put("depositoryId", map.get("depositoryId"));
@@ -1471,7 +1470,7 @@ public class MaterialController {
         Integer mid = ObjectFormatUtil.toInteger(map.get("mid"));
         Material materialById = materialService.findMaterialById(mid);
         map.put("mcode", materialById.getCode());
-        map.put("codeFlag",1);
+        map.put("codeFlag", 1);
         List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(map);
         Integer codeCountByCondition = materialService.findMaterialByBarCodeCountByCondition(map);
         return new RestResponse(materialByBarCodeByCondition, codeCountByCondition, 200);
@@ -1531,7 +1530,7 @@ public class MaterialController {
                         // 如果成功获取
                         Map<String, Object> paramForCode = new HashMap<>();
                         paramForCode.put("mcode", materialP.getCode());
-                        paramForCode.put("codeFlag",1);
+                        paramForCode.put("codeFlag", 1);
                         List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramForCode);
                         List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialP.getMid());
                         materialP.setSplitInfoList(splitInfoByMid);
@@ -1568,7 +1567,7 @@ public class MaterialController {
             return new RestResponse(null, 1, 200);
         }
         param.put("mcode", code);
-        param.put("codeFlag",1);
+        param.put("codeFlag", 1);
         List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
         List<InventoryP> materialPByCondition = new ArrayList<>();
         InventoryP mp = null;
@@ -1826,27 +1825,28 @@ public class MaterialController {
 
     /**
      * 用于修改对应的码值类型
+     *
      * @param map 参数
      * @return
      */
     @PostMapping("updateQrCodeType")
-    public RestResponse updateQrCodeType(@RequestBody Map<String,Object> map){
+    public RestResponse updateQrCodeType(@RequestBody Map<String, Object> map) {
         // 获取转换类型
         String type = (String) map.get("type");
         String mcode = (String) map.get("mcode");
         int result = 0;
-        if(!"noMaterial".equals(mcode)){
+        if (!"noMaterial".equals(mcode)) {
 
-            if("qTb".equals(type)){
+            if ("qTb".equals(type)) {
                 // 如果是二维码转条形码
                 result = materialService.qrCodeToBarCode(map);
-            }else{
+            } else {
                 // 如果是条形码转二维码
                 result = materialService.barCodeToQrCode(map);
             }
 
         }
-        return CrudUtil.putHandle(1,result);
+        return CrudUtil.putHandle(1, result);
     }
 
 
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 d4eb7b92..4c30e5d6 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -1336,14 +1336,23 @@ public class PageController {
         mv.setViewName("pages/application/form-step-look");
         if (id != null) {
             ApplicationInRecordP applicationInRecordPById = depositoryRecordService.findApplicationInRecordPById(id);
+            // 获取入库库位id
+            Integer placeId = applicationInRecordPById.getPlaceId();
+            String placeCode = "默认库位";
+            if (Integer.compare(placeId, 0) != 0) {
+                Place placeById = placeService.findPlaceById(placeId);
+                placeCode = placeById.getCode();
+            }
             Integer flagForGroup = applicationInRecordPById.getFlagForGroup();
+            mv.addObject("record", applicationInRecordPById);
+            mv.addObject("placeCode", placeCode);
             if (Integer.compare(flagForGroup, 2) != 0) {
                 // 如果不是组合
                 UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationInRecordPById.getApplicantId(), userToken);
                 applicationInRecordPById.setApplicantName(userByPort.getName());
                 applicationInRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationInRecordPById.getApplicantTime())));
                 applicationInRecordPById.setPrice(applicationInRecordPById.getPrice() / 100);
-                mv.addObject("record", applicationInRecordPById);
+
             } else {
                 // 如果是组合
 
@@ -1353,7 +1362,6 @@ public class PageController {
                 List<GroupInfo> groupInfoList = groupService.findGroupInfoByGid(applicationInRecordPById.getMid());
                 mv.addObject("group", group);
                 mv.addObject("groupInfoList", groupInfoList);
-                mv.addObject("record", applicationInRecordPById);
                 mv.setViewName("pages/application/form-step-look_group");
             }
         } else {
@@ -2275,7 +2283,8 @@ public class PageController {
 
     /**
      * 用于跳转到打印页面
-     * @param mid 打印id
+     *
+     * @param mid  打印id
      * @param flag 标志位
      * @return
      */
@@ -2329,11 +2338,12 @@ public class PageController {
 
     /**
      * 用于查看当前库位该物料的库存
+     *
      * @param id 库位id
      * @return
      */
     @GetMapping("/materialForPlace")
-    public ModelAndView materialForPlace(Integer id){
+    public ModelAndView materialForPlace(Integer id) {
         ModelAndView mv = new ModelAndView();
         mv.setViewName("pages/place/materialForPlace");
         // 获取当前的映射
@@ -2343,15 +2353,15 @@ public class PageController {
         // 获取当前所有拆单库存记录
         List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryById.getMid());
         List<SplitInventory> splitInventoryByIid = new ArrayList<>();
-        for (SplitInfo splitInfo:
-             splitInfoByMid) {
+        for (SplitInfo splitInfo :
+                splitInfoByMid) {
             SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterial.getId(), splitInfo.getId());
             splitInventory.setSplitInfo(splitInfo);
             splitInventoryByIid.add(splitInventory);
         }
-        mv.addObject("record",placeAndMaterial);
-        mv.addObject("inventory",inventoryById);
-        mv.addObject("splitInventoryList",splitInventoryByIid);
+        mv.addObject("record", placeAndMaterial);
+        mv.addObject("inventory", inventoryById);
+        mv.addObject("splitInventoryList", splitInventoryByIid);
         return mv;
     }
 
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 706075d9..613425d2 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -53,6 +53,7 @@
         <result column="price" property="price" jdbcType="VARCHAR" />
         <result column="tname" property="materialTypeName" jdbcType="VARCHAR" />
         <result column="applicantTime" property="applicant_time" jdbcType="INTEGER" />
+        <result column="airPlaceId" property="placeId" jdbcType="INTEGER" />
         <result column="code" property="aircode" jdbcType="VARCHAR" />
         <result column="dname" property="depositoryName" jdbcType="VARCHAR" />
         <result column="applicant_id" property="applicantId" jdbcType="INTEGER" />
@@ -139,7 +140,7 @@
     </sql>
 
     <sql id="ApplicationInRecordInfo">
-        airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid
+        airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId
     </sql>
 
     <sql id="ApplicationOutRecordInfo">
@@ -628,7 +629,7 @@
 
 <!--    插入一条入库记录-->
     <insert id="insertApplicationInRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id">
-        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup)
+        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId)
         values(
             #{id},
             #{mid},
@@ -640,7 +641,8 @@
             #{code},
             #{applyRemark},
             #{unit},
-            #{flagForGroup}
+            #{flagForGroup},
+            #{placeId}
         )
     </insert>
 
diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java
index bd71485e..94e87078 100644
--- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java
+++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java
@@ -100,4 +100,10 @@ public class ApplicationInRecordP {
      */
     private Integer mid;
 
+
+    /**
+     * 入库库位
+     */
+    private  Integer placeId;
+
 }
diff --git a/src/main/resources/templates/pages/application/application-in.html b/src/main/resources/templates/pages/application/application-in.html
index ad40691e..32326b0b 100644
--- a/src/main/resources/templates/pages/application/application-in.html
+++ b/src/main/resources/templates/pages/application/application-in.html
@@ -1220,7 +1220,10 @@
                             var placeId = parent.childNodes[5];
                             if (flag === 0) {
                                 // 如果没有获取到位置
-                                layer.msg("当前二维码错误，请重新扫描");
+                                layer.msg("并未查询到对应位置，请重新扫描",{
+                                    icon:0,
+                                    time:1000
+                                });
                             } else if (flag === 1) {
                                 // 如果获取到的是库位
                                 var place = data["place"];
diff --git a/src/main/resources/templates/pages/application/form-step-look.html b/src/main/resources/templates/pages/application/form-step-look.html
index 5bd4e4d4..e0b575b5 100644
--- a/src/main/resources/templates/pages/application/form-step-look.html
+++ b/src/main/resources/templates/pages/application/form-step-look.html
@@ -54,6 +54,10 @@
                                     <td>仓库名称</td>
                                     <td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>
                                 </tr>
+                                <tr>
+                                    <td>库位编码</td>
+                                    <td id="placeCode" th:text="${placeCode}">默认库位</td>
+                                </tr>
                                 <tr>
                                     <td>提交人</td>
                                     <td id="applicantName" th:text="${record.getApplicantName()}">2016-11-28</td>
diff --git a/src/main/resources/templates/pages/application/form-step-look_group.html b/src/main/resources/templates/pages/application/form-step-look_group.html
index d3c4909d..1137962b 100644
--- a/src/main/resources/templates/pages/application/form-step-look_group.html
+++ b/src/main/resources/templates/pages/application/form-step-look_group.html
@@ -62,6 +62,22 @@
                                                class="layui-input" lay-verify="required"/>
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">仓库名称：</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="depositoryName" name="depositoryName"
+                                               th:value="${record.getDepositoryName()}"
+                                               class="layui-input" lay-verify="required"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">库位编码：</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="placeCode" name="placeCode"
+                                               th:value="${placeCode}"
+                                               class="layui-input" lay-verify="required"/>
+                                    </div>
+                                </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">入库数量：</label>
                                     <div class="layui-input-block">
@@ -78,6 +94,7 @@
                                                class="layui-input" lay-verify="required"/>
                                     </div>
                                 </div>
+
                             </div>
 
                             <fieldset class="table-search-fieldset">
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 706075d9..613425d2 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -53,6 +53,7 @@
         <result column="price" property="price" jdbcType="VARCHAR" />
         <result column="tname" property="materialTypeName" jdbcType="VARCHAR" />
         <result column="applicantTime" property="applicant_time" jdbcType="INTEGER" />
+        <result column="airPlaceId" property="placeId" jdbcType="INTEGER" />
         <result column="code" property="aircode" jdbcType="VARCHAR" />
         <result column="dname" property="depositoryName" jdbcType="VARCHAR" />
         <result column="applicant_id" property="applicantId" jdbcType="INTEGER" />
@@ -139,7 +140,7 @@
     </sql>
 
     <sql id="ApplicationInRecordInfo">
-        airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid
+        airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId
     </sql>
 
     <sql id="ApplicationOutRecordInfo">
@@ -628,7 +629,7 @@
 
 <!--    插入一条入库记录-->
     <insert id="insertApplicationInRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id">
-        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup)
+        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId)
         values(
             #{id},
             #{mid},
@@ -640,7 +641,8 @@
             #{code},
             #{applyRemark},
             #{unit},
-            #{flagForGroup}
+            #{flagForGroup},
+            #{placeId}
         )
     </insert>
 
diff --git a/target/classes/templates/pages/application/application-in.html b/target/classes/templates/pages/application/application-in.html
index ad40691e..32326b0b 100644
--- a/target/classes/templates/pages/application/application-in.html
+++ b/target/classes/templates/pages/application/application-in.html
@@ -1220,7 +1220,10 @@
                             var placeId = parent.childNodes[5];
                             if (flag === 0) {
                                 // 如果没有获取到位置
-                                layer.msg("当前二维码错误，请重新扫描");
+                                layer.msg("并未查询到对应位置，请重新扫描",{
+                                    icon:0,
+                                    time:1000
+                                });
                             } else if (flag === 1) {
                                 // 如果获取到的是库位
                                 var place = data["place"];
diff --git a/target/classes/templates/pages/application/form-step-look.html b/target/classes/templates/pages/application/form-step-look.html
index 5bd4e4d4..e0b575b5 100644
--- a/target/classes/templates/pages/application/form-step-look.html
+++ b/target/classes/templates/pages/application/form-step-look.html
@@ -54,6 +54,10 @@
                                     <td>仓库名称</td>
                                     <td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>
                                 </tr>
+                                <tr>
+                                    <td>库位编码</td>
+                                    <td id="placeCode" th:text="${placeCode}">默认库位</td>
+                                </tr>
                                 <tr>
                                     <td>提交人</td>
                                     <td id="applicantName" th:text="${record.getApplicantName()}">2016-11-28</td>
diff --git a/target/classes/templates/pages/application/form-step-look_group.html b/target/classes/templates/pages/application/form-step-look_group.html
index d3c4909d..1137962b 100644
--- a/target/classes/templates/pages/application/form-step-look_group.html
+++ b/target/classes/templates/pages/application/form-step-look_group.html
@@ -62,6 +62,22 @@
                                                class="layui-input" lay-verify="required"/>
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">仓库名称：</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="depositoryName" name="depositoryName"
+                                               th:value="${record.getDepositoryName()}"
+                                               class="layui-input" lay-verify="required"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">库位编码：</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="placeCode" name="placeCode"
+                                               th:value="${placeCode}"
+                                               class="layui-input" lay-verify="required"/>
+                                    </div>
+                                </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">入库数量：</label>
                                     <div class="layui-input-block">
@@ -78,6 +94,7 @@
                                                class="layui-input" lay-verify="required"/>
                                     </div>
                                 </div>
+
                             </div>
 
                             <fieldset class="table-search-fieldset">