修改bug

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

@@ -698,7 +698,8 @@ public class DepositoryRecordController {
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
         List<ApplicationInRecordP> list = new ArrayList<>();
         Integer recordPCount = 0;
-        if (Integer.compare(userToken.getMaindeparment(), 361) == 0) {
+        Integer maindeparment = userToken.getMaindeparment();
+        if (PortConfig.roleAdminorgList.contains(maindeparment)) {
             list = depositoryRecordService.findApplicationInRecordPByCondition(map, userToken);
             recordPCount = depositoryRecordService.findApplicationInRecordPCountByCondition(map);
         } else {

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

@@ -66,10 +66,10 @@ public class MaterialController {
      */
     @GetMapping("/material")
     public RestResponse findMaterial(@RequestParam Map<String, Object> map) {
-        if(map.containsKey("materialTypeId")){
+        if (map.containsKey("materialTypeId")) {
             Long materialTypeId = ObjectFormatUtil.toLong(map.get("materialTypeId"));
             List<Long> childForMaterialTypeByParent = materialTypeService.findChildForMaterialTypeByParent(materialTypeId);
-            map.put("materialTypeIds",childForMaterialTypeByParent);
+            map.put("materialTypeIds", childForMaterialTypeByParent);
             map.remove("materialTypeId");
         }
         List<Material> materialPByCondition = materialService.findMaterialPByConditionForTable(map);
@@ -171,19 +171,24 @@ public class MaterialController {
             List<Integer> didList = roleService.findDepositoryIdForUserHas(userToken);
             map.put("depositoryIds", didList);
         }
-        if(map.containsKey("depositoryId")){
+        if (map.containsKey("depositoryId")) {
             // 如果包含仓库id
             Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId"));
             // 获取当前仓库下所有可见的仓库
             List<Integer> allChildDepositoryById = depositoryService.findAllChildDepositoryById(depositoryId, userToken);
-            map.put("depositoryIds", allChildDepositoryById);
+            if (allChildDepositoryById.size() > 0) {
-            map.remove("depositoryId");
+                map.put("depositoryIds", allChildDepositoryById);
+                map.remove("depositoryId");
+            }
         }
-        if(map.containsKey("materialTypeId")){
+        if (map.containsKey("materialTypeId")) {
             Long materialTypeId = ObjectFormatUtil.toLong(map.get("materialTypeId"));
             List<Long> childForMaterialTypeByParent = materialTypeService.findChildForMaterialTypeByParent(materialTypeId);
-            map.put("materialTypeIds", childForMaterialTypeByParent);
+            if (childForMaterialTypeByParent.size() > 0) {
-            map.remove("materialTypeId");
+                map.put("materialTypeIds", childForMaterialTypeByParent);
+                map.remove("materialTypeId");
+
+            }
         }
         list = materialService.findInventory(map);
         total = materialService.findInventoryCount(map);
@@ -193,11 +198,11 @@ public class MaterialController {
     }
 
     @PostMapping("/updateInventoryRemark")
-    public RestResponse updateInventoryRemark(@RequestBody Map<String,Object> map,HttpServletRequest request){
+    public RestResponse updateInventoryRemark(@RequestBody Map<String, Object> map, HttpServletRequest request) {
-        if(map.containsKey("id")){
+        if (map.containsKey("id")) {
             Integer integer = materialService.updateInventoryRemark(map);
-            return CrudUtil.updateHandle(integer,1);
+            return CrudUtil.updateHandle(integer, 1);
-        }else{
+        } else {
             throw new MyException("缺少必要参数");
         }
     }
@@ -282,7 +287,7 @@ public class MaterialController {
         List<Object> list = new ArrayList<>();
         if (!"".equals(mname)) {
             // 如果是出入库
-            list = materialService.InitTreeForSelectName(mname.split(",")[0], type, map,userToken);
+            list = materialService.InitTreeForSelectName(mname.split(",")[0], type, map, userToken);
         } else {
             list = materialService.InitTreeMenus_Test();
         }
@@ -624,8 +629,7 @@ public class MaterialController {
                 }
             }
             return new RestResponse();
-        }
+        } else {
-        else {
             return CrudUtil.insertHandle(-1, 0);
         }
     }
@@ -667,6 +671,7 @@ public class MaterialController {
             return CrudUtil.insertHandle(-1, 0);
         }
     }
+
     @PostMapping("/getTemporaryValueForMaterial")
     public RestResponse getTemporaryValueForMaterial(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");

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

@@ -487,6 +487,12 @@
         <if test="applicantId != null and applicantId != ''">
             and applicant_id = #{applicantId}
         </if>
+        <if test="depositoryIdList != null">
+            and did in
+            <foreach collection="depositoryIdList" index="index" item="id" open="(" separator="," close=")">
+                #{did}
+            </foreach>
+        </if>
         <if test="depositoryId != null and depositoryId != ''">
             and did = #{depositoryId}
         </if>
@@ -844,6 +850,12 @@
         <if test="depositoryId != null and depositoryId != ''">
             and did = #{depositoryId}
         </if>
+        <if test="depositoryIdList != null">
+            and did in
+            <foreach collection="depositoryIdList" index="index" item="id" open="(" separator="," close=")">
+                #{did}
+            </foreach>
+        </if>
         <if test="mid != null and mid != ''">
             and mid = #{mid}
         </if>

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -4098,12 +4098,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             String applyTime = (String) map.get("endDate");
             map.put("endDate", DateUtil.DateTimeByDayToTimeStamp(applyTime));
         }
-        List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId());
+        List<Integer> depositoryIdList = roleService.findDepositoryIdForUserHas(userByPort);
-        List<Integer> depositoryIdList = new ArrayList<>();
-        for (RoleAndDepository depository : depositoryAndRole
-        ) {
-            depositoryIdList.add(depository.getDepositoryId());
-        }
         if (depositoryIdList.size() == 0) {
             depositoryIdList = null;
         }
@@ -4139,15 +4134,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             map.put("applicantTime", DateUtil.DateTimeByDayToTimeStamp(applyTime));
         }
 
-        List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId());
+        List<Integer> depositoryIdList = roleService.findDepositoryIdForUserHas(userByPort);
-        List<Integer> depositoryIdList = new ArrayList<>();
-        for (RoleAndDepository depository : depositoryAndRole
-        ) {
-            depositoryIdList.add(depository.getDepositoryId());
-        }
-        if (depositoryIdList.size() == 0) {
-            depositoryIdList = null;
-        }
         map.put("depositoryIdList", depositoryIdList);
         map.put("applicantId", userByPort.getId());
         return depositoryRecordMapper.findApplicationInRecordPCountByUser(map);

src/main/resources/templates/pages/depository/table-in_mobile.html

@@ -133,14 +133,14 @@
                             brandItem = "";
                         }
                         lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
-                            + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName + "的入库申请" + '</h2></div>');
+                            + result[i].id + ')"><div class="layui-card-header"><h3 style="font-weight: bold">' + result[i].applicantName + "的入库申请" + '</h3></div>');
-                        lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+                        lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #666;font-size: 15px;">'
-                            + '<p style="font-size: large">' + "物料名称："+ result[i].mname + '</p>'
+                            + '<p >' + "物料名称："+ result[i].mname + '</p>'
                             + '<p>' + "物料型号："+result[i].mversion + '</p>'
                             + brandItem
                             + '<p>' + "入库数量："+result[i].quantity + " : " + result[i].airUnit + '</p>'
                             + '<p>' + "入库位置："+result[i].depositoryName+"-"+result[i].pkingdeecode + '</p>'
-                            + '<p style="text-align: right">' + "申请时间："+ result[i].applicantTime + '</p>'
+                            + '<p>' + "申请时间："+ result[i].applicantTime + '</p>'
                             + '</div></div></li>');
                     }
                     lis.push('</div>');
