优化物料选择页面

src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java

@@ -8,20 +8,19 @@ import com.dreamchaser.depository_manage.entity.*;
 import com.dreamchaser.depository_manage.exception.MyException;
 import com.dreamchaser.depository_manage.pojo.*;
 import com.dreamchaser.depository_manage.security.bean.UserToken;
-import com.dreamchaser.depository_manage.service.DepositoryService;
-import com.dreamchaser.depository_manage.service.MaterialService;
-import com.dreamchaser.depository_manage.service.PlaceService;
-import com.dreamchaser.depository_manage.service.RoleService;
+import com.dreamchaser.depository_manage.service.*;
 import com.dreamchaser.depository_manage.utils.CrudUtil;
 import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
 import com.sun.mail.imap.protocol.ID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -46,6 +45,12 @@ public class MaterialController {
     @Autowired
     private RedisTemplate<Object, Object> redisTemplate;
 
+    @Autowired
+    private RedisTemplate<String, String> redisTemplateForString;
+
+    @Autowired
+    private MaterialTypeService materialTypeService;
+
     /**
      * 根据物料进行查询
      *
@@ -192,7 +197,7 @@ public class MaterialController {
         UserByPort userToken = (UserByPort) request.getAttribute("userToken");
         Integer maindeparment = userToken.getMaindeparment();
         List<Object> list = new ArrayList<>();
-        if ("1".equals(type)) {
+        /*if ("1".equals(type)) {
             list = materialService.InitTreeMenus(mname);
         } else if ("2".equals(type)) {
             list = materialService.InitTreeMenus(mname, String.valueOf(maindeparment));
@@ -201,11 +206,20 @@ public class MaterialController {
             String placeId = (String) map.get("placeId");
             list = materialService.InitTreeMenus(mname, depositoryId, placeId);
         }else if("4".equals(type)){
-            list = materialService.InitTreeMenus_Test(mname);
-        }
+            list = materialService.InitTreeMenus_Test();
+        }*/
+        list = materialService.InitTreeMenus_Test();
         return new RestResponse(list);
     }
 
+    // 每天凌晨0点执行一次
+    @Scheduled(cron = "0 0 0 * * ?")
+    private void getTransData() throws Exception {
+        materialService.InitTreeMenus_Test();
+        // bankDataService.insertTD();
+    }
+
+
     /**
      * 根据id获取物料
      *
@@ -684,8 +698,7 @@ public class MaterialController {
         Map<String, Object> param = new HashMap<>();
         Object pid = map.get("placeId");
         String placeId = "0";
-        if(pid != null)
-        {
+        if (pid != null) {
             placeId = pid.toString();
         }
 
@@ -712,7 +725,7 @@ public class MaterialController {
                 if (placeAndMaterialByMidAndPid == null) {
                     // 如果当前物料不在该库位
                     flag = false;
-                }else{
+                } else {
                     mp.setQuantity(placeAndMaterialByMidAndPid.getQuantity());
                 }
             } else {
@@ -720,7 +733,7 @@ public class MaterialController {
                 if (placeAndMaterialByMidAndPid == null) {
                     // 如果当前物料不在该库位
                     flag = false;
-                }else{
+                } else {
                     mp.setQuantity(placeAndMaterialByMidAndPid.getQuantity());
                 }
             }
@@ -1063,9 +1076,9 @@ public class MaterialController {
         String barCode = (String) map.get("qrCode");
         Map<String, Object> result = new HashMap<>();
         MaterialP material = null;
-        Object pid =  map.get("placeId");
+        Object pid = map.get("placeId");
         String placeId = "0";
-        if(pid != null){
+        if (pid != null) {
             placeId = pid.toString();
         }
         // 用于存储没有对应关系的条形码
@@ -1227,7 +1240,7 @@ public class MaterialController {
         // 获取当前部门仓库
         Map<String, Object> param = new HashMap<>();
         String code = map.get("code").toString();
-        String depositoryId =  map.get("depositoryId").toString();
+        String depositoryId = map.get("depositoryId").toString();
         String placeId = map.get("placeId").toString();
         if ("".equals(code)) {
             return new RestResponse(null, 1, 200);
@@ -1276,39 +1289,40 @@ public class MaterialController {
 
     /**
      * 用于查询当前扫描的二维码为仓库还是物料
+     *
      * @param map
      * @param request
      * @return
      */
     @PostMapping("/qywxScanCodeOut")
