From 84c7372af746e1ba52e2a2b7d81e518ce833f194 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Wed, 5 Apr 2023 15:30:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MaterialController.java        | 527 ++--------
 .../controller/PageController.java            |  81 +-
 .../static/js/lay-module/layuimini/miniTab.js |  61 ++
 .../application-out_scanQrCode.html           |  37 -
 .../application-out_scanQrCode.html           | 986 +++++++++++++-----
 .../pages/depository/Inventory-view.html      |  62 +-
 .../pages/scanQrCode/ScanBarCode.html         |  67 --
 .../pages/scanQrCode/ScanBarCodeByNew.html    |  81 --
 .../pages/scanQrCode/ScanBarCodeOut.html      | 123 ---
 .../static/js/lay-module/layuimini/miniTab.js |  61 ++
 .../application-out_scanQrCode.html           |  37 -
 .../application-out_scanQrCode.html           | 986 +++++++++++++-----
 .../pages/scanQrCode/ScanBarCode.html         |  67 --
 .../pages/scanQrCode/ScanBarCodeByNew.html    |  81 --
 .../pages/scanQrCode/ScanBarCodeOut.html      | 123 ---
 15 files changed, 1736 insertions(+), 1644 deletions(-)
 delete mode 100644 src/main/resources/templates/pages/scanQrCode/ScanBarCode.html
 delete mode 100644 src/main/resources/templates/pages/scanQrCode/ScanBarCodeByNew.html
 delete mode 100644 src/main/resources/templates/pages/scanQrCode/ScanBarCodeOut.html
 delete mode 100644 target/classes/templates/pages/scanQrCode/ScanBarCode.html
 delete mode 100644 target/classes/templates/pages/scanQrCode/ScanBarCodeByNew.html
 delete mode 100644 target/classes/templates/pages/scanQrCode/ScanBarCodeOut.html

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 06b5ff6e..be15022f 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author Dreamchaser
@@ -41,7 +42,7 @@ public class MaterialController {
     PlaceService placeService;
 
     @Autowired
-    RedisTemplate<Object, Object> redisTemplate;
+    RedisTemplate<String, String> redisTemplate;
 
 
     @Autowired
@@ -75,7 +76,7 @@ public class MaterialController {
     public RestResponse findInventoryForStockTaking(@RequestParam Map<String, Object> map, HttpServletRequest request) {
         Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId"));
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -99,7 +100,7 @@ public class MaterialController {
     @GetMapping("/findInventoryForGroup")
     public RestResponse findInventoryForGroup(@RequestParam Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -147,7 +148,7 @@ public class MaterialController {
     @GetMapping("/findInventory")
     public RestResponse findInventory(@RequestParam Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -176,7 +177,7 @@ public class MaterialController {
                     if (!flag) {
                         // 如果不是一次成功
                         page = ObjectFormatUtil.toInteger(map.get("page"));
-                        if(page == null){
+                        if (page == null) {
                             page = 1;
                         }
                         if (size - list.size() != size) {
@@ -310,7 +311,7 @@ public class MaterialController {
         String mname = (String) map.get("mname");
         String type = (String) map.get("type");
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -327,11 +328,12 @@ public class MaterialController {
 
     /**
      * 用于根据物料id获取物料基础信息
+     *
      * @param map
      * @return
      */
     @PostMapping("/findOnlyMaterialById")
-    public RestResponse findOnlyMaterialById(@RequestBody Map<String,String> map){
+    public RestResponse findOnlyMaterialById(@RequestBody Map<String, String> map) {
         Material materialById = materialService.findMaterialById(ObjectFormatUtil.toInteger(map.get("id")));
         return new RestResponse(materialById);
     }
@@ -345,7 +347,7 @@ public class MaterialController {
     @GetMapping("/findMatrialById")
     public RestResponse findMatrialById(@RequestParam(value = "mid", required = false) String mid, @RequestParam(value = "type", required = false) String type, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -404,7 +406,7 @@ public class MaterialController {
                                                 @RequestParam(value = "pid", required = false) String pid,
                                                 HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -461,7 +463,7 @@ public class MaterialController {
     @GetMapping("/findMatrialByCode")
     public RestResponse findMatrialByCode(@RequestParam Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -558,7 +560,7 @@ public class MaterialController {
     @PostMapping("/findInventoryByCondition")
     public RestResponse findInventoryByCondition(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -642,27 +644,45 @@ public class MaterialController {
     @PostMapping("/temporaryValue")
     public RestResponse temporaryValue(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
-        ArrayList arrayList = (ArrayList) map.get("materialList");
-        ArrayList materailList = new ArrayList();
-        for (int i = 0; i < arrayList.size(); i++) {
-            if (materailList.indexOf(arrayList.get(i)) == -1) {
-                materailList.add(arrayList.get(i));
+        if (map.containsKey("id")) {
+            String s = map.get("id").toString();
+            String key = "WMS_temporaryValue" + userByPort.getNumber();
+            List<String> range = redisTemplate.opsForList().range(key, 0, -1);
+            if (range != null) {
+                if (!range.contains(s)) {
+                    redisTemplate.opsForList().rightPush(key,s);
+                    redisTemplate.expire(key,DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS);
+                }
             }
+            return new RestResponse();
+        } else {
+            return CrudUtil.insertHandle(-1, 0);
+        }
+    }
+
+    @PostMapping("/delTemporaryValue")
+    public void delTemporaryValue(@RequestBody Map<String, Object> map, HttpServletRequest request) {
+        String token = request.getHeader("user-token");
+        if (token == null) {
+            token = (String) request.getSession().getAttribute("userToken");
+        }
+        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
+        if (map.containsKey("id")) {
+            String s = map.get("id").toString();
+            redisTemplate.opsForList().remove("WMS_temporaryValue" + userByPort.getNumber(), 0, s);
+
         }
-        map.put("materialList", materailList);
-        redisTemplate.opsForValue().set("scanQrCodeValue" + userByPort.getNumber(), JSONObject.toJSONString(map));
-        return new RestResponse();
     }
 
     // 将入库物料数据暂存到redis中
     @PostMapping("/temporaryValueForMaterial")
     public RestResponse temporaryValueForMaterial(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@@ -675,7 +695,7 @@ public class MaterialController {
     @PostMapping("/temporaryBarCodeValueForMaterial")
     public RestResponse temporaryBarCodeValueForMaterial(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@@ -684,60 +704,12 @@ public class MaterialController {
         return new RestResponse(200);
     }
 
-    // 判断当前扫描的物料是否存在
-    @GetMapping("/IsMaterialExist")
-    public RestResponse IsMaterialExist(HttpServletRequest request) {
-        String token = request.getHeader("user-token");
-        if(token == null){
-            token = (String) request.getSession().getAttribute("userToken");
-        }
-        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
-        String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue" + userByPort.getNumber()).toString();
-        redisTemplate.delete("scanQrCodeValue" + userByPort.getNumber());
-        JSONObject jsonObject = JSONObject.parseObject(scanQrCodeValue);
-        JSONObject depository = (JSONObject) jsonObject.get("depository"); // 扫描的仓库
-        JSONObject place = (JSONObject) jsonObject.get("place"); // 扫描的库位
-        JSONArray materialList = (JSONArray) jsonObject.get("materialList"); // 扫描的物料集合
-        ArrayList<Object> newMaterialList = new ArrayList();
-        Map<String, Object> map = new HashMap<>();
-
-        for (Object o : materialList) {
-            JSONObject obj = (JSONObject) o;
-            map.put("code", obj.get("code"));
-            if (depository != null) {
-                map.put("depositoryId", depository.get("did"));
-            }
-            if (place != null) {
-                map.put("depositoryId", place.get("depositoryId"));
-            }
-            List<MaterialP> inventory = materialService.findMaterial(map);
-            if (inventory.size() > 0) {
-                MaterialP materialP = inventory.get(0);
-                Map<String, Object> params = new HashMap<>();
-                // 有该物料
-                // 重新缓存到redis中
-                params.put("mid", materialP.getId());
-                params.put("mname", materialP.getMname());
-                params.put("code", materialP.getCode());
-                params.put("version", materialP.getVersion());
-                newMaterialList.add(params);
-            } else {
-                // 没有该物料
-                continue;
-            }
-        }
-        map.put("depository", depository);
-        map.put("place", place);
-        map.put("materialList", newMaterialList);
-        redisTemplate.opsForValue().set("scanQrCodeValue" + userByPort.getNumber(), JSONObject.toJSONString(map));
-        return new RestResponse();
-    }
 
     //用于判断当前出库数量是否合适
     @PostMapping("/MaterialQuantityIsTrue")
     public RestResponse MaterialQuantityIsTrue(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@@ -763,7 +735,7 @@ public class MaterialController {
                         // 如果是基础单位
                         for (InventoryP inventoryP : inventoryPList) {
                             double integer = inventoryP.getBaseUnitQuantity();
-                            if (quantity <= (integer - (int)(inventoryP.getNumberOfTemporary() / 100))) { // 如果当前数量合适则跳出循环
+                            if (quantity <= (integer - (int) (inventoryP.getNumberOfTemporary() / 100))) { // 如果当前数量合适则跳出循环
                                 flag = true;
                                 break;
                             }
@@ -853,54 +825,12 @@ public class MaterialController {
         return new RestResponse(s);
     }
 
-    // 获取扫描结果并跳转到入库
-    @GetMapping("/application_in_scanQrCode")
-    public RestResponse applicationInScanQrCode(HttpServletRequest request) {
-        String token = request.getHeader("user-token");
-        if(token == null){
-            token = (String) request.getSession().getAttribute("userToken");
-        }
-        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
-        // 获取当前用户所在部门拥有的仓库
-        List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
-        String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue" + userByPort.getNumber()).toString();
-        redisTemplate.delete("scanQrCodeValue" + userByPort.getNumber());
-        JSONObject jsonObject = JSONObject.parseObject(scanQrCodeValue);
-        JSONArray materialListByJson = jsonObject.getJSONArray("materialList");
-        Map<String, Object> param = new HashMap<>();
-        List<MaterialP> materialPList = new ArrayList<>();
-
-        for (int i = 0; i < materialListByJson.size(); i++) {
-            JSONObject material = (JSONObject) materialListByJson.get(i);
-            List<PlaceP> placePList = new ArrayList<>();
-            param.put("mcode", material.getString("code"));
-            MaterialP mp = new MaterialP(materialService.findMaterialById(material.getInteger("mid")));
-            // 获取物料与条形码的对应关系
-            param.put("codeFlag", 1);
-            List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
-            for (int j = 0; j < depositoryByAdminorg.size(); j++) {
-                Depository depository = depositoryByAdminorg.get(j);
-                param.put("mcode", material.getString("code"));
-                param.put("depositoryId", depository.getId());
-                List<InventoryP> inventory = materialService.findInventory(param);
-                if (inventory.size() > 0) {
-                    List<PlaceP> place = placeService.findPlaceByMidAndDid(inventory.get(0).getId(), depository.getId());
-                    placePList.addAll(place);
-                }
-            }
-            mp.setPlacePList(placePList);
-            mp.setMaterialAndBarCodeList(materialByBarCodeByCondition);
-            materialPList.add(mp);
-        }
-        jsonObject.put("materialList", materialPList);
-        return new RestResponse(jsonObject);
-    }
 
     // 获取扫描结果并跳转到入库
     @PostMapping("/qywxApplicationInScanQrCode")
     public RestResponse qywxApplicationInScanQrCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@@ -962,7 +892,7 @@ public class MaterialController {
     @PostMapping("/qywxApplicationOutScanQrCode")
     public RestResponse qywxApplicationOutScanQrCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@@ -1025,68 +955,6 @@ public class MaterialController {
     }
 
 
-    // 获取扫描结果并跳转到盘点
-    @PostMapping("/stockTaking_scanQrCode")
-    public RestResponse stockTakingScanQrCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
-        String token = request.getHeader("user-token");
-        if(token == null){
-            token = (String) request.getSession().getAttribute("userToken");
-        }
-        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
-        // 获取当前用户所在部门拥有的仓库
-        String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue" + userByPort.getNumber()).toString();
-        redisTemplate.delete("scanQrCodeValue" + userByPort.getNumber());
-        JSONObject jsonObject = JSONObject.parseObject(scanQrCodeValue);
-        // 获取扫描的物料
-        JSONArray materialListByJson = jsonObject.getJSONArray("materialList");
-        Map<String, Object> param = new HashMap<>();
-        List<InventoryP> materialPList = new ArrayList<>();
-
-        String placeId = (String) map.get("placeId");
-        for (int i = 0; i < materialListByJson.size(); i++) {
-            Boolean flag = true;
-            JSONObject material = (JSONObject) materialListByJson.get(i);
-            param.put("mcode", material.getString("code"));
-            InventoryP mp = new InventoryP(materialService.findInventoryById(material.getInteger("mid")));
-            // 获取物料与条形码的对应关系
-            param.put("codeFlag", 1);
-            List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
-            param.put("mcode", material.getString("code"));
-            param.put("depositoryId", map.get("depositoryId"));
-            List<InventoryP> inventory = materialService.findInventory(param);
-            if (inventory.size() > 0) {
-                InventoryP materialP = inventory.get(0);
-                if (!"0".equals(placeId)) {
-                    // 如果不是默认库位
-                    MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toInteger(placeId), materialP.getId());
-                    if (placeAndMaterialByMidAndPid == null) {
-                        // 如果当前物料不在该库位
-                        flag = false;
-                    }
-                    mp.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity() / 100);
-                } else {
-                    MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, materialP.getId());
-                    if (placeAndMaterialByMidAndPid == null) {
-                        // 如果当前物料不在该库位
-                        flag = false;
-                    }
-                    mp.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity() / 100);
-                }
-                mp = materialP;
-            } else {
-                flag = false;
-            }
-            mp.setMaterialAndBarCodeList(materialByBarCodeByCondition);
-            if (flag) {
-                // 如果可以添加
-
-                materialPList.add(mp);
-            }
-        }
-        jsonObject.put("materialList", materialPList);
-        return new RestResponse(jsonObject);
-    }
-
     // 获取扫描结果并跳转到盘点
     @PostMapping("/qywxStockTakingScanQrCode")
     public RestResponse qywxStockTakingScanQrCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
@@ -1128,7 +996,7 @@ public class MaterialController {
                     // 如果当前物料不在该库位
                     flag = false;
                 } else {
-                    materialP.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity()/100);
+                    materialP.setQuantity((double) placeAndMaterialByMidAndPid.getQuantity() / 100);
                 }
             } else {
                 MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, materialP.getId());
@@ -1136,7 +1004,7 @@ public class MaterialController {
                     // 如果当前物料不在该库位
                     flag = false;
                 } else {
-                    materialP.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity()/100);
+                    materialP.setQuantity((double) placeAndMaterialByMidAndPid.getQuantity() / 100);
                 }
             }
             mp = materialP;
@@ -1161,63 +1029,12 @@ public class MaterialController {
         return new RestResponse(null);
     }
 
-    // 获取条形码扫描结果
-    @GetMapping("/application_in_scanBarCode")
-    public RestResponse applicationInScanBarCode(HttpServletRequest request) {
-        String token = request.getHeader("user-token");
-        if(token == null){
-            token = (String) request.getSession().getAttribute("userToken");
-        }
-        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
-        String scanBarCodeValue = redisTemplate.opsForValue().get("temporaryBarCodeValueForMaterial" + userByPort.getNumber()).toString();
-        redisTemplate.delete("temporaryBarCodeValueForMaterial" + userByPort.getNumber());
-        JSONObject jsonObject = JSONObject.parseObject(scanBarCodeValue);
-        JSONArray barCodeList = (JSONArray) jsonObject.get("barCodeList");
-        // 获取标志位，用于判断是否扫描二维码
-        Boolean flag = jsonObject.getBoolean("flag");
-        Map<String, Object> result = new HashMap<>();
-        List<Object> materialList = new ArrayList<>();
-        // 获取当前用户所在部门拥有的仓库
-        List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
-        Map<String, Object> param = new HashMap<>();
-        for (int i = 0; i < barCodeList.size(); i++) {
-            // 获取具体的条形码
-            String barCode = barCodeList.getString(i);
-            // 获取条形码与物料的映射
-            MaterialAndBarCode materialByBarCode = null;
-            for (int j = 0; j < depositoryByAdminorg.size(); j++) {
-                param.put("depositoryId", depositoryByAdminorg.get(j).getId());
-                param.put("barCode", barCode);
-                // 通过仓库与条形码获取对应关系
-                materialByBarCode = materialService.findMaterialByBarCodeByBarCodeAndDepositoryId(param);
-                if (materialByBarCode != null) {
-                    // 如果获取到对应关系
-                    break;
-                }
-            }
-            if (materialByBarCode == null) {
-                // 如果没有获取到
-                materialByBarCode = materialService.findMaterialByBarCode(barCode);
-            }
-            materialList.add(materialByBarCode);
-        }
-        result.put("materialList", materialList);
-        if (flag) {
-            String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue" + userByPort.getNumber()).toString();
-            redisTemplate.delete("scanQrCodeValue" + userByPort.getNumber());
-            JSONObject parseObject = JSONObject.parseObject(scanQrCodeValue);
-            result.put("depository", parseObject.get("depository"));
-            result.put("place", parseObject.get("place"));
-        }
-        return new RestResponse(result);
-    }
-
 
     // 获取企业微信条形码扫描结果
     @PostMapping("/qywxApplicationInScanBarCode")
     public RestResponse qywxApplicationInScanBarCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -1254,67 +1071,11 @@ public class MaterialController {
     }
 
 
-    // 获取条形码扫描结果
-    @GetMapping("/application_transfer_scanBarCode")
-    public RestResponse applicationTransferScanBarCode(HttpServletRequest request) {
-        String token = request.getHeader("user-token");
-        if(token == null){
-            token = (String) request.getSession().getAttribute("userToken");
-        }
-        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
-        // 获取当前用户部门所拥有仓库
-        List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
-        String scanBarCodeValue = redisTemplate.opsForValue().get("temporaryBarCodeValueForMaterial" + userByPort.getNumber()).toString();
-        redisTemplate.delete("temporaryBarCodeValueForMaterial" + userByPort.getNumber());
-        JSONObject jsonObject = JSONObject.parseObject(scanBarCodeValue);
-        JSONArray barCodeList = (JSONArray) jsonObject.get("barCodeList");
-        // 获取标志位，用于判断是否扫描二维码
-        Boolean flag = jsonObject.getBoolean("flag");
-        Map<String, Object> result = new HashMap<>();
-        List<Object> materialList = new ArrayList<>();
-        for (int i = 0; i < barCodeList.size(); i++) {
-            // 获取具体的条形码
-            String barCode = barCodeList.getString(i);
-            // 获取条形码与物料的映射
-            MaterialAndBarCode materialByBarCode = materialService.findMaterialByBarCode(barCode);
-            Boolean isExist = false;
-            List<PlaceP> placePList = new ArrayList<>();
-            for (int j = 0; j < depositoryByAdminorg.size(); j++) {
-                Map<String, Object> param = new HashMap<>();
-                param.put("depositoryId", depositoryByAdminorg.get(j).getId());
-                param.put("mcode", materialByBarCode.getMcode());
-                List<InventoryP> inventory = materialService.findInventory(param);
-                if (inventory.size() > 0) {
-                    // 如果存在该物料
-                    InventoryP materialP = inventory.get(0);
-                    materialByBarCode.setMid(materialP.getId());
-                    List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(materialP.getId(), depositoryByAdminorg.get(j).getId());
-                    placePList.addAll(placeByMidAndDid);
-                    isExist = true;
-                }
-            }
-            if (isExist) {
-                materialByBarCode.setPlacePList(placePList);
-                materialList.add(materialByBarCode);
-            }
-        }
-        result.put("materialList", materialList);
-        if (flag) {
-            String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue" + userByPort.getNumber()).toString();
-            redisTemplate.delete("scanQrCodeValue" + userByPort.getNumber());
-            JSONObject parseObject = JSONObject.parseObject(scanQrCodeValue);
-            result.put("depository", parseObject.get("depository"));
-            result.put("place", parseObject.get("place"));
-        }
-        return new RestResponse(result);
-    }
-
-
     // 获取条形码扫描结果
     @PostMapping("/qywxApplicationOutScanBarCode")
     public RestResponse qywxApplicationOutScanBarCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@@ -1364,135 +1125,11 @@ public class MaterialController {
 
     }
 
-    // 获取条形码扫描结果
-    @PostMapping("/stockTaking_scanBarCode")
-    public RestResponse stockTakingScanBarCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
-        String token = request.getHeader("user-token");
-        if(token == null){
-            token = (String) request.getSession().getAttribute("userToken");
-        }
-        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
-        // 获取当前用户部门所拥有仓库
-        String scanBarCodeValue = redisTemplate.opsForValue().get("temporaryBarCodeValueForMaterial" + userByPort.getNumber()).toString();
-        redisTemplate.delete("temporaryBarCodeValueForMaterial" + userByPort.getNumber());
-        JSONObject jsonObject = JSONObject.parseObject(scanBarCodeValue);
-        JSONArray barCodeList = (JSONArray) jsonObject.get("barCodeList");
-        // 获取标志位，用于判断是否扫描二维码
-        Boolean flag = jsonObject.getBoolean("flag");
-        Map<String, Object> result = new HashMap<>();
-        List<InventoryP> materialList = new ArrayList<>();
-        String placeId = (String) map.get("placeId");
-        // 用于存储没有对应关系的条形码
-        List<String> barCodeListByNoMaterial = new ArrayList<>();
-        for (int i = 0; i < barCodeList.size(); i++) {
-            // 获取具体的条形码
-            String barCode = barCodeList.getString(i);
-            // 获取条形码与物料的映射
-            MaterialAndBarCode materialByBarCode = materialService.findMaterialByBarCode(barCode);
-            if (materialByBarCode != null) {
-                // 如果存在对应关系
-                Boolean isExist = false;
-                Map<String, Object> param = new HashMap<>();
-                param.put("depositoryId", map.get("depositoryId"));
-                param.put("mcode", materialByBarCode.getMcode());
-                List<InventoryP> inventory = materialService.findInventory(param);
-                InventoryP mp = new InventoryP();
-                if (inventory.size() > 0) {
-                    // 如果存在该物料
-                    InventoryP materialP = inventory.get(0);
-                    Map<String, Object> paramByBarCode = new HashMap<>();
-                    paramByBarCode.put("mcode", materialP.getCode());
-                    paramByBarCode.put("codeFlag", 1);
-                    List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarCode);
-                    materialP.setMaterialAndBarCodeList(materialByBarCodeByCondition);
-                    isExist = true;
-                    if (!"0".equals(placeId)) {
-                        // 如果不是默认库位
-                        // 获取物料与库位的对应关系
-                        MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toInteger(placeId), materialP.getId());
-                        if (placeAndMaterialByMidAndPid == null) {
-                            isExist = false;
-                        } else {
-                            mp.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity()/100);
-                        }
-                    } else {
-                        // 获取物料与库位的对应关系
-                        MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, materialP.getId());
-                        if (placeAndMaterialByMidAndPid == null) {
-                            isExist = false;
-                        } else {
-                            mp.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity() / 100);
-
-                        }
-                    }
-                    mp = materialP;
-
-                }
-                if (isExist) {
-                    materialList.add(mp);
-                }
-                // 如果当前条形码不存对应物料
-            } else {
-                barCodeListByNoMaterial.add(barCode);
-            }
-        }
-        if (flag) {
-            String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue" + userByPort.getNumber()).toString();
-            redisTemplate.delete("scanQrCodeValue" + userByPort.getNumber());
-            JSONObject parseObject = JSONObject.parseObject(scanQrCodeValue);
-            // 获取扫描的物料
-            JSONArray materialListByJson = jsonObject.getJSONArray("materialList");
-            Map<String, Object> param = new HashMap<>();
-            for (int i = 0; i < materialListByJson.size(); i++) {
-                Boolean tempflag = true;
-                JSONObject material = (JSONObject) materialListByJson.get(i);
-                param.put("mcode", material.getString("code"));
-                InventoryP mp = new InventoryP(materialService.findInventoryById(material.getInteger("mid")));
-                // 获取物料与条形码的对应关系
-                param.put("codeFlag", 1);
-                List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
-                param.put("mcode", material.getString("code"));
-                param.put("depositoryId", map.get("depositoryId"));
-                List<InventoryP> inventory = materialService.findInventory(param);
-                if (inventory.size() > 0) {
-                    InventoryP materialP = inventory.get(0);
-                    if (!"0".equals(placeId)) {
-                        // 如果不是默认库位
-                        MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toInteger(placeId), materialP.getId());
-                        if (placeAndMaterialByMidAndPid == null) {
-                            // 如果当前物料不在该库位
-                            tempflag = false;
-                        }
-                        mp.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity() / 100);
-                    } else {
-                        // 获取物料与库位的对应关系
-                        MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, materialP.getId());
-                        if (placeAndMaterialByMidAndPid == null) {
-                            tempflag = false;
-                        }
-                        mp.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity() / 100);
-                    }
-                    mp = materialP;
-                } else {
-                    tempflag = false;
-                }
-                mp.setMaterialAndBarCodeList(materialByBarCodeByCondition);
-                if (tempflag) {
-                    // 如果可以添加
-                    materialList.add(mp);
-                }
-            }
-        }
-        result.put("materialList", materialList);
-        result.put("barCodeListByNoMaterial", barCodeListByNoMaterial);
-        return new RestResponse(result);
-    }
-
 
     @PostMapping("/qywxStockTakingScanBarCode")
     public RestResponse qywxStockTakingScanBarCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@@ -1531,7 +1168,7 @@ public class MaterialController {
                     if (placeAndMaterialByMidAndPid == null) {
                         isExist = false;
                     } else {
-                        mp.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity() / 100);
+                        mp.setQuantity((double) placeAndMaterialByMidAndPid.getQuantity() / 100);
                     }
                 } else {
                     // 获取物料与库位的对应关系
@@ -1539,7 +1176,7 @@ public class MaterialController {
                     if (placeAndMaterialByMidAndPid == null) {
                         isExist = false;
                     } else {
-                        mp.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity()/100);
+                        mp.setQuantity((double) placeAndMaterialByMidAndPid.getQuantity() / 100);
 
                     }
                 }
@@ -1561,7 +1198,7 @@ public class MaterialController {
             for (MaterialAndProducedDate materialAndProducedDate : materialAndProducedDateByMid) {
                 // 获取当前生产日期
                 producedDateList.add(DateUtil.TimeStampToDateTimeForDay(materialAndProducedDate.getProducedDate()));
-                material.setQuantity((double)materialAndProducedDate.getInventory() / 100);
+                material.setQuantity((double) materialAndProducedDate.getInventory() / 100);
             }
             List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(material.getMid());
             material.setSplitInfoList(splitInfoByMid);
@@ -1576,7 +1213,7 @@ public class MaterialController {
     @GetMapping("/findMaterialByBarCode")
     public RestResponse findMaterialByBarCode(@RequestParam String barCode, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@@ -1653,7 +1290,7 @@ public class MaterialController {
                     List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialP.getMid());
                     materialP.setSplitInfoList(splitInfoByMid);
                     materialP.setMaterialAndBarCodeList(materialByBarCodeByCondition);
-                    materialP.setBaseUnitQuantity((double)pm.getQuantity() / 100);
+                    materialP.setBaseUnitQuantity((double) pm.getQuantity() / 100);
                     return new RestResponse(materialP, 1, 200);
                 } else {
                     return new RestResponse("", 0, 200);
@@ -1680,7 +1317,7 @@ public class MaterialController {
                         List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialP.getMid());
                         materialP.setSplitInfoList(splitInfoByMid);
                         materialP.setMaterialAndBarCodeList(materialByBarCodeByCondition);
-                        materialP.setQuantity((double)pm.getQuantity()/100);
+                        materialP.setQuantity((double) pm.getQuantity() / 100);
                         return new RestResponse(materialP, 1, 200);
                     } else {
                         return new RestResponse("", 0, 200);
@@ -1703,7 +1340,7 @@ public class MaterialController {
     @PostMapping("/findMatrialByCodeForTaking")
     public RestResponse findMatrialByCodeForTaking(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -1738,7 +1375,7 @@ public class MaterialController {
                     // 如果当前库位没有该物料
                     mp = null;
                 } else {
-                    mp.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity()/100);
+                    mp.setQuantity((double) placeAndMaterialByMidAndPid.getQuantity() / 100);
                 }
 
             } else {
@@ -1748,7 +1385,7 @@ public class MaterialController {
                     // 如果当前库位没有该物料
                     mp = null;
                 } else {
-                    mp.setQuantity((double)placeAndMaterialByMidAndPid.getQuantity()/100);
+                    mp.setQuantity((double) placeAndMaterialByMidAndPid.getQuantity() / 100);
                 }
 
             }
@@ -1763,7 +1400,7 @@ public class MaterialController {
                 // 获取当前生产日期
                 producedDateList.add(DateUtil.TimeStampToDateTimeForDay(materialAndProducedDate.getProducedDate()));
                 if (flagForQuantity) {
-                    mp.setQuantity((double)materialAndProducedDate.getInventory()/100);
+                    mp.setQuantity((double) materialAndProducedDate.getInventory() / 100);
                     flagForQuantity = false;
                 }
             }
@@ -1872,7 +1509,7 @@ public class MaterialController {
         String mname = (String) map.get("mname");
         String type = (String) map.get("type");
         String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@@ -1975,8 +1612,8 @@ public class MaterialController {
     }
 
     @PostMapping("/findSplitInventoryByUnit")
-    public RestResponse findSplitInventoryByUnit(@RequestBody Map<String,Object> map){
-        if(map.containsKey("id")){
+    public RestResponse findSplitInventoryByUnit(@RequestBody Map<String, Object> map) {
+        if (map.containsKey("id")) {
 
 
             // 获取当前的计量单位
@@ -1985,23 +1622,23 @@ public class MaterialController {
             Integer id = ObjectFormatUtil.toInteger(map.get("id"));
             // 获取库存记录
             Inventory inventory = materialService.findInventoryById(id);
-            if("-1".equals(unit)){
-                return new RestResponse((double)(inventory.getQuantity() / 100));
-            }else{
-                Map<String,Object> paramForSplitInfoStringObjectMap = new HashMap<>();
-                paramForSplitInfoStringObjectMap.put("mid",inventory.getMid());
-                paramForSplitInfoStringObjectMap.put("newUnit",unit);
+            if ("-1".equals(unit)) {
+                return new RestResponse((double) (inventory.getQuantity() / 100));
+            } else {
+                Map<String, Object> paramForSplitInfoStringObjectMap = new HashMap<>();
+                paramForSplitInfoStringObjectMap.put("mid", inventory.getMid());
+                paramForSplitInfoStringObjectMap.put("newUnit", unit);
                 SplitInfo splitInfoByMidAndUnit = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfoStringObjectMap);
                 List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(inventory.getId(), inventory.getDepositoryId());
                 double allInventory = 0.0;
-                for (PlaceP placeP:placeByMidAndDid
-                     ) {
+                for (PlaceP placeP : placeByMidAndDid
+                ) {
                     MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(placeP.getId(), inventory.getId());
-                     allInventory += splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfoByMidAndUnit.getId(), 0, true);
+                    allInventory += splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfoByMidAndUnit.getId(), 0, true);
                 }
                 return new RestResponse(allInventory);
             }
-        }else{
+        } else {
             throw new MyException("缺少必要参数");
         }
     }
@@ -2011,14 +1648,14 @@ public class MaterialController {
     public RestResponse findMaterialByConditionForStockTaking(@RequestParam Map<String, Object> map, HttpServletRequest request) {
         if (map.containsKey("mid")) {
             String mid = (String) map.get("mid");
-            if("".equals(mid)){
+            if ("".equals(mid)) {
                 return new RestResponse(null);
             }
             String token = request.getHeader("user-token");
-        if(token == null){
-            token = (String) request.getSession().getAttribute("userToken");
-        }
-        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+            if (token == null) {
+                token = (String) request.getSession().getAttribute("userToken");
+            }
+            UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
             // 获取当前部门所拥有的仓库
             List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
             // 查询当前用户管理的仓库
@@ -2036,11 +1673,11 @@ public class MaterialController {
                     depositoryIdList.add(rad.getDepositoryId());
                 }
             }
-            map.put("userTokenId",userToken.getId());
+            map.put("userTokenId", userToken.getId());
             List<MaterialAndPlaceForViewP> materialAndPlaceForViews = materialService.findInventoryByMidAndDepository(map, depositoryIdList);
             Integer count = placeService.findPlaceAndMaterialCountByDidsAndMid(depositoryIdList, map);
-            return new RestResponse(materialAndPlaceForViews,count,200);
-        }else{
+            return new RestResponse(materialAndPlaceForViews, count, 200);
+        } else {
             return new RestResponse(null);
         }
 
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 dcd33982..3e0553cf 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -504,7 +504,7 @@ public class PageController {
         String userAgent = request.getHeader("user-agent");
         // 判断当前使用的设备为移动端还是pc端
         boolean b = DeviceUtil.checkAgentIsMobile(userAgent);
-        if(b){
+        if (b) {
             mv.setViewName("pages/split/split-out_mobile");
         }
         return mv;
@@ -536,7 +536,7 @@ public class PageController {
         String userAgent = request.getHeader("user-agent");
         // 判断当前使用的设备为移动端还是pc端
         boolean b = DeviceUtil.checkAgentIsMobile(userAgent);
-        if(b){
+        if (b) {
             mv.setViewName("pages/material/material-out_mobile");
         }
         return mv;
@@ -923,7 +923,7 @@ public class PageController {
         String userAgent = request.getHeader("user-agent");
         // 判断当前使用的设备为移动端还是pc端
         boolean b = DeviceUtil.checkAgentIsMobile(userAgent);
-        if(b){
+        if (b) {
             mv.setViewName("pages/depository/table-in_mobile");
         }
         return mv;
@@ -950,7 +950,7 @@ public class PageController {
         String userAgent = request.getHeader("user-agent");
         // 判断当前使用的设备为移动端还是pc端
         boolean b = DeviceUtil.checkAgentIsMobile(userAgent);
-        if(b){
+        if (b) {
             mv.setViewName("pages/depository/table-out_mobile");
         }
         return mv;
@@ -990,7 +990,7 @@ public class PageController {
         String userAgent = request.getHeader("user-agent");
         // 判断当前使用的设备为移动端还是pc端
         boolean b = DeviceUtil.checkAgentIsMobile(userAgent);
-        if(b){
+        if (b) {
             mv.setViewName("pages/depository/table-stock_mobile");
         }
         return mv;
@@ -1047,7 +1047,7 @@ public class PageController {
                 inventory.setPlacePList(placeByMidAndDid);
                 List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryById.getMid());
                 inventory.setSplitInfoList(splitInfoByMid);
-                mv.addObject("record",inventory);
+                mv.addObject("record", inventory);
                 return mv;
             } else {
                 throw new MyException("缺少必要参数");
@@ -1103,7 +1103,7 @@ public class PageController {
         String userAgent = request.getHeader("user-agent");
         // 判断当前使用的设备为移动端还是pc端
         boolean b = DeviceUtil.checkAgentIsMobile(userAgent);
-        if(b){
+        if (b) {
             mv.setViewName("pages/group/group-out_mobile");
         }
         return mv;
@@ -1157,7 +1157,7 @@ public class PageController {
         String userAgent = request.getHeader("user-agent");
         // 判断当前使用的设备为移动端还是pc端
         boolean b = DeviceUtil.checkAgentIsMobile(userAgent);
-        if(b){
+        if (b) {
             mv.setViewName("pages/group/group_edit_mobile");
         }
 
@@ -2622,11 +2622,6 @@ public class PageController {
         return "pages/scanQrCode/ScanQrCodeIn";
     }
 
-    // 用于扫码条形码
-    @GetMapping("/scanBarCode")
-    public String scanBarCode() {
-        return "pages/scanQrCode/ScanBarCode";
-    }
 
     // 跳转到扫码盘点物料界面
     @GetMapping("/scanMaterialCodeForTaking")
@@ -2737,12 +2732,6 @@ public class PageController {
         return mv;
     }
 
-    @GetMapping("/scanBarCodeOut")
-    public ModelAndView scanBarCodeOut() {
-        ModelAndView mv = new ModelAndView();
-        mv.setViewName("pages/scanQrCode/ScanBarCodeOut");
-        return mv;
-    }
 
     // 获取扫描结果并跳转到入库
     @GetMapping("/application_in_scanQrCode")
@@ -2818,27 +2807,41 @@ public class PageController {
         if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
-        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
-        String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue" + userByPort.getNumber()).toString();
-        redisTemplate.delete("scanQrCodeValue" + userByPort.getNumber());
-        JSONObject jsonObject = JSONObject.parseObject(scanQrCodeValue);
-        JSONObject depository = (JSONObject) jsonObject.get("depository");
-        JSONObject place = (JSONObject) jsonObject.get("place");
-        JSONArray materialList = (JSONArray) jsonObject.get("materialList");
-        if (depository == null && place == null) {
-            // 如果库位与仓库都未选中
-        } else if (depository != null && place == null) {
-            // 如果选中仓库未选中库位
-            mv.addObject("depository", depository);
-        } else if (depository == null) {
-            // 如果选中库位未选中仓库
-            mv.addObject("place", place);
-        }
-        mv.addObject("materialList", materialList);
-        mv.setViewName("pages/application/application-out_scanQrCode");
-        if (Integer.compare(userByPort.getMaindeparment(), 361) == 0) {
-            mv.setViewName("pages/applicationForStorageCenter/application-out_scanQrCode");
+        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+        List<String> range = redisTemplateForHash.boundListOps("WMS_temporaryValue" + userToken.getNumber()).range(0, -1);
+        if (range.size() > 0) {
+            List<Inventory> result = new ArrayList<>();
+            for (String value : range
+            ) {
+                if ("".equals(value)) {
+                    continue;
+                }
+                Inventory inventoryById = materialService.findInventoryById(ObjectFormatUtil.toInteger(value));
+                List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryById.getMid());
+                inventoryById.setSplitInfoList(splitInfoByMid);
+                result.add(inventoryById);
+
+            }
+            mv.addObject("inventoryList", JSONObject.toJSONString(result));
+            mv.setViewName("pages/application/application-out_scanQrCode");
+            Integer role = userToken.getIsadmin();
+            if (role == null) {
+                role = 1;
+            }
+            if (role == 4 || Integer.compare(userToken.getMaindeparment(), 361) == 0) {
+                mv.setViewName("pages/applicationForStorageCenter/application-out_scanQrCode");
+            }
+        } else {
+            mv.setViewName("pages/application/application-out");
+            Integer role = userToken.getIsadmin();
+            if (role == null) {
+                role = 1;
+            }
+            if (role == 4 || Integer.compare(userToken.getMaindeparment(), 361) == 0) {
+                mv.setViewName("pages/applicationForStorageCenter/application-out");
+            }
         }
+
         return mv;
     }
 
diff --git a/src/main/resources/static/js/lay-module/layuimini/miniTab.js b/src/main/resources/static/js/lay-module/layuimini/miniTab.js
index 76871fcb..7d62b172 100644
--- a/src/main/resources/static/js/lay-module/layuimini/miniTab.js
+++ b/src/main/resources/static/js/lay-module/layuimini/miniTab.js
@@ -61,6 +61,28 @@ layui.define(["element", "layer", "jquery"], function (exports) {
             $('.layuimini-menu-left').attr('layuimini-tab-tag', 'add');
             sessionStorage.setItem('layuiminimenu_' + options.tabId, options.title);
         },
+        createNew: function (options) {
+            options.tabId = options.tabId || null;
+            options.href = options.href || null;
+            options.title = options.title || null;
+            options.isIframe = options.isIframe || false;
+            options.maxTabNum = options.maxTabNum || 20;
+            if ($(".layuimini-tab .layui-tab-title li").length >= options.maxTabNum) {
+                layer.msg('Tab窗口已达到限定数量，请先关闭部分Tab');
+                return false;
+            }
+            var ele = element;
+            if (options.isIframe) ele = parent.parent.layui.element;
+            ele.tabAdd('layuiminiTab', {
+                title: '<span class="layuimini-tab-active"></span><span>' + options.title + '</span><i class="layui-icon layui-unselect layui-tab-close">ဆ</i>' //用于演示
+                ,
+                content: '<iframe width="100%" height="100%" frameborder="no" border="0" marginwidth="0" marginheight="0"   src="' + options.href + '"></iframe>'
+                ,
+                id: options.tabId
+            });
+            $('.layuimini-menu-left').attr('layuimini-tab-tag', 'add');
+            sessionStorage.setItem('layuiminimenu_' + options.tabId, options.title);
+        },
 
 
         /**
@@ -108,6 +130,24 @@ layui.define(["element", "layer", "jquery"], function (exports) {
             parent.layer.close(loading);
         },
 
+        openNewTabByIframeNew: function (options) {
+            options.href = options.href || null;
+            options.title = options.title || null;
+            var loading = parent.parent.layer.load(0, {shade: false, time: 2 * 1000});
+            if (options.href === null || options.href === undefined) options.href = new Date().getTime();
+            var checkTab = miniTab.checkNew(options.href, true);
+            if (!checkTab) {
+                miniTab.createNew({
+                    tabId: options.href,
+                    href: options.href,
+                    title: options.title,
+                    isIframe: true,
+                });
+            }
+            parent.parent.layui.element.tabChange('layuiminiTab', options.href);
+            parent.parent.layer.close(loading);
+        },
+
         /**
          * 在iframe层关闭当前tab方法
          */
@@ -143,6 +183,27 @@ layui.define(["element", "layer", "jquery"], function (exports) {
             return checkTab;
         },
 
+        checkNew: function (tabId, isIframe) {
+            // 判断选项卡上是否有
+            var checkTab = false;
+            if (isIframe === undefined || isIframe === false) {
+                $(".layui-tab-title li").each(function () {
+                    var checkTabId = $(this).attr('lay-id');
+                    if (checkTabId != null && checkTabId === tabId) {
+                        checkTab = true;
+                    }
+                });
+            } else {
+                parent.parent.layui.$(".layui-tab-title li").each(function () {
+                    var checkTabId = $(this).attr('lay-id');
+                    if (checkTabId != null && checkTabId === tabId) {
+                        checkTab = true;
+                    }
+                });
+            }
+            return checkTab;
+        },
+
         /**
          * 开启tab右键菜单
          * @param tabId
diff --git a/src/main/resources/templates/pages/application/application-out_scanQrCode.html b/src/main/resources/templates/pages/application/application-out_scanQrCode.html
index 12869d6f..e7f8b7fc 100644
--- a/src/main/resources/templates/pages/application/application-out_scanQrCode.html
+++ b/src/main/resources/templates/pages/application/application-out_scanQrCode.html
@@ -34,8 +34,6 @@
         <div class="layui-fluid">
 <!--            出库申请-->
             <div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
-                <input th:value="${materialList}" style="display:none;" id="scanValue_materialList">
-                <input th:value="${depository}" style="display: none" id="scanValue_depositoryId">
                 <input th:value="${place}" style="display: none" id="scanValue_placeId">
                 <div carousel-item style="overflow: inherit">
                     <div>
@@ -118,8 +116,6 @@
             }]
         });
         let scanValue = {}; // 用于暂存扫描得到的结果
-        let materialOnPlaceList = []; // 用于保存当前物料所处的库位
-        let materialIsExist = ''; // 用于判断当前物料是否存在
         // 页面初始化
         $(function () {
             let depository = $("#scanValue_depositoryId").val();
@@ -143,39 +139,6 @@
 
         });
 
-        // 用于获取当前物料所处的库位
-        function getPlaceByMaterial(material){
-            var req = {};
-            req.code = material.code;
-            req.type = "out";
-            $.ajax({
-                url: "/material/findMatrialByCode",
-                type: "get",
-                dataType: 'json',
-                data:(req),
-                contentType: "application/json;charset=utf-8",
-                success: function (d) {
-                    var d = d.data;
-                    if(d == null){
-                        materialIsExist = false;
-                    }else{
-                        req.mid = d.id;
-                        $.ajax({
-                            url: "/place/findPlaceByMid",
-                            type: "post",
-                            dataType: 'json',
-                            data:JSON.stringify(req),
-                            contentType: "application/json;charset=utf-8",
-                            success:function (res) {
-                                materialOnPlaceList = res.data;
-                                materialIsExist = true;
-                            }
-                        });
-
-                    }
-                }
-            })
-        }
 
 
         //用于页面初始化时的卡片构造
diff --git a/src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html
index 8dcfc050..8cb1d910 100644
--- a/src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html
+++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html
@@ -33,23 +33,64 @@
         display: none;
     }
 
-    .layui-form-select .layui-input {
-        border-style: none;
-    }
 </style>
 <div class="layuimini-container">
     <div class="layuimini-main">
         <div class="layui-fluid">
             <!--            出库申请-->
             <div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
-                <input th:value="${materialList}" style="display:none;" id="scanValue_materialList">
-                <input th:value="${depository}" style="display: none" id="scanValue_depositoryId">
-                <input th:value="${place}" style="display: none" id="scanValue_placeId">
+                <input th:value="${inventoryList}" style="display: none" id="temporaryValue">
                 <div carousel-item style="overflow: inherit">
                     <div>
-                        <form class="layui-form layui-form-pane"
-                              style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
+                        <form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
                             <div class="layui-card" id="cardParent">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">部门:</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" placeholder="请选择部门" class="layui-input"
+                                               readonly
+                                               id="openCompanyAdminorg"
+                                               onclick="selectPost(this)"
+                                        />
+                                        <input type="text" name="adminorgId" class="layui-input"
+                                               id="adminorgId"
+                                               style="display: none"/>
+                                    </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"
+                                               readonly
+                                               id="openConstructionUnit"
+                                               onclick="selectConstructionUnit(this)"
+                                        />
+                                        <input type="text" name="constructionUnitId" class="layui-input"
+                                               id="constructionUnitId"
+                                               style="display: none"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">摘要:</label>
+                                    <div class="layui-input-block">
+                                        <input name="abstract" placeholder="请填写摘要" value=""
+                                               class="layui-input"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">出库类别:</label>
+                                    <div class="layui-input-block">
+                                        <input name="outType" placeholder="请填写相关原因及申请原因" value=""
+                                               class="layui-input"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">备注说明:</label>
+                                    <div class="layui-input-block">
+                                        <input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
+                                               class="layui-input"/>
+                                    </div>
+                                </div>
 
 
                                 <!--                            提交按钮-->
@@ -57,7 +98,7 @@
                                     <div class="layui-input-block">
                                         <button class="layui-btn" lay-submit lay-filter="formStep"
                                                 style="margin-bottom: 30px;margin-left: 15%">
-                                            &emsp;提交申请&emsp;
+                                            &emsp;提交&emsp;
                                         </button>
                                     </div>
                                 </div>
@@ -72,7 +113,6 @@
                                 <div style="font-size: 24px;color: #333;font-weight: 500;margin-top: 30px;">
                                     提交申请成功
                                 </div>
-                                <div style="font-size: 14px;color: #666;margin-top: 20px;">预计审核时间为1天</div>
                             </div>
                             <div style="text-align: center;margin-top: 50px;">
                                 <button class="layui-btn next">再申请一次</button>
@@ -81,17 +121,13 @@
                     </div>
                 </div>
             </div>
-            <hr>
-            <div style="color: #666;margin-top: 30px;margin-bottom: 40px;padding-left: 30px;">
-                <h3>说明</h3><br>
-                申请提交后，24小时内审核完毕
-            </div>
         </div>
 
     </div>
 </div>
 <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 src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
 <script>
     // 用于添加标签
     function addItem(obj) {
@@ -116,6 +152,7 @@
     // 用于暂存卡片个数
     var params = [];
 
+
     // 用于页面初始化时的卡片构造
     function initForm(num, obj) {
     }
@@ -128,6 +165,7 @@
         var $ = layui.$,
             form = layui.form,
             step = layui.step;
+
         // 用于分步表单加载
         step.render({
             elem: '#stepForm',
@@ -140,87 +178,28 @@
                 title: '提交成功'
             }]
         });
-        let scanValue = {}; // 用于暂存扫描得到的结果
-        let materialOnPlaceList = []; // 用于保存当前物料所处的库位
-        let materialIsExist = ''; // 用于判断当前物料是否存在
+        let temporaryValue = []; // 用于暂存扫描得到的结果
         // 页面初始化
         $(function () {
-            let depository = $("#scanValue_depositoryId").val();
-            let place = $("#scanValue_placeId").val();
-            let materialList = $("#scanValue_materialList").val();
-            materialList = JSON.parse(materialList);
-            if (depository !== undefined && depository !== null && depository !== "") {
-                // 如果扫描到仓库
-                depository = JSON.parse(depository);
-                scanValue.depository = depository;
+            temporaryValue = JSON.parse($("#temporaryValue").val());
+            for (let i = 0; i < temporaryValue.length; i++) {
+                initForm(i, temporaryValue[i]);
             }
-            if (place !== undefined && place !== null && place !== "") {
-                // 如果扫描到库位
-                place = JSON.parse(place);
-                scanValue.place = place;
-            }
-
-            for (let i = 0; i < materialList.length; i++) {
-                initForm(i, materialList[i]);
-            }
-
         });
 
-        // 用于获取当前物料所处的库位
-        function getPlaceByMaterial(material) {
-            var req = {};
-            req.code = material.code;
-            req.type = "out";
-            let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
-            $.ajax({
-                url: "/material/findMatrialByCode",
-                type: "get",
-                dataType: 'json',
-                data: (req),
-                contentType: "application/json;charset=utf-8",
-                success: function (d) {
-                    var d = d.data;
-                    if (d == null) {
-                        materialIsExist = false;
-                        layer.close(loading2);
-                    } else {
-                        req.mid = d.id;
-                        $.ajax({
-                            url: "/place/findPlaceByMid",
-                            type: "post",
-                            dataType: 'json',
-                            data: JSON.stringify(req),
-                            contentType: "application/json;charset=utf-8",
-                            success: function (res) {
-                                materialOnPlaceList = res.data;
-                                materialIsExist = true;
-                                layer.close(loading2);
-                            }
-                        });
-
-                    }
-                }
-            })
-        }
-
 
         //用于页面初始化时的卡片构造
         initForm = function (num, obj) {
-            var parent = $("#cardParent");
             // 获取待添加父类
             NewIdNumber = num;
-            var isPlace = false;
             if (num === 0) { // 如果是第一个
                 NewIdNumber = "";
             }
-            let depositoryItem = `
-            <div class="layui-form-item">
-                                        <label class="layui-form-label">所处库位:</label>
-                                        <div class="layui-input-block">
-                                            <select name=` + "placeId" + NewIdNumber + ` id=` + "place" + NewIdNumber + `></select>
-                                        </div>
-                                    </div>
-            `;
+            let splitInfoList = '';
+            for (let i = 0; i < obj.splitInfoList.length; i++) {
+                let item = '<option value="' + obj.splitInfoList[i].newUnit + '">' + obj.splitInfoList[i].newUnit + '</option>'
+                splitInfoList += item;
+            }
             var firstItem = `
                                 <div class="layui-card-body" id=` + "cardItem" + NewIdNumber + `>
                                 <hr>
@@ -233,115 +212,107 @@
                                                                id="openSonByMaterial" lay-verify="required" 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.mid}"
+                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber +`  value="${obj.id}"
                                                                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 id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="${obj.code}" onblur="selectCode(this)"
-                                                           class="layui-input" lay-verify="required">
-                                      </div>
-                                 </div>`;
-
-
-            var lastItem = `<div class="layui-form-item">
-                                       <label class="layui-form-label">物料数量:</label>
-                                       <div class="layui-input-block">
-                                            <input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value=""
-                                                           class="layui-input" lay-verify="number">
+                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
+                                        <div class="layui-input-block">
+                                            <div class="inputdiv">
+                                                <input id=` + "code" + NewIdNumber + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="${obj.code}"
+                                                       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="scanCodeByOut(this)">
+                                            </div>
                                         </div>
                                     </div>
+
                                  <div class="layui-form-item">
-                                   <label class="layui-form-label">备注说明:</label>
-                                    <div class="layui-input-block">
-                                    <input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
-                                                              class="layui-input"/>
+                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
+                                        <div class="layui-input-block" style="margin: 0px;">
+                                            <div class="inputdiv">
+                                                <input id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码"
+                                                       value=""
+                                                       class="layui-input"
+                                                       style="border-style: none">
+                                                <img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
+                                                     style="margin-top: 10px" onclick="scanBarCode(this)">
+                                            </div>
+                                        </div>
                                     </div>
-                                 </div>
-                                <i  class="layui-icon layui-icon-addition" style="display: inline" onclick="addItem(this)"></i>
-                                </div>`;
-            if (scanValue.depository !== undefined && scanValue.depository !== null && scanValue.depository !== "") {
-                // 如果扫描了仓库
-                var depository = scanValue.depository;
-                var req = {};
-                req.depositoryId = depository.did;
-                req.code = obj.code;
-                let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
-                $.ajax({
-                    url: "/place/findPlaceByMcodeAndDid",
-                    type: "post",
-                    dataType: 'json',
-                    data: JSON.stringify(req),
-                    contentType: "application/json;charset=utf-8",
-                    success: function (d) {
-                        if (d.data.length === 0) {
-                            initDeleteCard(NewIdNumber);
-                            layer.close(loading2);
-                        } else {
-                            $('#place' + NewIdNumber).empty();
-                            $.each(d.data, function (index, item) {
-                                $('#place' + NewIdNumber).append(new Option(item.depositoryName + "-" + item.code, item.did));//往下拉菜单里添加元素
-                            });
-                            form.render();
-                            layer.close(loading2);
-                        }
-                    }
-                })
-            }
+                                `;
 
-            if (scanValue.place !== undefined && scanValue.place !== null && scanValue.place !== "") {
-                // 如果扫描了库位
-                var place = scanValue.place;
-                var midlist = place.midList;
-                if (midlist.indexOf(obj.mid) !== -1) { // 如果当前库位存在该物料
-                    isPlace = true;
-                }
-            }
+
+            var lastItem = `<div class="layui-form-item">
+                <label class="layui-form-label">物料数量:</label>
+            <div class="layui-input-block">
+                <input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value="" onblur="MaterialQuantityIsTrue(this)"
+            id=` + "quantity" + NewIdNumber + `       class="layui-input" lay-verify="number">
+                </div>
+                </div>
+                <div class="layui-form-item">
+                <label class="layui-form-label">计量单位:</label>
+            <div class="layui-input-block">
+                <select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
+                <option value="-1">${obj.unit}</option>` +
+                splitInfoList +
+                `</select>
+                </div>
+                </div>
+                <div class="layui-form-item">
+                <label class="layui-form-label">项目:</label>
+            <div class="layui-input-block">
+                <input id=` + "project" + NewIdNumber + ` name=` + "project" + NewIdNumber + ` placeholder="请填写相关项目" value=""
+        class="layui-input"/>
+                </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 + 475 + 'px');
-            var materialItem = firstItem + depositoryItem + lastItem;
+            $("#stepForm").css("height", height + 390 + 'px');
+            var materialItem = firstItem + lastItem;
             $("#btn_sub").prepend(materialItem);
-
-            if (isPlace) {
-                // 如果当前库位存在
-                $('#place' + NewIdNumber).empty();
-                $('#place' + NewIdNumber).append(new Option(place.dname + "-" + place.code, place.pid));//往下拉菜单里添加元素
-                form.render();
-            }
+            form.render();
 
 
         };
 
-        // 初始化时删除卡片
-        initDeleteCard = function (NewIdNumber) {
-            // 待删除结点
-            var delItem = $("#cardItem" + NewIdNumber)[0];
-            var parentId = 0;
-            if (NewIdNumber !== "") {
-                parentId = parseInt(NewIdNumber);
-            }
-            // 获取祖父节点
-            // console.log(delItem)
-            var reparent = delItem.parentNode;
-            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            $("#stepForm").css("height", height - 430 + 'px');
-            params = remove(params, parentId);
-            reparent.removeChild(delItem);
-        };
 
-
-        // 提交
+        // 提交（物料出库）
         form.on('submit(formStep)', function (data) {
             if (!flagForForm) {
                 flagForForm = true;
                 data = data.field;
                 data.params = params;
+                if (data.mid === undefined) {
+                    // 如果没有初始项
+                    var dataKeys = Object.keys(data);
+                    var dataKey;
+                    for (let i = 0; i < dataKeys.length; i++) {
+                        dataKey = dataKeys[i];
+                        if (dataKey.includes("mid")) {
+                            break;
+                        }
+                    }
+                    // 获取当前数字
+                    var keyNumber = dataKey.split("mid")[1];
+                    for (let index = 0; index < dataKeys.length; index++) {
+                        var tempKey = dataKeys[index];
+                        if (tempKey.includes(keyNumber)) {
+                            var key = tempKey.replace(keyNumber, "");
+                            data[key] = data[tempKey];
+                            delete data[tempKey];
+                        }
+                    }
+                    data.params = remove(data.params, Number(keyNumber));
+                }
                 $.ajax({
                     url: "/depositoryRecord/applicationOut",
                     type: 'post',
@@ -355,7 +326,7 @@
                         layer.close(this.layerIndex);
                         if (data.status >= 300) {
                             layer.msg(data.statusInfo.message);//失败的表情
-                            return;
+
                         } else {
                             layer.msg("申请提交成功", {
                                 icon: 6,//成功的表情
@@ -363,13 +334,16 @@
                             }, function () {
                                 step.next('#stepForm');
                             });
+
+
                         }
                     },
                     complete: function () {
                         layer.close(this.layerIndex);
                     }
-                })
+                });
             }
+
             return false;
         });
 
@@ -397,7 +371,7 @@
                                 <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">物料名称</label>
+                                        <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"
@@ -409,29 +383,51 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                      <label class="layui-form-label">物料编码:</label>
-                                      <div class="layui-input-block">
-                                           <input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
-                                                           class="layui-input" lay-verify="required">
-                                      </div>
-                                 </div>
-                                 <div class="layui-form-item">
-                                        <label class="layui-form-label">所处库位:</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                         <div class="layui-input-block">
-                                            <select name=` + "placeId" + NewIdNumber + ` id="place"></select>
+                                            <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="scanCodeByOut(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">
+                                                <input id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码"
+                                                       value=""
+                                                       class="layui-input"
+                                                       style="border-style: none">
+                                                <img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
+                                                     style="margin-top: 10px" onclick="scanBarCode(this)">
+                                            </div>
                                         </div>
                                     </div>
                                  <div class="layui-form-item">
                                        <label class="layui-form-label">物料数量:</label>
                                        <div class="layui-input-block">
-                                            <input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value=""
-                                                           class="layui-input" lay-verify="number">
+                                            <input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value="" onblur="MaterialQuantityIsTrue(this)"
+                                                   id=` + "quantity" + NewIdNumber + `       class="layui-input" lay-verify="number">
                                         </div>
                                     </div>
+                                    <div class="layui-form-item">
+                                                    <label class="layui-form-label">计量单位:</label>
+                                                    <div class="layui-input-block">
+                                                        <select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
+
+                                                        </select>
+                                                    </div>
+                                                </div>
                                  <div class="layui-form-item">
-                                   <label class="layui-form-label">备注说明:</label>
+                                   <label class="layui-form-label">项目:</label>
                                     <div class="layui-input-block">
-                                    <input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
+                                    <input id=` + "project" + NewIdNumber + ` name=` + "project" + NewIdNumber + ` placeholder="请填写相关项目" value=""
                                                               class="layui-input"/>
                                     </div>
                                  </div>
@@ -439,8 +435,8 @@
                                 </div>`;
             // 获取当前高度
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            params.push(NewIdNumber)
-            $("#stepForm").css("height", height + 430 + 'px');
+            params.push(NewIdNumber);
+            $("#stepForm").css("height", height + 387 + 'px');
             $("#" + parentId).after(materialItem);
         };
 
@@ -453,9 +449,19 @@
             // 获取祖父节点
             var reparent = parent.parentNode;
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            $("#stepForm").css("height", height - 430 + 'px');
+            $("#stepForm").css("height", height - 387 + 'px');
             params = remove(params, parentId);
             reparent.removeChild(parent);
+            // 当前节点的id值
+           let value = parent.childNodes[5].childNodes[3].childNodes[3].value;
+           $.ajax({
+               url: "/material/delTemporaryValue",
+               type: 'post',
+               data:JSON.stringify({"id":value}),
+               dataType: 'json',
+               contentType: "application/json;charset=utf-8"
+           })
+
         };
 
         //删除数组中指定元素
@@ -475,11 +481,16 @@
             // 输入code
             var code = obj.value;
             // 获取对应元素
-            var parent = obj.parentNode.parentNode.parentNode;
+            var parent = obj.parentNode.parentNode.parentNode.parentNode;
+            var objId = parent.id.split("cardItem")[1];
             var children = parent.childNodes[5];
             var materialItem = children.childNodes[3].childNodes[1].childNodes;
+            var barCodeChildren = parent.childNodes[9];
+
             var materialName = materialItem[1];
             var materialId = materialName.parentNode.parentNode.childNodes[3];
+            // 条形码条码
+            var barCodeItem = barCodeChildren.childNodes[3];
             var req = {};
             req.code = code;
             req.type = "out";
@@ -494,34 +505,56 @@
                     success: function (d) {
                         var d = d.data;
                         if (d == null) {
-                            layer.msg("没有该编码，请确认是否输入正确", {icon: 0, time: 500}, function () {
+                            layer.msg("仓库中暂无该物料", {icon: 0, time: 500}, function () {
                                 layer.close(loading2);
                                 materialName.value = "";
                                 materialId.value = "";
                                 obj.value = "";
-                                $('#place').empty();
+                                $('#place' + objId).empty();
                             });
 
                         } else {
-                            req.mid = d.id;
-                            $.ajax({
-                                url: "/place/findPlaceByMid",
-                                type: "post",
-                                dataType: 'json',
-                                data: JSON.stringify(req),
-                                contentType: "application/json;charset=utf-8",
-                                success: function (res) {
-                                    $('#place').empty();
-                                    $.each(res.data, function (index, item) {
-                                        $('#place').append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
-                                    });
-                                    form.render();
-                                    materialName.value = d.mname;
-                                    materialId.value = d.id;
-                                    layer.close(loading2);
+                            materialName.value = d.mname;
+                            materialId.value = d.id;
+                            var idNumber = materialId.name.split("mid")[1];
+                            // 获取物料与条形码的对应关系
+                            var materialAndBarCodeList = d["materialAndBarCodeList"];
+                            var unit = $("#unit" + idNumber);
+                            unit.empty();
+                            $("#unit" + idNumber).append(new Option(d.baseUnit, "-1"));
+                            var unitList = d["splitInfoList"];
+                            for (let i = 0; i < unitList.length; i++) {
+                                $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                            }
+                            form.render();
+                            if (materialAndBarCodeList.length > 0) {
+                                // 如果有对应的条形码
+                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                var id = barCodeInput.id;
+                                $("#" + id).remove();
+                                $("#barCode" + idNumber).empty();
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                } else {
+                                    var barCodeSelect = `
+                             <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                    $("#" + barCodeImg.id).before(barCodeSelect);
                                 }
-                            });
-
+                                form.render();
+                                $.each(materialAndBarCodeList, function (index, item) {
+                                    $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                });
+                                form.render();
+                            } else {
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                }
+                            }
+                            layer.close(loading2);
                         }
                     }
                 });
@@ -529,18 +562,24 @@
 
         };
 
+
         // 用于实现点击搜索按钮
         selectMaterial = function (obj) {
             var parent = obj.parentNode.parentNode.parentNode.parentNode;
             var parentId = parent.id;
             var codeChildren = parent.childNodes[7];
             var materialChildren = parent.childNodes[5];
-            var codeItem = codeChildren.childNodes[3].childNodes;
+            var codeItem = codeChildren.childNodes[3].childNodes[1].childNodes;
             var codeValue = codeItem[1];
             var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes;
             var materialName = materialItem[1];
             var materialId = materialName.parentNode.parentNode.childNodes[3];
             var mname = materialName.value;
+            var barCodeChildren = parent.childNodes[9];
+            // 条形码条码
+            var barCodeItem = barCodeChildren.childNodes[3];
+
+            mname = mname.split(",")[0];
             layer.open({
                 type: 2,
                 title: '弹窗内容',
@@ -548,8 +587,10 @@
                 maxmin: true,
                 shadeClose: true, //点击遮罩关闭层
                 area: ['70%', '70%'],
-                // content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId,
+                // content: '/selectMaterialByCard?mname=' + mname + '&type=2&clickObj=' + parentId,
                 content: '/getMaterialAll?mname=' + mname + '&type=2&clickObj=' + parentId,
+                move: '.layui-layer-title',
+                fixed: false,
                 success: function (layero, index) {
                     var children = layero.children();
                     var content = $(children[1]);
@@ -557,87 +598,506 @@
                     content.css('height', '100%');
                     iframeChildren.css('height', '100%');
                 },
-                move: '.layui-layer-title',
-                fixed: false,
                 end: function () {
                     var mid = materialId.value;
                     let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
-                    $.ajax({
-                        url: "/material/findMatrialById?mid=" + mid,
-                        type: "get",
-                        dataType: 'json',
-                        contentType: "application/json;charset=utf-8",
-                        success: function (d) {
-                            var material = d.data.materialById;
-                            var placeList = d.data.placeList;
-                            var code = material.code;
-                            if (code === undefined) {
-                                code = "";
+                    if (mid !== '') {
+                        $.ajax({
+                            url: "/material/findMatrialById?mid=" + mid + "&type=out",
+                            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;
+                                var materialAndBarCodeList = material["materialAndBarCodeList"];
+                                var idNumber = materialId.name.split("mid")[1];
+                                var unit = $("#unit" + idNumber);
+                                unit.empty();
+                                $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
+                                var unitList = material["splitInfoList"];
+                                for (let i = 0; i < unitList.length; i++) {
+                                    $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                                }
+                                form.render();
+                                if (materialAndBarCodeList.length > 0) {
+                                    // 如果有对应的条形码
+                                    var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                    var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                    var id = barCodeInput.id;
+                                    $("#" + id).remove();
+                                    $("#barCode" + idNumber).empty();
+                                    var barCode = $("#barCode" + idNumber);
+                                    if (barCode.length > 0) {
+                                        barCode.empty();
+                                    } else {
+                                        var barCodeSelect = `
+                             <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                        $("#" + barCodeImg.id).before(barCodeSelect);
+                                    }
+                                    form.render();
+                                    $.each(materialAndBarCodeList, function (index, item) {
+                                        $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                    });
+                                    form.render();
+                                } else {
+                                    var barCode = $("#barCode" + idNumber);
+                                    if (barCode.length > 0) {
+                                        barCode.empty();
+                                    }
+                                }
+                                form.render();
+                                layer.close(loading2);
                             }
-                            codeValue.value = code;
-                            $('#place').empty();
-                            $.each(placeList, function (index, item) {
-                                $('#place').append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
-                            });
-                            form.render();
-                            layer.close(loading2);
-                        }
-                    });
-
+                        });
+                    }
                 }
             });
         };
 
         //用于实现物料名称搜索
         selectMaterialByName = function (obj) {
-            // 输入code
             var data = obj.value;
             // 获取对应元素
             var parent = obj.parentNode.parentNode.parentNode.parentNode;
             var materialChildren = parent.childNodes[5];
             var codeChildren = parent.childNodes[7];
-            var codeItem = codeChildren.childNodes[3].childNodes;
+            var codeItem = codeChildren.childNodes[3].childNodes[1].childNodes;
             var codeValue = codeItem[1];
             var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes;
             var materialName = materialItem[1];
             var materialId = materialName.parentNode.parentNode.childNodes[3];
+            var barCodeChildren = parent.childNodes[9];
+            // 条形码条码
+            var barCodeItem = barCodeChildren.childNodes[3];
             var req = {};
-            req.mname = data;
-            let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
-            $.ajax({
-                url: "/material/findInventoryByCondition",
-                type: "post",
-                dataType: 'json',
-                data: JSON.stringify(req),
-                contentType: "application/json;charset=utf-8",
-                success: function (d) {
-                    if (d.count > 1) {
-                        layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
-                            materialId.value = "";
-                            codeValue.value = "";
+            data = data.split(",")[0];
+            if (data !== "") {
+                let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                req.mname = data;
+                $.ajax({
+                    url: "/material/findInventoryByCondition",
+                    type: "post",
+                    dataType: 'json',
+                    data: JSON.stringify(req),
+                    contentType: "application/json;charset=utf-8",
+                    success: function (d) {
+                        if (d.count > 1) {
+                            layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
+                                layer.close(loading2);
+                                materialId.value = "";
+                                codeValue.value = "";
+                            });
+                            return false;
+                        } else if (d.count === 0) {
+                            layer.msg("没有该物品，请确认输入是否正确", {icon: 5, time: 500}, function () {
+                                layer.close(loading2);
+                                materialId.value = "";
+                                codeValue.value = "";
+                                materialName.value = "";
+                            });
+                            return false;
+                        } else {
+                            var idNumber = materialId.name.split("mid")[1];
+                            var material = d.data[0];
+                            var unit = $("#unit" + idNumber);
+                            unit.empty();
+                            $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
+                            var unitList = material["splitInfoList"];
+                            if (unitList !== null && unitList != undefined) {
+                                for (let i = 0; i < unitList.length; i++) {
+                                    $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                                }
+                                form.render();
+                            }
+                            var materialAndBarCodeList = material["materialAndBarCodeList"];
+                            if (materialAndBarCodeList.length > 0) {
+                                // 如果有对应的条形码
+                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                var id = barCodeInput.id;
+                                $("#" + id).remove();
+                                $("#barCode" + idNumber).empty();
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                } else {
+                                    var barCodeSelect = `
+                             <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                    $("#" + barCodeImg.id).before(barCodeSelect);
+                                }
+                                form.render();
+                                $.each(materialAndBarCodeList, function (index, item) {
+                                    $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                });
+                                form.render();
+                            } else {
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                }
+                            }
+                            materialName.value = material.mname;
+                            materialId.value = material.id;
+                            codeValue.value = material.code;
                             layer.close(loading2);
-                        });
+                        }
+                    }
+                });
+            }
 
-                        return false;
-                    } else if (d.count === 0) {
-                        layer.msg("没有该物品，请确认输入是否正确", {icon: 5, time: 500}, function () {
-                            materialId.value = "";
-                            codeValue.value = "";
-                            materialName.value = "";
-                            layer.close(loading2);
-                        });
-                        return false;
-                    } else {
-                        var material = d.data[0];
-                        materialName.value = material.mname;
-                        materialId.value = material.id;
-                        codeValue.value = material.code;
-                        layer.close(loading2);
+        };
+
+        // 扫描物料条码
+        scanBarCode = function (obj) {
+            let wxScan = parent;
+
+            if (wxScan.wx === undefined) {
+                wxScan = wxScan.parent.wx;
+            } else {
+                wxScan = wxScan.wx;
+            }
+            wxScan.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.codeFlag = 1;
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/qywxApplicationOutScanBarCode",
+                        type: "post",
+                        dataType: 'json',
+                        data: JSON.stringify(req),
+                        contentType: "application/json;charset=utf-8",
+                        success: function (d) {
+                            // 获取对应元素
+                            var parent = obj.parentNode.parentNode.parentNode.parentNode;
+
+                            var MaterialChildren = parent.childNodes[5];
+                            var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes;
+
+                            var barCodeChildren = parent.childNodes[9];
+
+                            var materialName = materialItem[1];
+                            var materialId = materialName.parentNode.parentNode.childNodes[3];
+                            // 条形码条码
+                            var barCodeItem = barCodeChildren.childNodes[3];
+                            // 物料编码
+                            var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes;
+
+
+                            var materialCode = materialCodeItem[1];
+
+                            var data = d.data;
+                            if (data !== null) {
+                                materialName.value = data.mname;
+                                materialId.value = data.iid;
+                                materialCode.value = data.mcode;
+                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                barCodeInput.value = result;
+                                var idNumber = materialId.name.split("mid")[1];
+                                var unit = $("#unit" + idNumber);
+                                unit.empty();
+                                $("#unit" + idNumber).append(new Option(data.unit, "-1"));
+                                var unitList = data["splitInfoList"];
+                                for (let i = 0; i < unitList.length; i++) {
+                                    $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                                }
+                                form.render();
+                                layer.close(loading2);
+                            } else {
+                                // 如果没有对应关系
+                                layer.msg("对于编码：" + result + ",并未发现仓库中存在对应的物料", {
+                                    icon: 0,
+                                    time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
+                                }, function () {
+                                    layer.close(loading2);
+                                })
+                            }
+
+                        }
+                    })
+                }
+            })
+
+
+        };
+
+        // 用于扫码功能
+        scanCodeByOut = function (obj) {
+            let wxScan = parent;
+
+            if (wxScan.wx === undefined) {
+                wxScan = wxScan.parent.wx;
+            } else {
+                wxScan = wxScan.wx;
+            }
+            wxScan.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.codeFlag = 2;
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/qywxApplicationOutScanQrCode",
+                        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 () {
+                                    layer.close(loading2);
+                                })
+                            } else {
+                                // 获取对应元素
+                                var parent = obj.parentNode.parentNode.parentNode.parentNode;
+                                var MaterialChildren = parent.childNodes[5];
+                                var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes;
+
+                                var barCodeChildren = parent.childNodes[9];
+
+                                var materialName = materialItem[1];
+                                var materialId = materialName.parentNode.parentNode.childNodes[3];
+                                // 条形码条码
+                                var barCodeItem = barCodeChildren.childNodes[3];
+                                // 物料编码
+                                var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes;
+
+                                var materialCode = materialCodeItem[1];
+
+                                var idNumber = materialId.name.split("mid")[1];
+
+
+                                // 获取物料与条形码的对应关系
+                                var materialAndBarCodeList = data["materialAndBarCodeList"];
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                }
+
+                                if (materialAndBarCodeList.length > 0) {
+                                    // 如果有对应的条形码
+                                    var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                    var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                    var id = barCodeInput.id;
+                                    $("#" + id).remove();
+                                    $("#barCode" + idNumber).empty();
+                                    var barCode = $("#barCode" + idNumber);
+                                    if (barCode.length > 0) {
+                                        barCode.empty();
+                                    } else {
+                                        var barCodeSelect = `
+                                        <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                        $("#" + barCodeImg.id).before(barCodeSelect);
+                                    }
+                                    form.render();
+
+                                    $.each(materialAndBarCodeList, function (index, item) {
+                                        $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                    });
+                                    form.render();
+                                }
+                                $('#place' + idNumber).empty();
+                                $.each(data.placePList, function (index, item) {
+                                    $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
+                                });
+                                $("#unit" + idNumber).empty();
+                                $("#unit" + idNumber).append(new Option(data.baseUnit, "-1"));
+                                $.each(data.splitInfoList, function (index, item) {
+                                    $("#unit" + idNumber).append(new Option(item.newUnit, item.newUnit));
+                                });
+                                form.render();
+                                materialName.value = data.mname;
+                                materialId.value = data.id;
+                                materialCode.value = data.code;
+                                layer.close(loading2);
+                            }
+                        }
+                    })
+                }
+            })
+        };
+
+        //用于判断当前物料数量是否合适
+        MaterialQuantityIsTrue = function (obj) {
+            var id = obj.id.split("quantity")[1];
+            var mcode = $("#code" + id).val(); // 获取到当前输入的物料编码
+            var unit = $("#unit" + id).val();
+            if (mcode === "" || mcode === undefined || mcode === null) {
+                layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
+                    $("#quantity" + id).val("")
+                });
+            } else {
+                let val = $("#quantity" + id).val();
+                if (val !== null && val !== undefined && val !== '') {
+                    var req = {};
+                    req.mcode = mcode;
+                    req.quantity = val;
+                    req.unit = unit;
+                    req.placeId = -1;
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/MaterialQuantityIsTrue",
+                        type: "post",
+                        data: JSON.stringify(req),
+                        dataType: 'json',
+                        contentType: "application/json;charset=utf-8",
+                        success: function (res) {
+                            var flag = res.data;
+                            if (!flag) { // 如果当前数目不合适
+                                layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () {
+                                        layer.close(loading2);
+                                        $("#quantity" + id).val("");
+                                    },
+                                );
+                            } else {
+                                layer.close(loading2)
+                            }
+
+                        }
+                    });
+                }
+            }
+        };
+
+        selectPost = function (obj) {
+            let id = obj.id;
+            layer.open({
+                type: 2,
+                title: '弹窗内容',
+                skin: 'layui-layer-rim',
+                maxmin: true,
+                shadeClose: true, //点击遮罩关闭层
+                area: ['70%', '70%'],
+                content: '/selectPost?id=' + id,
+                move: '.layui-layer-title',
+                fixed: false,
+                success: function (layero, index) {
+                    var children = layero.children();
+                    var content = $(children[1]);
+                    var iframeChildren = $(content.children());
+                    content.css('height', '100%');
+                    iframeChildren.css('height', '100%');
+                }
+            });
+        };
+
+        selectConstructionUnit = function (obj) {
+            let id = obj.id;
+            layer.open({
+                type: 2,
+                title: '弹窗内容',
+                skin: 'layui-layer-rim',
+                maxmin: true,
+                shadeClose: true, //点击遮罩关闭层
+                area: ['70%', '70%'],
+                content: '/selectConstructionUnit?id=' + id,
+                move: '.layui-layer-title',
+                fixed: false,
+                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 () {
+                    let val = $("#"+id).val();
+                    if(val !== ""){
+                        if(id.indexOf("ForGroup") !== -1){
+                            // 如果是组合
+                            $("#stepForm2").find('input[id*="project"]').each(function () {
+                                $(this).attr("lay-verify","required")
+                            })
+
+                        }else{
+                            // 如果是物料
+                            $("#stepForm").find('input[id*="project"]').each(function () {
+                                $(this).attr("lay-verify","required")
+                            })
+                        }
+                    }else{
+                        if(id.indexOf("ForGroup") !== -1){
+                            // 如果是组合
+                            $("#stepForm2").find('input[id*="project"]').each(function () {
+                                $(this).removeAttr("lay-verify")
+                            })
+
+                        }else{
+                            // 如果是物料
+                            $("#stepForm").find('input[id*="project"]').each(function () {
+                                $(this).removeAttr("lay-verify")
+                            })
+                        }
                     }
                 }
             });
         };
 
+        form.on('select()', function (data) {
+            let unit = data.value;
+            let id = data.elem.id;
+            let idNum = id.split("unit")[1];
+            let mcode = $("#code" + idNum).val();
+            if (mcode === "" || mcode === undefined || mcode === null) {
+                layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
+                    $("#quantity" + idNum).val("")
+                });
+            } else {
+                let val = $("#quantity" + idNum).val();
+                if (val !== null && val !== undefined && val !== '') {
+                    var req = {};
+                    req.mcode = mcode;
+                    req.quantity = val;
+                    req.unit = unit;
+                    req.placeId = -1;
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/MaterialQuantityIsTrue",
+                        type: "post",
+                        data: JSON.stringify(req),
+                        dataType: 'json',
+                        contentType: "application/json;charset=utf-8",
+                        success: function (res) {
+                            var flag = res.data;
+                            if (!flag) { // 如果当前数目不合适
+                                layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () {
+                                        layer.close(loading2);
+                                        $("#quantity" + idNum).val("");
+                                    },
+                                );
+                            } else {
+                                layer.close(loading2)
+                            }
+
+                        }
+                    });
+                }
+            }
+
+        });
 
     })
 </script>
diff --git a/src/main/resources/templates/pages/depository/Inventory-view.html b/src/main/resources/templates/pages/depository/Inventory-view.html
index 8b4cc4f3..2e4ff79c 100644
--- a/src/main/resources/templates/pages/depository/Inventory-view.html
+++ b/src/main/resources/templates/pages/depository/Inventory-view.html
@@ -64,7 +64,7 @@
     <div class="layui-form-item">
         <label class="layui-form-label">品牌:</label>
         <div class="layui-input-inline">
-            <input type="text"  class="layui-input" th:value="${record.getBrand()}" readonly
+            <input type="text" class="layui-input" th:value="${record.getBrand()}" readonly
                    name="brand"/>
         </div>
     </div>
@@ -72,7 +72,7 @@
     <div class="layui-form-item">
         <label class="layui-form-label">物料类型</label>
         <div class="layui-input-inline">
-            <input type="text"  class="layui-input" id="openSonByMateralType" readonly
+            <input type="text" class="layui-input" id="openSonByMateralType" readonly
                    th:value="${record.getTypeName()}"
                    lay-verify="required"/>
         </div>
@@ -99,7 +99,8 @@
     <div class="layui-form-item">
         <label class="layui-form-label">所处仓库</label>
         <div class="layui-input-inline">
-            <input type="text" th:value="${record.getDepositoryName()}" name="depositoryName" required autocomplete="off" readonly
+            <input type="text" th:value="${record.getDepositoryName()}" name="depositoryName" required
+                   autocomplete="off" readonly
                    class="layui-input">
             <input type="text" id="depositoryId" th:value="${record.getDepositoryId()}" style="display: none">
         </div>
@@ -117,38 +118,44 @@
     <div class="layui-form-item">
         <label class="layui-form-label">数量</label>
         <div class="layui-input-inline">
-            <input type="text" th:value="${record.getQuantity()}" name="quantity" required autocomplete="off" id="quantity" readonly
+            <input type="text" th:value="${record.getQuantity()}" name="quantity" required autocomplete="off"
+                   id="quantity" readonly
                    class="layui-input">
         </div>
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label">单价</label>
         <div class="layui-input-inline">
-            <input type="text" th:value="${record.getPrice()}" name="price" required autocomplete="off" id="price" readonly
+            <input type="text" th:value="${record.getPrice()}" name="price" required autocomplete="off" id="price"
+                   readonly
                    class="layui-input">
         </div>
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label">总额</label>
         <div class="layui-input-inline">
-            <input type="text" th:value="${record.getAmounts()}" name="amounts" required autocomplete="off" id="amounts" readonly
+            <input type="text" th:value="${record.getAmounts()}" name="amounts" required autocomplete="off" id="amounts"
+                   readonly
                    class="layui-input">
         </div>
     </div>
     <div class="layui-form-item">
         <div class="layui-input-block">
             <button class="layui-btn layui-btn-customize" type="button" onclick="applicationIn()">入库申请</button>
+
             <button class="layui-btn layui-btn-customize" type="button" onclick="applicationOut()">出库申请</button>
         </div>
     </div>
 </form>
+
 <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>
-    function applicationIn(){
+    function applicationIn() {
 
     }
 
-    function applicationOut(){
+    function applicationOut() {
 
     }
 
@@ -157,9 +164,13 @@
     let flagForForm = false;
     var barCode = [];
     var flag = false;
-    layui.use(['form', 'laydate'], function () {
-        var form = layui.form, laydate = layui.laydate, $ = layui.$;
-        //提交
+    layui.use(['form', 'laydate', 'miniTab'], function () {
+        var form = layui.form,
+            laydate = layui.laydate,
+            $ = layui.$,
+            miniTab = layui.miniTab;
+
+        miniTab.listen();
 
         form.on('select()', function (data) {
             var id = data.elem.id; //得到select原始DOM对象id
@@ -176,10 +187,10 @@
                     $("#quantity").val(d.data)
                 }
             });
-        })
+        });
 
-        applicationOut = function() {
-            var index = layer.open({
+        applicationOut = function () {
+            /*var index = layer.open({
                 title: '出库申请',
                 type: 2,
                 shade: 0.2,
@@ -190,9 +201,24 @@
             });
             $(window).on("resize", function () {
                 layer.full(index);
-            });
+            });*/
+            // 暂存当前选择的库存记录
+            $.ajax({
+                url: "/material/temporaryValue",
+                type: "post",
+                dataType: 'json',
+                data: JSON.stringify({"id": $("#id").val()}),
+                contentType: "application/json;charset=utf-8",
+                success: function (d) {
+                    miniTab.openNewTabByIframeNew({
+                        href: "/application_Out_scanQrCode",
+                        title: "出库申请"
+                    });
+
+                }
+            })
             return false;
-        }
+        };
 
         applicationIn = function () {
             var index = layer.open({
@@ -202,7 +228,7 @@
                 maxmin: true,
                 shadeClose: true,
                 area: ['100%', '100%'],
-                content: '/application_in_back?mid=' + $("#id").val() + "&depositoryId=" +$("#depositoryId").val()
+                content: '/application_in_back?mid=' + $("#id").val() + "&depositoryId=" + $("#depositoryId").val()
             });
             $(window).on("resize", function () {
                 layer.full(index);
@@ -210,7 +236,7 @@
             return false;
         }
 
-    }) ;
+    });
 </script>
 
 </body>
diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarCode.html b/src/main/resources/templates/pages/scanQrCode/ScanBarCode.html
deleted file mode 100644
index 0cfc7705..00000000
--- a/src/main/resources/templates/pages/scanQrCode/ScanBarCode.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.w3.org/1999/xhtml">
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="utf-8">
-    <title>扫码</title>
-    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
-    <link rel="stylesheet" href="/static/css/layuimini.css?v=2.0.4.2" media="all">
-    <link rel="stylesheet" href="/static/css/themes/default.css" media="all">
-    <link rel="stylesheet" href="/static/lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
-    <!--[if lt IE 9]>
-    <script src="/static/js/html5.min.js"></script>
-    <script src="/static/js/respond.min.js"></script>
-    <![endif]-->
-    <!--    vue相关-->
-    <script src="../static/js/vue/vue.js"></script>
-    <script src="../static/js/vue/vue-router.js"></script>
-    <script src="../static/lib/http-vue-loader/src/httpVueLoader.js"></script>
-    <script src="../static/js/VueQrcodeReader.umd.min.js"></script>
-    <script src="/static/js/scanBarCode/html5-qrcode.min.js"></script>
-</head>
-<body>
-<div style="width: 500px" id="reader">
-
-</div>
-<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script>
-
-    const html5QrCode = new Html5Qrcode("reader");
-    const qrCodeSuccessCallback = (decodedText, decodedResult) => {
-        /* 扫描成功 */
-        console.log(decodedText,decodedResult);
-
-        html5QrCode.stop().then((ignore) => {
-            // 暂停扫描
-            // 发送ajax请求去获取当前条码的数据
-            layui.$.ajax({
-                url: "/material/findMaterialByBarCode?barCode="+decodedText,
-                type: "get",
-                dataType: 'json',
-                contentType: "application/json;charset=utf-8",
-                success: function (d) {
-                    var data = d.data;
-                    // 将扫描结果赋值给父页面
-                    layui.$("#barcode", window.parent.document).val(decodedText);
-                    if(data === null || data === undefined){
-                        // 如果没有查询到物料
-                    }else{
-                        layui.$("#mname", window.parent.document).val(data.mname);
-                        layui.$("#code", window.parent.document).val(data.code);
-                    }
-                    var index = parent.layer.getFrameIndex(window.name);
-                    parent.layer.close(index);
-                }
-            })
-        }).catch((err) => {
-            console.log(err)
-            // 停止失败，处理它。
-        });
-    };
-    const config = { fps: 10, aspectRatio: 2  };
-
-    // Select back camera or fail with `OverconstrainedError`.
-    html5QrCode.start({ facingMode: { exact: "environment"} }, config, qrCodeSuccessCallback);
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarCodeByNew.html b/src/main/resources/templates/pages/scanQrCode/ScanBarCodeByNew.html
deleted file mode 100644
index 8d81f28e..00000000
--- a/src/main/resources/templates/pages/scanQrCode/ScanBarCodeByNew.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.w3.org/1999/xhtml">
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="utf-8">
-    <title>扫码</title>
-    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
-    <link rel="stylesheet" href="/static/css/layuimini.css?v=2.0.4.2" media="all">
-    <link rel="stylesheet" href="/static/css/themes/default.css" media="all">
-    <link rel="stylesheet" href="/static/lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
-    <!--[if lt IE 9]>
-    <script src="/static/js/html5.min.js"></script>
-    <script src="/static/js/respond.min.js"></script>
-    <![endif]-->
-    <!--    vue相关-->
-    <script src="../static/js/vue/vue.js"></script>
-    <script src="../static/js/vue/vue-router.js"></script>
-    <script src="../static/lib/http-vue-loader/src/httpVueLoader.js"></script>
-    <script src="../static/js/VueQrcodeReader.umd.min.js"></script>
-    <script src="/static/js/scanBarCode/html5-qrcode.min.js"></script>
-</head>
-<body>
-
-<div style="width: 500px" id="reader">
-
-</div>
-<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script>
-    // 用于判断是否包含字母
-    var barCodeList = [];
-
-
-    layui.$(function () {
-        parent.parent.parent.parent.wx.scanQRCode({
-            desc: 'scanQRCode desc',
-            needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-            scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
-            success: function (res) {
-                // 回调
-                var result = res.resultStr;//当needResult为1时返回处理结果
-                outboundLogic(result);
-
-            },
-            error: function(res) {
-                if (res.errMsg.indexOf('function_not_exist') > 0) {
-                    alert('版本过低请升级')
-                }
-
-            }
-
-        });
-    });
-
-    outboundLogic = function (result) {
-        barCodeList.push(result);
-        layer.confirm("是否继续扫描", {
-            btn: ["扫描", "取消"]
-        }, function () { // 继续
-            layer.close(layer.index); // 关闭弹窗
-            parent.parent.parent.parent.wx.scanQRCode({
-                desc: 'scanQRCode desc',
-                needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-                scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
-                success: function (res) {
-                    // 回调
-                    var result = res.resultStr;//当needResult为1时返回处理结果
-                    outboundLogic(result)
-                }
-            })
-        }, function () { // 取消
-            // 关闭当前页
-            layui.$("#barCodeList", window.parent.document).val(barCodeList);
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-
-        })
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarCodeOut.html
deleted file mode 100644
index 53ea4320..00000000
--- a/src/main/resources/templates/pages/scanQrCode/ScanBarCodeOut.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.w3.org/1999/xhtml">
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="utf-8">
-    <title>扫码</title>
-    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
-    <link rel="stylesheet" href="/static/css/layuimini.css?v=2.0.4.2" media="all">
-    <link rel="stylesheet" href="/static/css/themes/default.css" media="all">
-    <link rel="stylesheet" href="/static/lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
-    <!--[if lt IE 9]>
-    <script src="/static/js/html5.min.js"></script>
-    <script src="/static/js/respond.min.js"></script>
-    <![endif]-->
-    <!--    vue相关-->
-    <script src="../static/js/vue/vue.js"></script>
-    <script src="../static/js/vue/vue-router.js"></script>
-    <script src="../static/lib/http-vue-loader/src/httpVueLoader.js"></script>
-    <script src="../static/js/VueQrcodeReader.umd.min.js"></script>
-    <script src="/static/js/scanBarCode/html5-qrcode.min.js"></script>
-</head>
-<body>
-<div style="width: 500px" id="reader">
-
-</div>
-<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script>
-    // 用于判断是否包含字母
-    let barCodeList = [];
-    var depository;
-    var place;
-    // 是否扫描二维码标志位
-    var flag = false;
-    const html5QrCode = new Html5Qrcode("reader");
-    const qrCodeSuccessCallback = (decodedText, decodedResult) => {
-        var formatName = decodedResult.result.format.formatName;
-        /* 扫描成功 */
-        // console.log(decodedText,decodedResult);
-        if (formatName.includes("QR_CODE")||formatName.includes("AZTEC")) {
-            // console.log("二维码",decodedText);
-            // 如果扫描的位本地二维码
-            flag = true;
-            // 先解密
-            let jmResult = {};
-            jmResult.result = decodedText;
-            layui.$.ajax({
-                url: "/material/decode3Des",
-                type: 'post',
-                dataType: 'json',
-                contentType: "application/json;charset=utf-8",
-                data: JSON.stringify(jmResult),
-                success:function (d) {
-                    let parse = JSON.parse(d.data);
-                    if (parse.did !== undefined) {
-                        // 如果扫描的是仓库二维码
-                        depository = parse;
-                    }
-                    if (parse.pid !== undefined) {
-                        // 如果扫描的是库位二维码
-                        place = parse;
-                    }
-                }
-            })
-        }else{
-            // 如果是条形码
-            barCodeList.push(decodedText);
-        }
-        html5QrCode.stop().then((ignore) => {
-
-            // 暂停扫描
-            layer.confirm("是否继续扫描？",
-                {
-                    btn: ["继续", "取消"]
-                },
-                function () {// 继续
-                    // 弹出选择框
-                    layer.close(layer.index);
-                    html5QrCode.start({ facingMode: { exact: "environment"} }, config, qrCodeSuccessCallback);
-                },
-                function () { // 取消当前操作
-                    layer.close(layer.index); // 关闭弹窗
-                    // 将数据暂存到redis
-                    var param = {};
-                    param.barCodeList = barCodeList;
-                    param.flag = flag;
-                    layui.$.ajax({
-                        url:"/material/temporaryBarCodeValueForMaterial",
-                        type:"post",
-                        datatype:"json",
-                        data:JSON.stringify(param),
-                        contentType: "application/json;charset=utf-8",
-                    });
-                    if(flag){
-                        var params = {};
-                        params.depository = depository;
-                        params.place = place;
-                        params.materialList = [];
-                        layui.$.ajax({
-                            url: "/material/temporaryValue",
-                            type: 'post',
-                            dataType: 'json',
-                            contentType: "application/json;charset=utf-8",
-                            data: JSON.stringify(params)
-                        });
-                    }
-                    // 关闭当前页
-                    var index = parent.layer.getFrameIndex(window.name);
-                    parent.layer.close(index);
-                }
-            )
-
-        }).catch((err) => {
-            console.log(err)
-            // 停止失败，处理它。
-        });
-    };
-    const config = { fps: 10, aspectRatio: 2  };
-
-    // Select back camera or fail with `OverconstrainedError`.
-    html5QrCode.start({ facingMode: { exact: "environment"} }, config, qrCodeSuccessCallback);
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/target/classes/static/js/lay-module/layuimini/miniTab.js b/target/classes/static/js/lay-module/layuimini/miniTab.js
index 76871fcb..7d62b172 100644
--- a/target/classes/static/js/lay-module/layuimini/miniTab.js
+++ b/target/classes/static/js/lay-module/layuimini/miniTab.js
@@ -61,6 +61,28 @@ layui.define(["element", "layer", "jquery"], function (exports) {
             $('.layuimini-menu-left').attr('layuimini-tab-tag', 'add');
             sessionStorage.setItem('layuiminimenu_' + options.tabId, options.title);
         },
+        createNew: function (options) {
+            options.tabId = options.tabId || null;
+            options.href = options.href || null;
+            options.title = options.title || null;
+            options.isIframe = options.isIframe || false;
+            options.maxTabNum = options.maxTabNum || 20;
+            if ($(".layuimini-tab .layui-tab-title li").length >= options.maxTabNum) {
+                layer.msg('Tab窗口已达到限定数量，请先关闭部分Tab');
+                return false;
+            }
+            var ele = element;
+            if (options.isIframe) ele = parent.parent.layui.element;
+            ele.tabAdd('layuiminiTab', {
+                title: '<span class="layuimini-tab-active"></span><span>' + options.title + '</span><i class="layui-icon layui-unselect layui-tab-close">ဆ</i>' //用于演示
+                ,
+                content: '<iframe width="100%" height="100%" frameborder="no" border="0" marginwidth="0" marginheight="0"   src="' + options.href + '"></iframe>'
+                ,
+                id: options.tabId
+            });
+            $('.layuimini-menu-left').attr('layuimini-tab-tag', 'add');
+            sessionStorage.setItem('layuiminimenu_' + options.tabId, options.title);
+        },
 
 
         /**
@@ -108,6 +130,24 @@ layui.define(["element", "layer", "jquery"], function (exports) {
             parent.layer.close(loading);
         },
 
+        openNewTabByIframeNew: function (options) {
+            options.href = options.href || null;
+            options.title = options.title || null;
+            var loading = parent.parent.layer.load(0, {shade: false, time: 2 * 1000});
+            if (options.href === null || options.href === undefined) options.href = new Date().getTime();
+            var checkTab = miniTab.checkNew(options.href, true);
+            if (!checkTab) {
+                miniTab.createNew({
+                    tabId: options.href,
+                    href: options.href,
+                    title: options.title,
+                    isIframe: true,
+                });
+            }
+            parent.parent.layui.element.tabChange('layuiminiTab', options.href);
+            parent.parent.layer.close(loading);
+        },
+
         /**
          * 在iframe层关闭当前tab方法
          */
@@ -143,6 +183,27 @@ layui.define(["element", "layer", "jquery"], function (exports) {
             return checkTab;
         },
 
+        checkNew: function (tabId, isIframe) {
+            // 判断选项卡上是否有
+            var checkTab = false;
+            if (isIframe === undefined || isIframe === false) {
+                $(".layui-tab-title li").each(function () {
+                    var checkTabId = $(this).attr('lay-id');
+                    if (checkTabId != null && checkTabId === tabId) {
+                        checkTab = true;
+                    }
+                });
+            } else {
+                parent.parent.layui.$(".layui-tab-title li").each(function () {
+                    var checkTabId = $(this).attr('lay-id');
+                    if (checkTabId != null && checkTabId === tabId) {
+                        checkTab = true;
+                    }
+                });
+            }
+            return checkTab;
+        },
+
         /**
          * 开启tab右键菜单
          * @param tabId
diff --git a/target/classes/templates/pages/application/application-out_scanQrCode.html b/target/classes/templates/pages/application/application-out_scanQrCode.html
index 12869d6f..e7f8b7fc 100644
--- a/target/classes/templates/pages/application/application-out_scanQrCode.html
+++ b/target/classes/templates/pages/application/application-out_scanQrCode.html
@@ -34,8 +34,6 @@
         <div class="layui-fluid">
 <!--            出库申请-->
             <div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
-                <input th:value="${materialList}" style="display:none;" id="scanValue_materialList">
-                <input th:value="${depository}" style="display: none" id="scanValue_depositoryId">
                 <input th:value="${place}" style="display: none" id="scanValue_placeId">
                 <div carousel-item style="overflow: inherit">
                     <div>
@@ -118,8 +116,6 @@
             }]
         });
         let scanValue = {}; // 用于暂存扫描得到的结果
-        let materialOnPlaceList = []; // 用于保存当前物料所处的库位
-        let materialIsExist = ''; // 用于判断当前物料是否存在
         // 页面初始化
         $(function () {
             let depository = $("#scanValue_depositoryId").val();
@@ -143,39 +139,6 @@
 
         });
 
-        // 用于获取当前物料所处的库位
-        function getPlaceByMaterial(material){
-            var req = {};
-            req.code = material.code;
-            req.type = "out";
-            $.ajax({
-                url: "/material/findMatrialByCode",
-                type: "get",
-                dataType: 'json',
-                data:(req),
-                contentType: "application/json;charset=utf-8",
-                success: function (d) {
-                    var d = d.data;
-                    if(d == null){
-                        materialIsExist = false;
-                    }else{
-                        req.mid = d.id;
-                        $.ajax({
-                            url: "/place/findPlaceByMid",
-                            type: "post",
-                            dataType: 'json',
-                            data:JSON.stringify(req),
-                            contentType: "application/json;charset=utf-8",
-                            success:function (res) {
-                                materialOnPlaceList = res.data;
-                                materialIsExist = true;
-                            }
-                        });
-
-                    }
-                }
-            })
-        }
 
 
         //用于页面初始化时的卡片构造
diff --git a/target/classes/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html b/target/classes/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html
index 8dcfc050..8cb1d910 100644
--- a/target/classes/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html
+++ b/target/classes/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html
@@ -33,23 +33,64 @@
         display: none;
     }
 
-    .layui-form-select .layui-input {
-        border-style: none;
-    }
 </style>
 <div class="layuimini-container">
     <div class="layuimini-main">
         <div class="layui-fluid">
             <!--            出库申请-->
             <div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
-                <input th:value="${materialList}" style="display:none;" id="scanValue_materialList">
-                <input th:value="${depository}" style="display: none" id="scanValue_depositoryId">
-                <input th:value="${place}" style="display: none" id="scanValue_placeId">
+                <input th:value="${inventoryList}" style="display: none" id="temporaryValue">
                 <div carousel-item style="overflow: inherit">
                     <div>
-                        <form class="layui-form layui-form-pane"
-                              style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
+                        <form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
                             <div class="layui-card" id="cardParent">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">部门:</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" placeholder="请选择部门" class="layui-input"
+                                               readonly
+                                               id="openCompanyAdminorg"
+                                               onclick="selectPost(this)"
+                                        />
+                                        <input type="text" name="adminorgId" class="layui-input"
+                                               id="adminorgId"
+                                               style="display: none"/>
+                                    </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"
+                                               readonly
+                                               id="openConstructionUnit"
+                                               onclick="selectConstructionUnit(this)"
+                                        />
+                                        <input type="text" name="constructionUnitId" class="layui-input"
+                                               id="constructionUnitId"
+                                               style="display: none"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">摘要:</label>
+                                    <div class="layui-input-block">
+                                        <input name="abstract" placeholder="请填写摘要" value=""
+                                               class="layui-input"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">出库类别:</label>
+                                    <div class="layui-input-block">
+                                        <input name="outType" placeholder="请填写相关原因及申请原因" value=""
+                                               class="layui-input"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">备注说明:</label>
+                                    <div class="layui-input-block">
+                                        <input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
+                                               class="layui-input"/>
+                                    </div>
+                                </div>
 
 
                                 <!--                            提交按钮-->
@@ -57,7 +98,7 @@
                                     <div class="layui-input-block">
                                         <button class="layui-btn" lay-submit lay-filter="formStep"
                                                 style="margin-bottom: 30px;margin-left: 15%">
-                                            &emsp;提交申请&emsp;
+                                            &emsp;提交&emsp;
                                         </button>
                                     </div>
                                 </div>
@@ -72,7 +113,6 @@
                                 <div style="font-size: 24px;color: #333;font-weight: 500;margin-top: 30px;">
                                     提交申请成功
                                 </div>
-                                <div style="font-size: 14px;color: #666;margin-top: 20px;">预计审核时间为1天</div>
                             </div>
                             <div style="text-align: center;margin-top: 50px;">
                                 <button class="layui-btn next">再申请一次</button>
@@ -81,17 +121,13 @@
                     </div>
                 </div>
             </div>
-            <hr>
-            <div style="color: #666;margin-top: 30px;margin-bottom: 40px;padding-left: 30px;">
-                <h3>说明</h3><br>
-                申请提交后，24小时内审核完毕
-            </div>
         </div>
 
     </div>
 </div>
 <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 src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
 <script>
     // 用于添加标签
     function addItem(obj) {
@@ -116,6 +152,7 @@
     // 用于暂存卡片个数
     var params = [];
 
+
     // 用于页面初始化时的卡片构造
     function initForm(num, obj) {
     }
@@ -128,6 +165,7 @@
         var $ = layui.$,
             form = layui.form,
             step = layui.step;
+
         // 用于分步表单加载
         step.render({
             elem: '#stepForm',
@@ -140,87 +178,28 @@
                 title: '提交成功'
             }]
         });
-        let scanValue = {}; // 用于暂存扫描得到的结果
-        let materialOnPlaceList = []; // 用于保存当前物料所处的库位
-        let materialIsExist = ''; // 用于判断当前物料是否存在
+        let temporaryValue = []; // 用于暂存扫描得到的结果
         // 页面初始化
         $(function () {
-            let depository = $("#scanValue_depositoryId").val();
-            let place = $("#scanValue_placeId").val();
-            let materialList = $("#scanValue_materialList").val();
-            materialList = JSON.parse(materialList);
-            if (depository !== undefined && depository !== null && depository !== "") {
-                // 如果扫描到仓库
-                depository = JSON.parse(depository);
-                scanValue.depository = depository;
+            temporaryValue = JSON.parse($("#temporaryValue").val());
+            for (let i = 0; i < temporaryValue.length; i++) {
+                initForm(i, temporaryValue[i]);
             }
-            if (place !== undefined && place !== null && place !== "") {
-                // 如果扫描到库位
-                place = JSON.parse(place);
-                scanValue.place = place;
-            }
-
-            for (let i = 0; i < materialList.length; i++) {
-                initForm(i, materialList[i]);
-            }
-
         });
 
-        // 用于获取当前物料所处的库位
-        function getPlaceByMaterial(material) {
-            var req = {};
-            req.code = material.code;
-            req.type = "out";
-            let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
-            $.ajax({
-                url: "/material/findMatrialByCode",
-                type: "get",
-                dataType: 'json',
-                data: (req),
-                contentType: "application/json;charset=utf-8",
-                success: function (d) {
-                    var d = d.data;
-                    if (d == null) {
-                        materialIsExist = false;
-                        layer.close(loading2);
-                    } else {
-                        req.mid = d.id;
-                        $.ajax({
-                            url: "/place/findPlaceByMid",
-                            type: "post",
-                            dataType: 'json',
-                            data: JSON.stringify(req),
-                            contentType: "application/json;charset=utf-8",
-                            success: function (res) {
-                                materialOnPlaceList = res.data;
-                                materialIsExist = true;
-                                layer.close(loading2);
-                            }
-                        });
-
-                    }
-                }
-            })
-        }
-
 
         //用于页面初始化时的卡片构造
         initForm = function (num, obj) {
-            var parent = $("#cardParent");
             // 获取待添加父类
             NewIdNumber = num;
-            var isPlace = false;
             if (num === 0) { // 如果是第一个
                 NewIdNumber = "";
             }
-            let depositoryItem = `
-            <div class="layui-form-item">
-                                        <label class="layui-form-label">所处库位:</label>
-                                        <div class="layui-input-block">
-                                            <select name=` + "placeId" + NewIdNumber + ` id=` + "place" + NewIdNumber + `></select>
-                                        </div>
-                                    </div>
-            `;
+            let splitInfoList = '';
+            for (let i = 0; i < obj.splitInfoList.length; i++) {
+                let item = '<option value="' + obj.splitInfoList[i].newUnit + '">' + obj.splitInfoList[i].newUnit + '</option>'
+                splitInfoList += item;
+            }
             var firstItem = `
                                 <div class="layui-card-body" id=` + "cardItem" + NewIdNumber + `>
                                 <hr>
@@ -233,115 +212,107 @@
                                                                id="openSonByMaterial" lay-verify="required" 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.mid}"
+                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber +`  value="${obj.id}"
                                                                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 id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="${obj.code}" onblur="selectCode(this)"
-                                                           class="layui-input" lay-verify="required">
-                                      </div>
-                                 </div>`;
-
-
-            var lastItem = `<div class="layui-form-item">
-                                       <label class="layui-form-label">物料数量:</label>
-                                       <div class="layui-input-block">
-                                            <input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value=""
-                                                           class="layui-input" lay-verify="number">
+                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
+                                        <div class="layui-input-block">
+                                            <div class="inputdiv">
+                                                <input id=` + "code" + NewIdNumber + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="${obj.code}"
+                                                       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="scanCodeByOut(this)">
+                                            </div>
                                         </div>
                                     </div>
+
                                  <div class="layui-form-item">
-                                   <label class="layui-form-label">备注说明:</label>
-                                    <div class="layui-input-block">
-                                    <input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
-                                                              class="layui-input"/>
+                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
+                                        <div class="layui-input-block" style="margin: 0px;">
+                                            <div class="inputdiv">
+                                                <input id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码"
+                                                       value=""
+                                                       class="layui-input"
+                                                       style="border-style: none">
+                                                <img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
+                                                     style="margin-top: 10px" onclick="scanBarCode(this)">
+                                            </div>
+                                        </div>
                                     </div>
-                                 </div>
-                                <i  class="layui-icon layui-icon-addition" style="display: inline" onclick="addItem(this)"></i>
-                                </div>`;
-            if (scanValue.depository !== undefined && scanValue.depository !== null && scanValue.depository !== "") {
-                // 如果扫描了仓库
-                var depository = scanValue.depository;
-                var req = {};
-                req.depositoryId = depository.did;
-                req.code = obj.code;
-                let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
-                $.ajax({
-                    url: "/place/findPlaceByMcodeAndDid",
-                    type: "post",
-                    dataType: 'json',
-                    data: JSON.stringify(req),
-                    contentType: "application/json;charset=utf-8",
-                    success: function (d) {
-                        if (d.data.length === 0) {
-                            initDeleteCard(NewIdNumber);
-                            layer.close(loading2);
-                        } else {
-                            $('#place' + NewIdNumber).empty();
-                            $.each(d.data, function (index, item) {
-                                $('#place' + NewIdNumber).append(new Option(item.depositoryName + "-" + item.code, item.did));//往下拉菜单里添加元素
-                            });
-                            form.render();
-                            layer.close(loading2);
-                        }
-                    }
-                })
-            }
+                                `;
 
-            if (scanValue.place !== undefined && scanValue.place !== null && scanValue.place !== "") {
-                // 如果扫描了库位
-                var place = scanValue.place;
-                var midlist = place.midList;
-                if (midlist.indexOf(obj.mid) !== -1) { // 如果当前库位存在该物料
-                    isPlace = true;
-                }
-            }
+
+            var lastItem = `<div class="layui-form-item">
+                <label class="layui-form-label">物料数量:</label>
+            <div class="layui-input-block">
+                <input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value="" onblur="MaterialQuantityIsTrue(this)"
+            id=` + "quantity" + NewIdNumber + `       class="layui-input" lay-verify="number">
+                </div>
+                </div>
+                <div class="layui-form-item">
+                <label class="layui-form-label">计量单位:</label>
+            <div class="layui-input-block">
+                <select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
+                <option value="-1">${obj.unit}</option>` +
+                splitInfoList +
+                `</select>
+                </div>
+                </div>
+                <div class="layui-form-item">
+                <label class="layui-form-label">项目:</label>
+            <div class="layui-input-block">
+                <input id=` + "project" + NewIdNumber + ` name=` + "project" + NewIdNumber + ` placeholder="请填写相关项目" value=""
+        class="layui-input"/>
+                </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 + 475 + 'px');
-            var materialItem = firstItem + depositoryItem + lastItem;
+            $("#stepForm").css("height", height + 390 + 'px');
+            var materialItem = firstItem + lastItem;
             $("#btn_sub").prepend(materialItem);
-
-            if (isPlace) {
-                // 如果当前库位存在
-                $('#place' + NewIdNumber).empty();
-                $('#place' + NewIdNumber).append(new Option(place.dname + "-" + place.code, place.pid));//往下拉菜单里添加元素
-                form.render();
-            }
+            form.render();
 
 
         };
 
-        // 初始化时删除卡片
-        initDeleteCard = function (NewIdNumber) {
-            // 待删除结点
-            var delItem = $("#cardItem" + NewIdNumber)[0];
-            var parentId = 0;
-            if (NewIdNumber !== "") {
-                parentId = parseInt(NewIdNumber);
-            }
-            // 获取祖父节点
-            // console.log(delItem)
-            var reparent = delItem.parentNode;
-            var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            $("#stepForm").css("height", height - 430 + 'px');
-            params = remove(params, parentId);
-            reparent.removeChild(delItem);
-        };
 
-
-        // 提交
+        // 提交（物料出库）
         form.on('submit(formStep)', function (data) {
             if (!flagForForm) {
                 flagForForm = true;
                 data = data.field;
                 data.params = params;
+                if (data.mid === undefined) {
+                    // 如果没有初始项
+                    var dataKeys = Object.keys(data);
+                    var dataKey;
+                    for (let i = 0; i < dataKeys.length; i++) {
+                        dataKey = dataKeys[i];
+                        if (dataKey.includes("mid")) {
+                            break;
+                        }
+                    }
+                    // 获取当前数字
+                    var keyNumber = dataKey.split("mid")[1];
+                    for (let index = 0; index < dataKeys.length; index++) {
+                        var tempKey = dataKeys[index];
+                        if (tempKey.includes(keyNumber)) {
+                            var key = tempKey.replace(keyNumber, "");
+                            data[key] = data[tempKey];
+                            delete data[tempKey];
+                        }
+                    }
+                    data.params = remove(data.params, Number(keyNumber));
+                }
                 $.ajax({
                     url: "/depositoryRecord/applicationOut",
                     type: 'post',
@@ -355,7 +326,7 @@
                         layer.close(this.layerIndex);
                         if (data.status >= 300) {
                             layer.msg(data.statusInfo.message);//失败的表情
-                            return;
+
                         } else {
                             layer.msg("申请提交成功", {
                                 icon: 6,//成功的表情
@@ -363,13 +334,16 @@
                             }, function () {
                                 step.next('#stepForm');
                             });
+
+
                         }
                     },
                     complete: function () {
                         layer.close(this.layerIndex);
                     }
-                })
+                });
             }
+
             return false;
         });
 
@@ -397,7 +371,7 @@
                                 <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">物料名称</label>
+                                        <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"
@@ -409,29 +383,51 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                      <label class="layui-form-label">物料编码:</label>
-                                      <div class="layui-input-block">
-                                           <input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
-                                                           class="layui-input" lay-verify="required">
-                                      </div>
-                                 </div>
-                                 <div class="layui-form-item">
-                                        <label class="layui-form-label">所处库位:</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                         <div class="layui-input-block">
-                                            <select name=` + "placeId" + NewIdNumber + ` id="place"></select>
+                                            <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="scanCodeByOut(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">
+                                                <input id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码"
+                                                       value=""
+                                                       class="layui-input"
+                                                       style="border-style: none">
+                                                <img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
+                                                     style="margin-top: 10px" onclick="scanBarCode(this)">
+                                            </div>
                                         </div>
                                     </div>
                                  <div class="layui-form-item">
                                        <label class="layui-form-label">物料数量:</label>
                                        <div class="layui-input-block">
-                                            <input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value=""
-                                                           class="layui-input" lay-verify="number">
+                                            <input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value="" onblur="MaterialQuantityIsTrue(this)"
+                                                   id=` + "quantity" + NewIdNumber + `       class="layui-input" lay-verify="number">
                                         </div>
                                     </div>
+                                    <div class="layui-form-item">
+                                                    <label class="layui-form-label">计量单位:</label>
+                                                    <div class="layui-input-block">
+                                                        <select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
+
+                                                        </select>
+                                                    </div>
+                                                </div>
                                  <div class="layui-form-item">
-                                   <label class="layui-form-label">备注说明:</label>
+                                   <label class="layui-form-label">项目:</label>
                                     <div class="layui-input-block">
-                                    <input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
+                                    <input id=` + "project" + NewIdNumber + ` name=` + "project" + NewIdNumber + ` placeholder="请填写相关项目" value=""
                                                               class="layui-input"/>
                                     </div>
                                  </div>
@@ -439,8 +435,8 @@
                                 </div>`;
             // 获取当前高度
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            params.push(NewIdNumber)
-            $("#stepForm").css("height", height + 430 + 'px');
+            params.push(NewIdNumber);
+            $("#stepForm").css("height", height + 387 + 'px');
             $("#" + parentId).after(materialItem);
         };
 
@@ -453,9 +449,19 @@
             // 获取祖父节点
             var reparent = parent.parentNode;
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            $("#stepForm").css("height", height - 430 + 'px');
+            $("#stepForm").css("height", height - 387 + 'px');
             params = remove(params, parentId);
             reparent.removeChild(parent);
+            // 当前节点的id值
+           let value = parent.childNodes[5].childNodes[3].childNodes[3].value;
+           $.ajax({
+               url: "/material/delTemporaryValue",
+               type: 'post',
+               data:JSON.stringify({"id":value}),
+               dataType: 'json',
+               contentType: "application/json;charset=utf-8"
+           })
+
         };
 
         //删除数组中指定元素
@@ -475,11 +481,16 @@
             // 输入code
             var code = obj.value;
             // 获取对应元素
-            var parent = obj.parentNode.parentNode.parentNode;
+            var parent = obj.parentNode.parentNode.parentNode.parentNode;
+            var objId = parent.id.split("cardItem")[1];
             var children = parent.childNodes[5];
             var materialItem = children.childNodes[3].childNodes[1].childNodes;
+            var barCodeChildren = parent.childNodes[9];
+
             var materialName = materialItem[1];
             var materialId = materialName.parentNode.parentNode.childNodes[3];
+            // 条形码条码
+            var barCodeItem = barCodeChildren.childNodes[3];
             var req = {};
             req.code = code;
             req.type = "out";
@@ -494,34 +505,56 @@
                     success: function (d) {
                         var d = d.data;
                         if (d == null) {
-                            layer.msg("没有该编码，请确认是否输入正确", {icon: 0, time: 500}, function () {
+                            layer.msg("仓库中暂无该物料", {icon: 0, time: 500}, function () {
                                 layer.close(loading2);
                                 materialName.value = "";
                                 materialId.value = "";
                                 obj.value = "";
-                                $('#place').empty();
+                                $('#place' + objId).empty();
                             });
 
                         } else {
-                            req.mid = d.id;
-                            $.ajax({
-                                url: "/place/findPlaceByMid",
-                                type: "post",
-                                dataType: 'json',
-                                data: JSON.stringify(req),
-                                contentType: "application/json;charset=utf-8",
-                                success: function (res) {
-                                    $('#place').empty();
-                                    $.each(res.data, function (index, item) {
-                                        $('#place').append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
-                                    });
-                                    form.render();
-                                    materialName.value = d.mname;
-                                    materialId.value = d.id;
-                                    layer.close(loading2);
+                            materialName.value = d.mname;
+                            materialId.value = d.id;
+                            var idNumber = materialId.name.split("mid")[1];
+                            // 获取物料与条形码的对应关系
+                            var materialAndBarCodeList = d["materialAndBarCodeList"];
+                            var unit = $("#unit" + idNumber);
+                            unit.empty();
+                            $("#unit" + idNumber).append(new Option(d.baseUnit, "-1"));
+                            var unitList = d["splitInfoList"];
+                            for (let i = 0; i < unitList.length; i++) {
+                                $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                            }
+                            form.render();
+                            if (materialAndBarCodeList.length > 0) {
+                                // 如果有对应的条形码
+                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                var id = barCodeInput.id;
+                                $("#" + id).remove();
+                                $("#barCode" + idNumber).empty();
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                } else {
+                                    var barCodeSelect = `
+                             <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                    $("#" + barCodeImg.id).before(barCodeSelect);
                                 }
-                            });
-
+                                form.render();
+                                $.each(materialAndBarCodeList, function (index, item) {
+                                    $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                });
+                                form.render();
+                            } else {
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                }
+                            }
+                            layer.close(loading2);
                         }
                     }
                 });
@@ -529,18 +562,24 @@
 
         };
 
+
         // 用于实现点击搜索按钮
         selectMaterial = function (obj) {
             var parent = obj.parentNode.parentNode.parentNode.parentNode;
             var parentId = parent.id;
             var codeChildren = parent.childNodes[7];
             var materialChildren = parent.childNodes[5];
-            var codeItem = codeChildren.childNodes[3].childNodes;
+            var codeItem = codeChildren.childNodes[3].childNodes[1].childNodes;
             var codeValue = codeItem[1];
             var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes;
             var materialName = materialItem[1];
             var materialId = materialName.parentNode.parentNode.childNodes[3];
             var mname = materialName.value;
+            var barCodeChildren = parent.childNodes[9];
+            // 条形码条码
+            var barCodeItem = barCodeChildren.childNodes[3];
+
+            mname = mname.split(",")[0];
             layer.open({
                 type: 2,
                 title: '弹窗内容',
@@ -548,8 +587,10 @@
                 maxmin: true,
                 shadeClose: true, //点击遮罩关闭层
                 area: ['70%', '70%'],
-                // content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId,
+                // content: '/selectMaterialByCard?mname=' + mname + '&type=2&clickObj=' + parentId,
                 content: '/getMaterialAll?mname=' + mname + '&type=2&clickObj=' + parentId,
+                move: '.layui-layer-title',
+                fixed: false,
                 success: function (layero, index) {
                     var children = layero.children();
                     var content = $(children[1]);
@@ -557,87 +598,506 @@
                     content.css('height', '100%');
                     iframeChildren.css('height', '100%');
                 },
-                move: '.layui-layer-title',
-                fixed: false,
                 end: function () {
                     var mid = materialId.value;
                     let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
-                    $.ajax({
-                        url: "/material/findMatrialById?mid=" + mid,
-                        type: "get",
-                        dataType: 'json',
-                        contentType: "application/json;charset=utf-8",
-                        success: function (d) {
-                            var material = d.data.materialById;
-                            var placeList = d.data.placeList;
-                            var code = material.code;
-                            if (code === undefined) {
-                                code = "";
+                    if (mid !== '') {
+                        $.ajax({
+                            url: "/material/findMatrialById?mid=" + mid + "&type=out",
+                            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;
+                                var materialAndBarCodeList = material["materialAndBarCodeList"];
+                                var idNumber = materialId.name.split("mid")[1];
+                                var unit = $("#unit" + idNumber);
+                                unit.empty();
+                                $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
+                                var unitList = material["splitInfoList"];
+                                for (let i = 0; i < unitList.length; i++) {
+                                    $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                                }
+                                form.render();
+                                if (materialAndBarCodeList.length > 0) {
+                                    // 如果有对应的条形码
+                                    var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                    var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                    var id = barCodeInput.id;
+                                    $("#" + id).remove();
+                                    $("#barCode" + idNumber).empty();
+                                    var barCode = $("#barCode" + idNumber);
+                                    if (barCode.length > 0) {
+                                        barCode.empty();
+                                    } else {
+                                        var barCodeSelect = `
+                             <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                        $("#" + barCodeImg.id).before(barCodeSelect);
+                                    }
+                                    form.render();
+                                    $.each(materialAndBarCodeList, function (index, item) {
+                                        $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                    });
+                                    form.render();
+                                } else {
+                                    var barCode = $("#barCode" + idNumber);
+                                    if (barCode.length > 0) {
+                                        barCode.empty();
+                                    }
+                                }
+                                form.render();
+                                layer.close(loading2);
                             }
-                            codeValue.value = code;
-                            $('#place').empty();
-                            $.each(placeList, function (index, item) {
-                                $('#place').append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
-                            });
-                            form.render();
-                            layer.close(loading2);
-                        }
-                    });
-
+                        });
+                    }
                 }
             });
         };
 
         //用于实现物料名称搜索
         selectMaterialByName = function (obj) {
-            // 输入code
             var data = obj.value;
             // 获取对应元素
             var parent = obj.parentNode.parentNode.parentNode.parentNode;
             var materialChildren = parent.childNodes[5];
             var codeChildren = parent.childNodes[7];
-            var codeItem = codeChildren.childNodes[3].childNodes;
+            var codeItem = codeChildren.childNodes[3].childNodes[1].childNodes;
             var codeValue = codeItem[1];
             var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes;
             var materialName = materialItem[1];
             var materialId = materialName.parentNode.parentNode.childNodes[3];
+            var barCodeChildren = parent.childNodes[9];
+            // 条形码条码
+            var barCodeItem = barCodeChildren.childNodes[3];
             var req = {};
-            req.mname = data;
-            let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
-            $.ajax({
-                url: "/material/findInventoryByCondition",
-                type: "post",
-                dataType: 'json',
-                data: JSON.stringify(req),
-                contentType: "application/json;charset=utf-8",
-                success: function (d) {
-                    if (d.count > 1) {
-                        layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
-                            materialId.value = "";
-                            codeValue.value = "";
+            data = data.split(",")[0];
+            if (data !== "") {
+                let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                req.mname = data;
+                $.ajax({
+                    url: "/material/findInventoryByCondition",
+                    type: "post",
+                    dataType: 'json',
+                    data: JSON.stringify(req),
+                    contentType: "application/json;charset=utf-8",
+                    success: function (d) {
+                        if (d.count > 1) {
+                            layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
+                                layer.close(loading2);
+                                materialId.value = "";
+                                codeValue.value = "";
+                            });
+                            return false;
+                        } else if (d.count === 0) {
+                            layer.msg("没有该物品，请确认输入是否正确", {icon: 5, time: 500}, function () {
+                                layer.close(loading2);
+                                materialId.value = "";
+                                codeValue.value = "";
+                                materialName.value = "";
+                            });
+                            return false;
+                        } else {
+                            var idNumber = materialId.name.split("mid")[1];
+                            var material = d.data[0];
+                            var unit = $("#unit" + idNumber);
+                            unit.empty();
+                            $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
+                            var unitList = material["splitInfoList"];
+                            if (unitList !== null && unitList != undefined) {
+                                for (let i = 0; i < unitList.length; i++) {
+                                    $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                                }
+                                form.render();
+                            }
+                            var materialAndBarCodeList = material["materialAndBarCodeList"];
+                            if (materialAndBarCodeList.length > 0) {
+                                // 如果有对应的条形码
+                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                var id = barCodeInput.id;
+                                $("#" + id).remove();
+                                $("#barCode" + idNumber).empty();
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                } else {
+                                    var barCodeSelect = `
+                             <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                    $("#" + barCodeImg.id).before(barCodeSelect);
+                                }
+                                form.render();
+                                $.each(materialAndBarCodeList, function (index, item) {
+                                    $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                });
+                                form.render();
+                            } else {
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                }
+                            }
+                            materialName.value = material.mname;
+                            materialId.value = material.id;
+                            codeValue.value = material.code;
                             layer.close(loading2);
-                        });
+                        }
+                    }
+                });
+            }
 
-                        return false;
-                    } else if (d.count === 0) {
-                        layer.msg("没有该物品，请确认输入是否正确", {icon: 5, time: 500}, function () {
-                            materialId.value = "";
-                            codeValue.value = "";
-                            materialName.value = "";
-                            layer.close(loading2);
-                        });
-                        return false;
-                    } else {
-                        var material = d.data[0];
-                        materialName.value = material.mname;
-                        materialId.value = material.id;
-                        codeValue.value = material.code;
-                        layer.close(loading2);
+        };
+
+        // 扫描物料条码
+        scanBarCode = function (obj) {
+            let wxScan = parent;
+
+            if (wxScan.wx === undefined) {
+                wxScan = wxScan.parent.wx;
+            } else {
+                wxScan = wxScan.wx;
+            }
+            wxScan.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.codeFlag = 1;
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/qywxApplicationOutScanBarCode",
+                        type: "post",
+                        dataType: 'json',
+                        data: JSON.stringify(req),
+                        contentType: "application/json;charset=utf-8",
+                        success: function (d) {
+                            // 获取对应元素
+                            var parent = obj.parentNode.parentNode.parentNode.parentNode;
+
+                            var MaterialChildren = parent.childNodes[5];
+                            var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes;
+
+                            var barCodeChildren = parent.childNodes[9];
+
+                            var materialName = materialItem[1];
+                            var materialId = materialName.parentNode.parentNode.childNodes[3];
+                            // 条形码条码
+                            var barCodeItem = barCodeChildren.childNodes[3];
+                            // 物料编码
+                            var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes;
+
+
+                            var materialCode = materialCodeItem[1];
+
+                            var data = d.data;
+                            if (data !== null) {
+                                materialName.value = data.mname;
+                                materialId.value = data.iid;
+                                materialCode.value = data.mcode;
+                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                barCodeInput.value = result;
+                                var idNumber = materialId.name.split("mid")[1];
+                                var unit = $("#unit" + idNumber);
+                                unit.empty();
+                                $("#unit" + idNumber).append(new Option(data.unit, "-1"));
+                                var unitList = data["splitInfoList"];
+                                for (let i = 0; i < unitList.length; i++) {
+                                    $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
+                                }
+                                form.render();
+                                layer.close(loading2);
+                            } else {
+                                // 如果没有对应关系
+                                layer.msg("对于编码：" + result + ",并未发现仓库中存在对应的物料", {
+                                    icon: 0,
+                                    time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
+                                }, function () {
+                                    layer.close(loading2);
+                                })
+                            }
+
+                        }
+                    })
+                }
+            })
+
+
+        };
+
+        // 用于扫码功能
+        scanCodeByOut = function (obj) {
+            let wxScan = parent;
+
+            if (wxScan.wx === undefined) {
+                wxScan = wxScan.parent.wx;
+            } else {
+                wxScan = wxScan.wx;
+            }
+            wxScan.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.codeFlag = 2;
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/qywxApplicationOutScanQrCode",
+                        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 () {
+                                    layer.close(loading2);
+                                })
+                            } else {
+                                // 获取对应元素
+                                var parent = obj.parentNode.parentNode.parentNode.parentNode;
+                                var MaterialChildren = parent.childNodes[5];
+                                var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes;
+
+                                var barCodeChildren = parent.childNodes[9];
+
+                                var materialName = materialItem[1];
+                                var materialId = materialName.parentNode.parentNode.childNodes[3];
+                                // 条形码条码
+                                var barCodeItem = barCodeChildren.childNodes[3];
+                                // 物料编码
+                                var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes;
+
+                                var materialCode = materialCodeItem[1];
+
+                                var idNumber = materialId.name.split("mid")[1];
+
+
+                                // 获取物料与条形码的对应关系
+                                var materialAndBarCodeList = data["materialAndBarCodeList"];
+                                var barCode = $("#barCode" + idNumber);
+                                if (barCode.length > 0) {
+                                    barCode.empty();
+                                }
+
+                                if (materialAndBarCodeList.length > 0) {
+                                    // 如果有对应的条形码
+                                    var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                    var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                    var id = barCodeInput.id;
+                                    $("#" + id).remove();
+                                    $("#barCode" + idNumber).empty();
+                                    var barCode = $("#barCode" + idNumber);
+                                    if (barCode.length > 0) {
+                                        barCode.empty();
+                                    } else {
+                                        var barCodeSelect = `
+                                        <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
+                                        </select>`;
+                                        $("#" + barCodeImg.id).before(barCodeSelect);
+                                    }
+                                    form.render();
+
+                                    $.each(materialAndBarCodeList, function (index, item) {
+                                        $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
+                                    });
+                                    form.render();
+                                }
+                                $('#place' + idNumber).empty();
+                                $.each(data.placePList, function (index, item) {
+                                    $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
+                                });
+                                $("#unit" + idNumber).empty();
+                                $("#unit" + idNumber).append(new Option(data.baseUnit, "-1"));
+                                $.each(data.splitInfoList, function (index, item) {
+                                    $("#unit" + idNumber).append(new Option(item.newUnit, item.newUnit));
+                                });
+                                form.render();
+                                materialName.value = data.mname;
+                                materialId.value = data.id;
+                                materialCode.value = data.code;
+                                layer.close(loading2);
+                            }
+                        }
+                    })
+                }
+            })
+        };
+
+        //用于判断当前物料数量是否合适
+        MaterialQuantityIsTrue = function (obj) {
+            var id = obj.id.split("quantity")[1];
+            var mcode = $("#code" + id).val(); // 获取到当前输入的物料编码
+            var unit = $("#unit" + id).val();
+            if (mcode === "" || mcode === undefined || mcode === null) {
+                layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
+                    $("#quantity" + id).val("")
+                });
+            } else {
+                let val = $("#quantity" + id).val();
+                if (val !== null && val !== undefined && val !== '') {
+                    var req = {};
+                    req.mcode = mcode;
+                    req.quantity = val;
+                    req.unit = unit;
+                    req.placeId = -1;
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/MaterialQuantityIsTrue",
+                        type: "post",
+                        data: JSON.stringify(req),
+                        dataType: 'json',
+                        contentType: "application/json;charset=utf-8",
+                        success: function (res) {
+                            var flag = res.data;
+                            if (!flag) { // 如果当前数目不合适
+                                layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () {
+                                        layer.close(loading2);
+                                        $("#quantity" + id).val("");
+                                    },
+                                );
+                            } else {
+                                layer.close(loading2)
+                            }
+
+                        }
+                    });
+                }
+            }
+        };
+
+        selectPost = function (obj) {
+            let id = obj.id;
+            layer.open({
+                type: 2,
+                title: '弹窗内容',
+                skin: 'layui-layer-rim',
+                maxmin: true,
+                shadeClose: true, //点击遮罩关闭层
+                area: ['70%', '70%'],
+                content: '/selectPost?id=' + id,
+                move: '.layui-layer-title',
+                fixed: false,
+                success: function (layero, index) {
+                    var children = layero.children();
+                    var content = $(children[1]);
+                    var iframeChildren = $(content.children());
+                    content.css('height', '100%');
+                    iframeChildren.css('height', '100%');
+                }
+            });
+        };
+
+        selectConstructionUnit = function (obj) {
+            let id = obj.id;
+            layer.open({
+                type: 2,
+                title: '弹窗内容',
+                skin: 'layui-layer-rim',
+                maxmin: true,
+                shadeClose: true, //点击遮罩关闭层
+                area: ['70%', '70%'],
+                content: '/selectConstructionUnit?id=' + id,
+                move: '.layui-layer-title',
+                fixed: false,
+                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 () {
+                    let val = $("#"+id).val();
+                    if(val !== ""){
+                        if(id.indexOf("ForGroup") !== -1){
+                            // 如果是组合
+                            $("#stepForm2").find('input[id*="project"]').each(function () {
+                                $(this).attr("lay-verify","required")
+                            })
+
+                        }else{
+                            // 如果是物料
+                            $("#stepForm").find('input[id*="project"]').each(function () {
+                                $(this).attr("lay-verify","required")
+                            })
+                        }
+                    }else{
+                        if(id.indexOf("ForGroup") !== -1){
+                            // 如果是组合
+                            $("#stepForm2").find('input[id*="project"]').each(function () {
+                                $(this).removeAttr("lay-verify")
+                            })
+
+                        }else{
+                            // 如果是物料
+                            $("#stepForm").find('input[id*="project"]').each(function () {
+                                $(this).removeAttr("lay-verify")
+                            })
+                        }
                     }
                 }
             });
         };
 
+        form.on('select()', function (data) {
+            let unit = data.value;
+            let id = data.elem.id;
+            let idNum = id.split("unit")[1];
+            let mcode = $("#code" + idNum).val();
+            if (mcode === "" || mcode === undefined || mcode === null) {
+                layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
+                    $("#quantity" + idNum).val("")
+                });
+            } else {
+                let val = $("#quantity" + idNum).val();
+                if (val !== null && val !== undefined && val !== '') {
+                    var req = {};
+                    req.mcode = mcode;
+                    req.quantity = val;
+                    req.unit = unit;
+                    req.placeId = -1;
+                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+                    $.ajax({
+                        url: "/material/MaterialQuantityIsTrue",
+                        type: "post",
+                        data: JSON.stringify(req),
+                        dataType: 'json',
+                        contentType: "application/json;charset=utf-8",
+                        success: function (res) {
+                            var flag = res.data;
+                            if (!flag) { // 如果当前数目不合适
+                                layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () {
+                                        layer.close(loading2);
+                                        $("#quantity" + idNum).val("");
+                                    },
+                                );
+                            } else {
+                                layer.close(loading2)
+                            }
+
+                        }
+                    });
+                }
+            }
+
+        });
 
     })
 </script>
diff --git a/target/classes/templates/pages/scanQrCode/ScanBarCode.html b/target/classes/templates/pages/scanQrCode/ScanBarCode.html
deleted file mode 100644
index 0cfc7705..00000000
--- a/target/classes/templates/pages/scanQrCode/ScanBarCode.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.w3.org/1999/xhtml">
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="utf-8">
-    <title>扫码</title>
-    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
-    <link rel="stylesheet" href="/static/css/layuimini.css?v=2.0.4.2" media="all">
-    <link rel="stylesheet" href="/static/css/themes/default.css" media="all">
-    <link rel="stylesheet" href="/static/lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
-    <!--[if lt IE 9]>
-    <script src="/static/js/html5.min.js"></script>
-    <script src="/static/js/respond.min.js"></script>
-    <![endif]-->
-    <!--    vue相关-->
-    <script src="../static/js/vue/vue.js"></script>
-    <script src="../static/js/vue/vue-router.js"></script>
-    <script src="../static/lib/http-vue-loader/src/httpVueLoader.js"></script>
-    <script src="../static/js/VueQrcodeReader.umd.min.js"></script>
-    <script src="/static/js/scanBarCode/html5-qrcode.min.js"></script>
-</head>
-<body>
-<div style="width: 500px" id="reader">
-
-</div>
-<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script>
-
-    const html5QrCode = new Html5Qrcode("reader");
-    const qrCodeSuccessCallback = (decodedText, decodedResult) => {
-        /* 扫描成功 */
-        console.log(decodedText,decodedResult);
-
-        html5QrCode.stop().then((ignore) => {
-            // 暂停扫描
-            // 发送ajax请求去获取当前条码的数据
-            layui.$.ajax({
-                url: "/material/findMaterialByBarCode?barCode="+decodedText,
-                type: "get",
-                dataType: 'json',
-                contentType: "application/json;charset=utf-8",
-                success: function (d) {
-                    var data = d.data;
-                    // 将扫描结果赋值给父页面
-                    layui.$("#barcode", window.parent.document).val(decodedText);
-                    if(data === null || data === undefined){
-                        // 如果没有查询到物料
-                    }else{
-                        layui.$("#mname", window.parent.document).val(data.mname);
-                        layui.$("#code", window.parent.document).val(data.code);
-                    }
-                    var index = parent.layer.getFrameIndex(window.name);
-                    parent.layer.close(index);
-                }
-            })
-        }).catch((err) => {
-            console.log(err)
-            // 停止失败，处理它。
-        });
-    };
-    const config = { fps: 10, aspectRatio: 2  };
-
-    // Select back camera or fail with `OverconstrainedError`.
-    html5QrCode.start({ facingMode: { exact: "environment"} }, config, qrCodeSuccessCallback);
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/target/classes/templates/pages/scanQrCode/ScanBarCodeByNew.html b/target/classes/templates/pages/scanQrCode/ScanBarCodeByNew.html
deleted file mode 100644
index 8d81f28e..00000000
--- a/target/classes/templates/pages/scanQrCode/ScanBarCodeByNew.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.w3.org/1999/xhtml">
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="utf-8">
-    <title>扫码</title>
-    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
-    <link rel="stylesheet" href="/static/css/layuimini.css?v=2.0.4.2" media="all">
-    <link rel="stylesheet" href="/static/css/themes/default.css" media="all">
-    <link rel="stylesheet" href="/static/lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
-    <!--[if lt IE 9]>
-    <script src="/static/js/html5.min.js"></script>
-    <script src="/static/js/respond.min.js"></script>
-    <![endif]-->
-    <!--    vue相关-->
-    <script src="../static/js/vue/vue.js"></script>
-    <script src="../static/js/vue/vue-router.js"></script>
-    <script src="../static/lib/http-vue-loader/src/httpVueLoader.js"></script>
-    <script src="../static/js/VueQrcodeReader.umd.min.js"></script>
-    <script src="/static/js/scanBarCode/html5-qrcode.min.js"></script>
-</head>
-<body>
-
-<div style="width: 500px" id="reader">
-
-</div>
-<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script>
-    // 用于判断是否包含字母
-    var barCodeList = [];
-
-
-    layui.$(function () {
-        parent.parent.parent.parent.wx.scanQRCode({
-            desc: 'scanQRCode desc',
-            needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-            scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
-            success: function (res) {
-                // 回调
-                var result = res.resultStr;//当needResult为1时返回处理结果
-                outboundLogic(result);
-
-            },
-            error: function(res) {
-                if (res.errMsg.indexOf('function_not_exist') > 0) {
-                    alert('版本过低请升级')
-                }
-
-            }
-
-        });
-    });
-
-    outboundLogic = function (result) {
-        barCodeList.push(result);
-        layer.confirm("是否继续扫描", {
-            btn: ["扫描", "取消"]
-        }, function () { // 继续
-            layer.close(layer.index); // 关闭弹窗
-            parent.parent.parent.parent.wx.scanQRCode({
-                desc: 'scanQRCode desc',
-                needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-                scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
-                success: function (res) {
-                    // 回调
-                    var result = res.resultStr;//当needResult为1时返回处理结果
-                    outboundLogic(result)
-                }
-            })
-        }, function () { // 取消
-            // 关闭当前页
-            layui.$("#barCodeList", window.parent.document).val(barCodeList);
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-
-        })
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/target/classes/templates/pages/scanQrCode/ScanBarCodeOut.html b/target/classes/templates/pages/scanQrCode/ScanBarCodeOut.html
deleted file mode 100644
index 53ea4320..00000000
--- a/target/classes/templates/pages/scanQrCode/ScanBarCodeOut.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.w3.org/1999/xhtml">
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="utf-8">
-    <title>扫码</title>
-    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
-    <link rel="stylesheet" href="/static/css/layuimini.css?v=2.0.4.2" media="all">
-    <link rel="stylesheet" href="/static/css/themes/default.css" media="all">
-    <link rel="stylesheet" href="/static/lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
-    <!--[if lt IE 9]>
-    <script src="/static/js/html5.min.js"></script>
-    <script src="/static/js/respond.min.js"></script>
-    <![endif]-->
-    <!--    vue相关-->
-    <script src="../static/js/vue/vue.js"></script>
-    <script src="../static/js/vue/vue-router.js"></script>
-    <script src="../static/lib/http-vue-loader/src/httpVueLoader.js"></script>
-    <script src="../static/js/VueQrcodeReader.umd.min.js"></script>
-    <script src="/static/js/scanBarCode/html5-qrcode.min.js"></script>
-</head>
-<body>
-<div style="width: 500px" id="reader">
-
-</div>
-<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script>
-    // 用于判断是否包含字母
-    let barCodeList = [];
-    var depository;
-    var place;
-    // 是否扫描二维码标志位
-    var flag = false;
-    const html5QrCode = new Html5Qrcode("reader");
-    const qrCodeSuccessCallback = (decodedText, decodedResult) => {
-        var formatName = decodedResult.result.format.formatName;
-        /* 扫描成功 */
-        // console.log(decodedText,decodedResult);
-        if (formatName.includes("QR_CODE")||formatName.includes("AZTEC")) {
-            // console.log("二维码",decodedText);
-            // 如果扫描的位本地二维码
-            flag = true;
-            // 先解密
-            let jmResult = {};
-            jmResult.result = decodedText;
-            layui.$.ajax({
-                url: "/material/decode3Des",
-                type: 'post',
-                dataType: 'json',
-                contentType: "application/json;charset=utf-8",
-                data: JSON.stringify(jmResult),
-                success:function (d) {
-                    let parse = JSON.parse(d.data);
-                    if (parse.did !== undefined) {
-                        // 如果扫描的是仓库二维码
-                        depository = parse;
-                    }
-                    if (parse.pid !== undefined) {
-                        // 如果扫描的是库位二维码
-                        place = parse;
-                    }
-                }
-            })
-        }else{
-            // 如果是条形码
-            barCodeList.push(decodedText);
-        }
-        html5QrCode.stop().then((ignore) => {
-
-            // 暂停扫描
-            layer.confirm("是否继续扫描？",
-                {
-                    btn: ["继续", "取消"]
-                },
-                function () {// 继续
-                    // 弹出选择框
-                    layer.close(layer.index);
-                    html5QrCode.start({ facingMode: { exact: "environment"} }, config, qrCodeSuccessCallback);
-                },
-                function () { // 取消当前操作
-                    layer.close(layer.index); // 关闭弹窗
-                    // 将数据暂存到redis
-                    var param = {};
-                    param.barCodeList = barCodeList;
-                    param.flag = flag;
-                    layui.$.ajax({
-                        url:"/material/temporaryBarCodeValueForMaterial",
-                        type:"post",
-                        datatype:"json",
-                        data:JSON.stringify(param),
-                        contentType: "application/json;charset=utf-8",
-                    });
-                    if(flag){
-                        var params = {};
-                        params.depository = depository;
-                        params.place = place;
-                        params.materialList = [];
-                        layui.$.ajax({
-                            url: "/material/temporaryValue",
-                            type: 'post',
-                            dataType: 'json',
-                            contentType: "application/json;charset=utf-8",
-                            data: JSON.stringify(params)
-                        });
-                    }
-                    // 关闭当前页
-                    var index = parent.layer.getFrameIndex(window.name);
-                    parent.layer.close(index);
-                }
-            )
-
-        }).catch((err) => {
-            console.log(err)
-            // 停止失败，处理它。
-        });
-    };
-    const config = { fps: 10, aspectRatio: 2  };
-
-    // Select back camera or fail with `OverconstrainedError`.
-    html5QrCode.start({ facingMode: { exact: "environment"} }, config, qrCodeSuccessCallback);
-</script>
-</body>
-</html>
\ No newline at end of file