@@ -234,15 +234,20 @@
                             result = res.data;
                             lis.push("<div class='clearfix'>");
                             for (let i = 0; i < result.length; i++) {
+
+                                let brandItem ='<p>' + "物料品牌："+result[i].mbrand + '</p>';
+                                if(result[i].mbrand === ""){
+                                    brandItem = "";
+                                }
                                 lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
-                                    + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName + "的入库申请" + '</h2></div>');
+                                    + result[i].id + ')"><div class="layui-card-header"><h3 style="font-weight: bold">' + result[i].applicantName + "的入库申请" + '</h3></div>');
-                                lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+                                lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #666;font-size: 15px;">'
-                                    + '<p style="font-size: large">' + result[i].mname + '</p>'
+                                    + '<p >' + "物料名称："+ result[i].mname + '</p>'
-                                    + '<p>' + result[i].mversion + '</p>'
+                                    + '<p>' + "物料型号："+result[i].mversion + '</p>'
-                                    + '<p>' + result[i].mbrand + '</p>'
+                                    + brandItem
-                                    + '<p>' + result[i].quantity + " : " + result[i].airUnit + '</p>'
+                                    + '<p>' + "入库数量："+result[i].quantity + " : " + result[i].airUnit + '</p>'
-                                    + '<p>' + result[i].depositoryName + '</p>'
+                                    + '<p>' + "入库位置："+result[i].depositoryName+"-"+result[i].pkingdeecode + '</p>'
-                                    + '<p style="text-align: right">' + result[i].applicantTime + '</p>'
+                                    + '<p>' + "申请时间："+ result[i].applicantTime + '</p>'
                                     + '</div></div></li>');
                             }
                             lis.push('</div>');

src/main/resources/templates/pages/depository/table-out_mobile.html

@@ -129,7 +129,7 @@
                     for (let i = 0; i < result.length; i++) {
                         lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
                             + result[i].id + ')"><div class="layui-card-header"><h3 style="font-weight: bold">' + result[i].applicantName + "的出库申请" + '</h3></div>');
-                        lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+                        lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #666;font-size: 15px;">'
                             + '<p>' + "物料名称："+ result[i].mname + '</p>'
                             + '<p>' + "物料型号：" +result[i].mversion + '</p>'
                             + '<p>' + "申请总数：" + result[i].quantity + '</p>'
@@ -261,7 +261,7 @@
 
                                 lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
                                     + result[i].id + ')"><div class="layui-card-header"><h3 style="font-weight: bold;"> ' + result[i].applicantName + "的出库申请" + '</h3></div>');
-                                lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+                                lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #666;font-size: 15px;">'
                                     + '<p style="font-size: large">' + result[i].mname + '</p>'
                                     + '<p>' + result[i].mversion + '</p>'
                                     + '<p>' + result[i].mbrand + '</p>'