-    public RestResponse qywxScanCodeOut(@RequestBody Map<String,Object> map,HttpServletRequest request){
+    public RestResponse qywxScanCodeOut(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String qrCode = (String) map.get("qrCode");
         String materialCode = materialService.findMaterialCodeByQrCode(qrCode);
-        Map<String,Object> result = new HashMap<>();
+        Map<String, Object> result = new HashMap<>();
         // 0为非法码，1为物料，2为库位，3为仓库
         Integer flag = 0;
-        if(materialCode != null){
+        if (materialCode != null) {
             // 如果当前不为空,则扫描的为物料二维码
             flag = 1;
             Material materialByCode = materialService.findMaterialByCode(materialCode);
-            result.put("material",materialByCode);
-        }else{
+            result.put("material", materialByCode);
+        } else {
             // 如果为空，则扫描的为条形码
             MaterialAndBarCode materialByBarCode = materialService.findMaterialByBarCode(qrCode);
-            if(materialByBarCode != null){
+            if (materialByBarCode != null) {
                 // 如果不为空，则扫描的为物料条形码
                 Material material = materialService.findMaterialById(materialByBarCode.getMid());
                 flag = 1;
-                result.put("material",material);
-            }else{
+                result.put("material", material);
+            } else {
                 // 如果为空，则扫描的可能为库位码
                 PidOrDidAndCode locationByQrCode = placeService.findLocationByQrCode(qrCode);
-                if(locationByQrCode != null){
+                if (locationByQrCode != null) {
                     // 如果不为空，则是库位码
 
 //                    1为库位2为仓库
                     Integer locationFlag = locationByQrCode.getFlag();
-                    if(Integer.compare(locationFlag,1) == 0){
+                    if (Integer.compare(locationFlag, 1) == 0) {
                         // 如果是库位
                         Place placeById = placeService.findPlaceById(ObjectFormatUtil.toInteger(locationByQrCode.getPid()));
 
@@ -1321,18 +1335,50 @@ public class MaterialController {
                             mcodeList.add(materialById.getCode());
                         }
                         pp.setMcodeList(mcodeList);
-                        result.put("place",pp);
+                        result.put("place", pp);
                         flag = 2;
-                    }else{
+                    } else {
                         // 如果是仓库
                         Depository depository = depositoryService.findDepositoryRecordById(ObjectFormatUtil.toInteger(locationByQrCode.getDepositoryId()));
-                        result.put("depository",depository);
+                        result.put("depository", depository);
                         flag = 3;
                     }
                 }
             }
         }
-        result.put("flag",flag);
+        result.put("flag", flag);
         return new RestResponse(result);
     }
+
+
+    /**
+     * 用于再次获取新数据
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping("/getNewTreeForMtId")
+    public RestResponse getNewTreeForMtId(@RequestBody Map<String, Object> map, HttpServletRequest request) {
+        String mname = (String) map.get("mname");
+        String type = (String) map.get("type");
+        UserByPort userToken = (UserByPort) request.getAttribute("userToken");
+        Integer maindeparment = userToken.getMaindeparment();
+        Object mtId = map.get("mtId");
+        List<Object> list = new ArrayList<>();
+        if (mtId != null) {
+            if("2".equals(type)){
+                map.put("adminorg",String.valueOf(maindeparment));
+            }else if("3".equals(type)){
+                String depositoryId = (String) map.get("depositoryId");
+                String placeId = (String) map.get("placeId");
+                map.put("depositoryId", depositoryId);
+                map.put("placeId", placeId);
+            }
+            list = materialService.AddInitTreeMenus(map);
+
+        } else {
+            throw new MyException("缺少必要参数");
+        }
+        return new RestResponse(list);
+    }
 }

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java

@@ -215,7 +215,20 @@ public interface MaterialMapper {
     Integer deleteBarCodeAndMaterial(Map<String,Object> map);
 
 
+    /**
+     * 查询当前类型下的物料
+     * @param oldId
+     * @return
+     */
     List<Material> findMaterialByType(Long oldId);
 
 
+    /**
+     * 批量查询当前类型下的物料
+     * @param list
+     * @return
+     */
+    List<Material> findMaterialByTypeIds(List<Long> list);
+
+
 }

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -245,6 +245,19 @@
         </foreach>
     </select>
 
+
+    <select id="findMaterialByTypeIds" resultMap="materialMap" parameterType="list">
+        SELECT
+        <include refid="allColumns" />
+        from material m
+        where m.type_id in
+        <foreach collection="list" index="index" item="item" open="("
+                 separator="," close=")">
+            #{item}
+        </foreach>
+        and state = 1;
+    </select>
+
     <select id="findMaterialByDepositorysAndType" resultMap="materialMap" parameterType="map">
         SELECT
         <include refid="allColumns" />

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java

@@ -42,6 +42,8 @@ public interface MaterialTypeMapper {
      */
     MaterialType findMaterialTypeByOldId(Long oldId);
 
+
+
     /**
      * 根据id查询物料名称
      * @param id 物料类型id
@@ -134,4 +136,12 @@ public interface MaterialTypeMapper {
      */
     List<MaterialType> findMaterialTypeByParent(Long parentId);
 
+
+    /**
+     * 根据主键批量获取数据
+     * @param list
+     * @return
+     */
+    List<MaterialType> findMaterialTypeByOldIds(List<Long> list);
+
 }

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml

@@ -103,6 +103,19 @@
          WHERE mt.parentId = #{parentId}
     </select>
 
+    <!-- 根据主键批量获取数据 -->
+    <select id="findMaterialTypeByOldIds" resultMap="materialTypeMap" parameterType="list">
+        SELECT
+        <include refid="allColumns" />
+        FROM material_type mt
+        WHERE mt.oldId in
+        <foreach collection="list" index="index" item="item" open="("
+                 separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+
     <!-- 根据主键查询数据 -->
     <select id="findMaterialTypeById" resultMap="materialTypeMap" parameterType="integer">
         SELECT

src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java

@@ -161,7 +161,7 @@ public interface MaterialService {
      * 构造树形选择框(测试)
      * @return
      */
-    List<Object> InitTreeMenus_Test(String mname);
+    List<Object> InitTreeMenus_Test();
 
     /**
      * 根据仓库查询物品
@@ -259,5 +259,16 @@ public interface MaterialService {
     String findMaterialCodeByQrCode(String qrCode);
 
 
+    /**
+     * 添加新树形选择框
+     * @return
+     */
+    List<Object> AddInitTreeMenus(Map<String,Object> map);
 
+    /**
+     * 用于判断当前类型是几级子类
+     * @param mt
+     * @return
+     */
+     Integer getMtLevel(MaterialType mt,Integer level);
 }

src/main/resources/templates/pages/application/application-in.html

@@ -532,7 +532,8 @@
                 maxmin: true,
                 shadeClose: true, //点击遮罩关闭层
                 area: ['70%', '70%'],
-                content: '/selectMaterialByCard?mname=' + mname + '&type=1&clickObj=' + parentId,
+                // content: '/selectMaterialByCard?mname=' + mname + '&type=1&clickObj=' + parentId,
+                content: '/getMaterialAll?mname=' + mname + '&type=1&clickObj=' + parentId,
                 move: '.layui-layer-title',
                 fixed: false,
                 end: function () {

src/main/resources/templates/pages/application/application-in_scanQrCode.html

@@ -668,7 +668,8 @@
                 maxmin: true,
                 shadeClose: true, //点击遮罩关闭层
                 area: ['70%', '70%'],
-                content: '/selectMaterialByCard?mname=' + mname + '&type=1&clickObj=' + parentId,
+                // content: '/selectMaterialByCard?mname=' + mname + '&type=1&clickObj=' + parentId,
+                content: '/getMaterialAll?mname=' + mname + '&type=1&clickObj=' + parentId,
                 move: '.layui-layer-title',
                 fixed: false,
                 end: function () {

src/main/resources/templates/pages/application/application-out.html

@@ -575,6 +575,9 @@
             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];
             layer.open({
                 type: 2,
                 title: '弹窗内容',
@@ -600,6 +603,36 @@
                                 code = "";
                             }
                             codeValue.value = code;
+                            var materialAndBarCodeList = material["materialAndBarCodeList"];
+                            var idNumber = materialId.name.split("mid")[1];
+                            if (materialAndBarCodeList.length > 0) {
+                                // 如果有对应的条形码
+                                var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
+                                var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
+                                var id = barCodeInput.id;
+                                $("#" + 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();
                         }
                     });

src/main/resources/templates/pages/application/application-out_scanQrCode.html

@@ -500,7 +500,8 @@
                 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,
                 end: function () {

src/main/resources/templates/pages/application/application-transfer.html

@@ -576,7 +576,6 @@
                             contentType: "application/json;charset=utf-8",
                             success:function (res) {
                                 var idNumber = materialId.name.split("mid")[1];
-                                console.log(idNumber)
                                 // 获取物料与条形码的对应关系
                                 var materialAndBarCodeList = d["materialAndBarCodeList"];
                                 var barCode = $("#barCode" + idNumber);
@@ -631,6 +630,8 @@
             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];
             layer.open({
                 type: 2,
                 title: '弹窗内容',
@@ -638,7 +639,8 @@
                 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,
                 end: function () {
@@ -660,6 +662,34 @@
                             $.each(placeList, function (index, item) {
                                 $('#place').append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
                             });
+                            var barCode = $("#barCode" + idNumber);
+                            if (barCode.length > 0) {
+                                barCode.empty();
+                            }
+                            var idNumber = materialId.name.split("mid")[1];
+                            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();
+                                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();
+                            }
                             form.render();
                         }
                     });

src/main/resources/templates/pages/application/application-transfer_back.html

@@ -382,7 +382,8 @@
                 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,
                 end: function () {

src/main/resources/templates/pages/material/selectMaterialByApproval.html

@@ -14,6 +14,8 @@
 <input id="mname" name="mname" th:value="${mname}" style="display: none">
 <input id="type" name="type" th:value="${type}" style="display: none">
 <input id="clickObj" name="clickObj" th:value="${clickObj}" style="display: none">
+<input id="placeId" name="placeId" th:value="${placeId}" style="display: none">
+<input id="depositoryId" name="depositoryId" th:value="${depositoryId}" style="display: none">
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
     layui.use(['form', 'layer', 'dropdown', 'tree'], function () {
@@ -22,26 +24,54 @@
         var mname = $("#mname").val();
         var type = $("#type").val();
         var clickObj = $("#clickObj").val();
+        var placeId = $("#placeId").val();
+        var depositoryId = $("#depositoryId").val();
+
+
 
         // 用于暂存当前查询结果
         var tempData = [];
         var req = {};
         req.mname = mname;
-        req.type = "4";
+        req.type = type;
+        if(placeId !== "-1"){
+            req.placeId = placeId;
+            req.depositoryId = depositoryId;
+        }
         var test = tree.render({
             elem: '#test2'
             , data:  []
             , click: function (obj) {
-                console.log(obj)
+                var state = obj.state;
                 if (obj.data.children !== undefined) {
-                    return false
+                    if("open" === state){
+                        var id = obj.data.id;
+                        var param = {};
+                        param.mtId = id;
+                        param.mname = mname;
+                        param.type = type;
+                        if(placeId !== "-1"){
+                            param.placeId = placeId;
+                            param.depositoryId = depositoryId;
+                        }
+                        addTreeChildren(param);
+                    }else{
+                        return false
+                    }
                 }else{
-
+                    var windowParent = $("#"+clickObj,window.parent.document)[0];
+                    var children = windowParent.childNodes[5];
+                    var materialItem = children.childNodes[3].childNodes[1].childNodes;
+                    var materialName = materialItem[1];
+                    var materialId =  materialName.parentNode.parentNode.childNodes[3];
+                    materialName.value = obj.data.title;
+                    materialId.value = obj.data.id;
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
                 }
-            },
-            oncheck:function (obj) {
-                console.log(obj)
+
             }
+
         });
 
         $.ajax({
@@ -63,10 +93,67 @@
             }
         });
 
-        $(".layui-tree-iconClick").addEventListener("click",function (obj) {
-            console.log(obj)
-        })
 
+        $("#test2").on("click",".layui-tree-entry",function(event){
+
+            var target = $(event.target);
+            var id = this.parentNode.getAttribute("data-id");
+            var context = target.context.className;
+            if(context.includes("layui-tree-main")){
+                var childrenName = this.childNodes[0].childNodes[0].childNodes[0].className;
+                if(childrenName.includes("layui-icon-addition")){
+                    // console.log("隐藏")
+                }else if(childrenName.includes("layui-icon-subtraction")){
+                    var param = {};
+                    param.mtId = id;
+                    param.mname = mname;
+                    param.type = type;
+                    if(placeId !== "-1"){
+                        param.placeId = placeId;
+                        param.depositoryId = depositoryId;
+                    }
+                    addTreeChildren(param);
+
+                }
+            }else if(context.includes("layui-icon")){
+                if(context.includes("layui-icon-addition")){
+                    // console.log("隐藏")
+                }else if(context.includes("layui-icon-subtraction")){
+                    var param = {};
+                    param.mtId = id;
+                    param.mname = mname;
+                    param.type = type;
+                    if(placeId !== "-1"){
+                        param.placeId = placeId;
+                        param.depositoryId = depositoryId;
+                    }
+                    addTreeChildren(param);
+                }
+            }
+        });
+
+
+        // 用于添加分支
+         addTreeChildren = function(param) {
+            $.ajax({
+                url: "/material/getNewTreeForMtId",
+                data: JSON.stringify(param),
+                type: 'post',
+                dataType: 'json',
+                contentType: "application/json;charset=utf-8",
+                beforeSend: function () {
+                    this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+                },
+                success: function (d) {
+                    layer.close(this.layerIndex);
+                    var data2 = d.data;
+                    tempData = data2;
+                    test.reload({
+                        data: tempData
+                    });
+                }
+            });
+        }
 
     })
 </script>

src/main/resources/templates/pages/stockTaking/stockTaking.html

@@ -665,7 +665,8 @@
                     area: ['70%', '70%'],
                     move: '.layui-layer-title',
                     fixed: false,
-                    content: '/selectMaterialByCardForTaking?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId,
+                    content: '/getMaterialAll?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId,
+                    // content: '/selectMaterialByCardForTaking?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId,
                     end: function () {
                         var mid = materialId.value;
                         $.ajax({

src/test/java/com/dreamchaser/depository_manage/Test.java

@@ -1,6 +1,7 @@
 package com.dreamchaser.depository_manage;
 
 
+import cn.hutool.core.date.StopWatch;
 import cn.hutool.core.lang.Snowflake;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,13 +27,20 @@ import com.dreamchaser.depository_manage.pojo.callBackXml.callBackXml_button_tem
 import com.dreamchaser.depository_manage.pojo.callBackXml.callBackXml_button_templatecard.TemplateCard_SelectedItems;
 import com.dreamchaser.depository_manage.pojo.callBackXml.callBackXml_button_templatecard.TemplateCard_button_selection;
 import com.dreamchaser.depository_manage.service.*;
+import com.dreamchaser.depository_manage.service.impl.MaterialServiceImpl;
 import com.dreamchaser.depository_manage.service.impl.QyWxOperationService;
 import com.dreamchaser.depository_manage.utils.*;
+import lombok.Data;
+import lombok.extern.log4j.Log4j;
 import lombok.extern.log4j.Log4j2;
+import lombok.var;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.http.protocol.HTTP;
+import org.apache.poi.poifs.property.Child;
+import org.apache.poi.ss.formula.functions.Offset;
+import org.apache.poi.ss.formula.functions.T;
 import org.dom4j.Element;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
@@ -85,15 +93,204 @@ public class Test {
 
     @Autowired
     MaterialTypeMapper materialTypeMapper;
+
+    @Autowired
+    RedisTemplate<String, String> redisTemplate;
+
     @org.junit.Test
     public void test1() throws AesException, IOException, ParserConfigurationException, SAXException {
-        List<Object> objectList = materialService.InitTreeMenus("");
+        List<Object> objectList = InitTree_Test();
+    }
+
+
+    /**
+     * 用于深度拷贝列表
+     *
+     * @param oldList
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> deepCopy(List<T> oldList) {
+        List<T> newList = (List<T>) Arrays.asList(new Object[oldList.size()]);
+        Collections.copy(newList, oldList);
+        return newList;
+    }
+
+    public List<Object> InitTree_Test() {
+        List<MaterialType> materialTypeAll = materialTypeMapper.findMaterialTypeAll();
+        Integer totalVal = materialTypeAll.size();
+        double size = 100.0;
+
+        Integer threadSize = (int) Math.ceil(totalVal / size);
+        // 开启对应数量的线程
+        ExecutorService exs = Executors.newFixedThreadPool(threadSize);
+        // 结果集
+
+        List<Object> list = new ArrayList<>();
+
+        List<Future<Object>> futureList = new ArrayList<Future<Object>>();
+
+        // 1.定义CompletionService
+        CompletionService<Object> completionService = new ExecutorCompletionService<Object>(exs);
+        List<Long> materialTypeList = new ArrayList<>();
+        for (int i = 0; i < materialTypeAll.size(); i++) {
+            MaterialType materialType = materialTypeAll.get(i);
+            if (((i + 1) % 100) == 0) {
+                Future<Object> future = completionService.submit(new TaskTest(materialTypeList));
+                futureList.add(future);
+                materialTypeList = new ArrayList<>();
+            } else {
+                materialTypeList.add(materialType.getOldId());
+            }
+        }
+
+        if (materialTypeList.size() > 0) {
+            Future<Object> future = completionService.submit(new TaskTest(materialTypeList));
+            futureList.add(future);
+        }
+
+        // 3.获取结果
+        for (int i = 0; i < threadSize; i++) {
+            Object result = null;
+            try {
+                result = completionService.take().get();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            } catch (ExecutionException e) {
+                e.printStackTrace();
+            }
+            list.add(result);
+        }
+        return list;
+    }
+
+    // 用于执行测试新算法
+    class TaskTest implements Callable<Object> {
+
+        List<Long> materialTypeIdList;
+
+        public TaskTest(List<Long> materialTypeByCondition) {
+            this.materialTypeIdList = materialTypeByCondition;
+        }
+
+        @Override
+        public Object call() throws Exception {
+
+            List<Object> list = new ArrayList<>();
+            // 开启对应数量的线程
 
+
+            List<Material> materialByTypeIds = materialMapper.findMaterialByTypeIds(materialTypeIdList);
+            List<MaterialType> materialTypeByOldIds = materialTypeMapper.findMaterialTypeByOldIds(materialTypeIdList);
+
+            ExecutorService exs = Executors.newFixedThreadPool(materialTypeByOldIds.size());
+            // 结果集
+            List<Future<Object>> futureList = new ArrayList<Future<Object>>();
+
+            // 1.定义CompletionService
+            CompletionService<Object> completionService = new ExecutorCompletionService<Object>(exs);
+
+            for (int i = 0; i < materialTypeByOldIds.size(); i++) {
+                MaterialType mt = materialTypeByOldIds.get(i);
+                Future<Object> future = completionService.submit(new MtTaskTest(mt, materialByTypeIds));
+                futureList.add(future);
+            }
+            // 3.获取结果
+            for (int i = 0; i < materialTypeIdList.size(); i++) {
+                Object result = null;
+                try {
+                    result = completionService.take().get();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                } catch (ExecutionException e) {
+                    e.printStackTrace();
+                }
+                list.add(result);
+            }
+
+            return list;
+        }
+
+
+    }
+
+    // 用于执行测试新算法
+    class MtTaskTest implements Callable<Object> {
+
+        MaterialType mt;
+        List<Material> materiaList;
+
+        public MtTaskTest(MaterialType mt, List<Material> materiaList) {
+            this.mt = mt;
+            this.materiaList = materiaList;
+        }
+
+        @Override
+        public Object call() throws Exception {
+
+            // 开启对应数量的线程
+            List<Material> materialList = new ArrayList<>();
+            for (int i = 0; i < materiaList.size(); i++) {
+                Material material = materiaList.get(i);
+                if (Long.compare(material.getMaterialTypeId(), mt.getOldId()) == 0) {
+                    materialList.add(material);
+                }
+            }
+            List<Object> objectList = AddMaterialByType(materialList);
+            Map<String, Object> objectMap = InitTreeMenus(mt, objectList);
+            return objectMap;
+        }
+    }
+
+
+    // 构造树形组件数据模板
+    public Map<String, Object> InitTreeMenus(MaterialType mt, List<Object> children) {
+        if (mt != null) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("title", mt.getTname());
+            map.put("id", mt.getOldId());
+            map.put("parentId",mt.getParentId());
+            map.put("children", children);
+            return map;
+        } else {
+            return null;
+        }
     }
 
 
+    // 在类别后添加物料名称
+    public List<Object> AddMaterialByType(List<Material> materialList) {
+        List<Object> result = new ArrayList<>();
+        for (int i = 0; i < materialList.size(); i++) {
+            Material material = materialList.get(i);
+            Map<String, Object> map = new HashMap<>();
+            String version = material.getVersion();
+            if (version == null) {
+                version = "";
+            }
+
+            String title = material.getMname() + ",规格型号： " + version;
+            map.put("title", title);
+            map.put("id", material.getId());
+            result.add(map);
+        }
+        return result;
+    }
 
 
+    public List<Object> buildTree(List<Object> list,Long parentId){
+        List<Object> result = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            JSONObject o = new JSONObject((Map<String,Object>)list.get(i));
+            Long id = Long.valueOf(o.getString("id"));
+            Long pid = Long.valueOf(o.getString("parentId"));
+            if(Long.compare(pid,parentId) == 0){
+                result.add(o);
+            }
+
+        }
+        return null;
+    }
 
 }
 

target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -245,6 +245,19 @@
         </foreach>
     </select>
 
+
+    <select id="findMaterialByTypeIds" resultMap="materialMap" parameterType="list">
+        SELECT
+        <include refid="allColumns" />
+        from material m
+        where m.type_id in
+        <foreach collection="list" index="index" item="item" open="("
+                 separator="," close=")">
+            #{item}
+        </foreach>
+        and state = 1;
+    </select>
+
     <select id="findMaterialByDepositorysAndType" resultMap="materialMap" parameterType="map">
         SELECT
         <include refid="allColumns" />

target/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml

@@ -103,6 +103,19 @@
          WHERE mt.parentId = #{parentId}
     </select>
 
+    <!-- 根据主键批量获取数据 -->
+    <select id="findMaterialTypeByOldIds" resultMap="materialTypeMap" parameterType="list">
+        SELECT
+        <include refid="allColumns" />
+        FROM material_type mt
+        WHERE mt.oldId in
+        <foreach collection="list" index="index" item="item" open="("
+                 separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+
     <!-- 根据主键查询数据 -->
     <select id="findMaterialTypeById" resultMap="materialTypeMap" parameterType="integer">
         SELECT

target/classes/templates/pages/application/application-in.html

@@ -532,7 +532,8 @@
                 maxmin: true,
                 shadeClose: true, //点击遮罩关闭层
                 area: ['70%', '70%'],
-                content: '/selectMaterialByCard?mname=' + mname + '&type=1&clickObj=' + parentId,
+                // content: '/selectMaterialByCard?mname=' + mname + '&type=1&clickObj=' + parentId,
+                content: '/getMaterialAll?mname=' + mname + '&type=1&clickObj=' + parentId,
                 move: '.layui-layer-title',
                 fixed: false,
                 end: function () {

target/classes/templates/pages/material/selectMaterialByApproval.html

@@ -14,6 +14,8 @@
 <input id="mname" name="mname" th:value="${mname}" style="display: none">
 <input id="type" name="type" th:value="${type}" style="display: none">
 <input id="clickObj" name="clickObj" th:value="${clickObj}" style="display: none">
+<input id="placeId" name="placeId" th:value="${placeId}" style="display: none">
+<input id="depositoryId" name="depositoryId" th:value="${depositoryId}" style="display: none">
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
     layui.use(['form', 'layer', 'dropdown', 'tree'], function () {
@@ -22,26 +24,54 @@
         var mname = $("#mname").val();
         var type = $("#type").val();
         var clickObj = $("#clickObj").val();
+        var placeId = $("#placeId").val();
+        var depositoryId = $("#depositoryId").val();
+
+
 
         // 用于暂存当前查询结果
         var tempData = [];
         var req = {};
         req.mname = mname;
-        req.type = "4";
+        req.type = type;
+        if(placeId !== "-1"){
+            req.placeId = placeId;
+            req.depositoryId = depositoryId;
+        }
         var test = tree.render({
             elem: '#test2'
             , data:  []
             , click: function (obj) {
-                console.log(obj)
+                var state = obj.state;
                 if (obj.data.children !== undefined) {
-                    return false
+                    if("open" === state){
+                        var id = obj.data.id;
+                        var param = {};
+                        param.mtId = id;
+                        param.mname = mname;
+                        param.type = type;
+                        if(placeId !== "-1"){
+                            param.placeId = placeId;
+                            param.depositoryId = depositoryId;
+                        }
+                        addTreeChildren(param);
+                    }else{
+                        return false
+                    }
                 }else{
-
+                    var windowParent = $("#"+clickObj,window.parent.document)[0];
+                    var children = windowParent.childNodes[5];
+                    var materialItem = children.childNodes[3].childNodes[1].childNodes;
+                    var materialName = materialItem[1];
+                    var materialId =  materialName.parentNode.parentNode.childNodes[3];
+                    materialName.value = obj.data.title;
+                    materialId.value = obj.data.id;
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
                 }
-            },
-            oncheck:function (obj) {
-                console.log(obj)
+
             }
+
         });
 
         $.ajax({
@@ -63,10 +93,67 @@
             }
         });
 
-        $(".layui-tree-iconClick").addEventListener("click",function (obj) {
-            console.log(obj)
-        })
 
+        $("#test2").on("click",".layui-tree-entry",function(event){
+
+            var target = $(event.target);
+            var id = this.parentNode.getAttribute("data-id");
+            var context = target.context.className;
+            if(context.includes("layui-tree-main")){
+                var childrenName = this.childNodes[0].childNodes[0].childNodes[0].className;
+                if(childrenName.includes("layui-icon-addition")){
+                    // console.log("隐藏")
+                }else if(childrenName.includes("layui-icon-subtraction")){
+                    var param = {};
+                    param.mtId = id;
+                    param.mname = mname;
+                    param.type = type;
+                    if(placeId !== "-1"){
+                        param.placeId = placeId;
+                        param.depositoryId = depositoryId;
+                    }
+                    addTreeChildren(param);
+
+                }
+            }else if(context.includes("layui-icon")){
+                if(context.includes("layui-icon-addition")){
+                    // console.log("隐藏")
+                }else if(context.includes("layui-icon-subtraction")){
+                    var param = {};
+                    param.mtId = id;
+                    param.mname = mname;
+                    param.type = type;
+                    if(placeId !== "-1"){
+                        param.placeId = placeId;
+                        param.depositoryId = depositoryId;
+                    }
+                    addTreeChildren(param);
+                }
+            }
+        });
+
+
+        // 用于添加分支
+         addTreeChildren = function(param) {
+            $.ajax({
+                url: "/material/getNewTreeForMtId",
+                data: JSON.stringify(param),
+                type: 'post',
+                dataType: 'json',
+                contentType: "application/json;charset=utf-8",
+                beforeSend: function () {
+                    this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+                },
+                success: function (d) {
+                    layer.close(this.layerIndex);
+                    var data2 = d.data;
+                    tempData = data2;
+                    test.reload({
+                        data: tempData
+                    });
+                }
+            });
+        }
 
     })
 </script>