修改出库申请时开放仓库的问题

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

@@ -192,4 +192,11 @@ public interface RoleService {
      */
     List<Integer> findDepositoryIdForUserHas(UserByPort userToken);
 
+    /**
+     * 用于查询当前用户部门所拥有的仓库
+     * @param userToken 待查询用户
+     * @return
+     */
+    List<Integer> findDepositoryIdForUser(UserByPort userToken);
+
 }

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

@@ -232,7 +232,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             map.put("flagForOpenDepository", 1);
             map.remove("depositoryId");
         } else {
-            List<Integer> depositoryIdForUserHas = roleService.findDepositoryIdForUserHas(userToken);
+            List<Integer> depositoryIdForUserHas = roleService.findDepositoryIdForUser(userToken);
             map.put("flagForOpenDepository", 2);
             if (depositoryIdForUserHas.contains(ObjectFormatUtil.toInteger(depositoryId))) {
                 map.put("flagForOpenDepository", 1);

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

@@ -423,6 +423,22 @@ public class RoleServiceImpl implements RoleService {
     @Override
     public List<Integer> findDepositoryIdForUserHas(UserByPort userToken) {
         // 获取当前用户所在部门拥有的仓库
+        List<Integer> depositoryIdList = findDepositoryIdForUser(userToken);
+        // 获取额外的设置的仓库
+        List<Integer> depositoryIdForWareHouseVisiblePermissionByUser = findDepositoryIdForWareHouseVisiblePermissionByUser(userToken);
+        // 取并集
+        depositoryIdList = (List<Integer>) CollectionUtils.union(depositoryIdForWareHouseVisiblePermissionByUser,depositoryIdList);
+        return depositoryIdList;
+    }
+
+
+    /**
+     * 用于查询当前用户部门所拥有的仓库
+     * @param userToken 待查询用户
+     * @return
+     */
+    @Override
+    public List<Integer> findDepositoryIdForUser(UserByPort userToken) {
         List<Depository> depositoryByAdminorg = depositoryMapper.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
         List<Integer> depositoryIdList = new ArrayList<>();
         for (Depository depository : depositoryByAdminorg) {
@@ -431,7 +447,7 @@ public class RoleServiceImpl implements RoleService {
         // 获取当前所有的仓库
         List<Depository> depositoryAll = depositoryMapper.findDepositoryAll();
         for (Depository depository:depositoryAll
-             ) {
+        ) {
             Integer parentId = depository.getParentId();
             Integer id = depository.getId();
             if(depositoryIdList.contains(parentId) && !depositoryIdList.contains(id)){
@@ -446,10 +462,6 @@ public class RoleServiceImpl implements RoleService {
                 depositoryIdList.add(depository.getDepositoryId());
             }
         }
-        // 获取额外的设置的仓库
-        List<Integer> depositoryIdForWareHouseVisiblePermissionByUser = findDepositoryIdForWareHouseVisiblePermissionByUser(userToken);
-        // 取并集
-        depositoryIdList = (List<Integer>) CollectionUtils.union(depositoryIdForWareHouseVisiblePermissionByUser,depositoryIdList);
         return depositoryIdList;
     }
 

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

@@ -1059,6 +1059,53 @@
             }
         };
 
+        form.on('select()', function (data) {
+            var id = data.elem.id;
+            if(id.includes("place")){
+
+            }else if(id.includes("unit"){
+
+            }
+            /*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 = $("#place"+id).val();
+                    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)
+                            }
+
+                        }
+                    });
+                }
+            }*/
+        });
+
 
     })
 </script>

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

@@ -141,4 +141,13 @@ public class OtherTest {
     }
 
 
+    @Test
+    public void ApplicationOutTest(){
+        ApprovalInfo_Details approvalInfo_details = new ApprovalInfo_Details();
+        ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
+        approver.setUserId("PangFuZhen");
+        approvalInfo_details.setApprover(approver);
+        depositoryRecordService.reviewByQyWxApprovalOut("29",approvalInfo_details,"d35f243c9791341c148f7826994829ec","2","",true,2);
+    }
+
 }