From fe21e7b83c41f97696c70460a583cbfc342be8a7 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Tue, 23 May 2023 14:11:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=97=B6=E4=BB=93=E5=BA=93=E5=90=8D=E7=A7=B0=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QyWxOperationController.java | 3 +- .../impl/DepositoryRecordServiceImpl.java | 6 +-- .../service/impl/QyWxOperationService.java | 9 ++--- .../depository_manage/OtherTest.java | 40 ++++++++++++++----- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java index 4b251b55..4f2e8b01 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java @@ -644,7 +644,8 @@ public class QyWxOperationController { flagForLabel = false; } - } else { + } + else { for (ApprovalInfo_Details ad : details ) { // 获取当前节点审批人userId diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index fc454394..6bad09cc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -270,7 +270,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("code", code); map.put("pass", 3); map.put("quantity", quantity); - + log.info("插入出库申请主表:"+JSONObject.toJSONString(map)); return depositoryRecordMapper.insertApplicationOutRecord(map); } @@ -913,6 +913,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 修改库存记录 materialMapper.updateInventory(inventoryById); } + log.info("插入出库申请子表"+JSONObject.toJSONString(map)); return depositoryRecordMapper.insertApplicationOutRecordMin(map); } @@ -2203,7 +2204,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取当前出库的仓库是否为开放仓库 int flagForOpenDepository = recordP.getFlagForOpenDepository(); if (!flagForFirst) { - String depositoryManagerTime = recordP.getDepositoryManagerTime(); if ("0".equals(depositoryManagerTime)) { // 如果当前申请没有处理 @@ -2476,7 +2476,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (flag) { return 1; } - log.info("出库审批参数 “flagForFirst:"+flagForFirst+"”，“flagForDepository："+flagForDepository+"”，审批人："+userByPort.getNumber()+userByPort.getName()); + log.info("出库审批参数 “flagForFirst:"+flagForFirst+"”，“flagForDepository："+flagForDepository+"”，审批人："+userByPort.getNumber()+userByPort.getName()+"出库审批修改数据："+JSONObject.toJSONString(map)); map.put("id", outId); return depositoryRecordMapper.updateApplicationOutRecord(map); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index 952b9e75..22f5dafa 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java @@ -1551,14 +1551,14 @@ public class QyWxOperationService { // 获取当前物料所在仓库 Integer depositoryId = recordMin.getDepositoryId(); Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId); - + Depository depositoryTop = depositoryById; if (Integer.compare(depositoryById.getParentId(), 0) != 0) { // 如果不是 List depositoryAll = depositoryMapper.findDepositoryAll(); - depositoryById = findParentDepository(depositoryById, depositoryAll); + depositoryTop = findParentDepository(depositoryById, depositoryAll); } - if (!depositoryById.getDname().contains("前置仓")) { + if (!depositoryTop.getDname().contains("前置仓")) { // 如果不是前置仓下的仓库 flag = false; } @@ -1761,9 +1761,6 @@ public class QyWxOperationService { approval_template_approver_list.add(approval_template_approver_Label); - - - } else { // 如果不是中心仓下的仓库 diff --git a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java index 6a059dc0..d83b2c6e 100644 --- a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java @@ -3,6 +3,7 @@ package com.dreamchaser.depository_manage; import com.alibaba.fastjson.JSONObject; import com.dreamchaser.depository_manage.config.PublicConfig; import com.dreamchaser.depository_manage.config.QyWxConfig; +import com.dreamchaser.depository_manage.entity.Depository; import com.dreamchaser.depository_manage.entity.MaterialType; import com.dreamchaser.depository_manage.entity.UserByPort; import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details; @@ -98,21 +99,38 @@ public class OtherTest { return JSONObject.parseObject(JSONObject.toJSONString(map), UserByPort.class); } + Depository findParentDepository(Depository depository, List depositoryList) { + for (Depository d : depositoryList + ) { + if (Integer.compare(depository.getParentId(), d.getId()) == 0) { + if (Integer.compare(0, d.getParentId()) == 0) { + return d; + } else { + return findParentDepository(d, depositoryList); + } + } + } + return null; + } @Test public void someTest(){ - List materialTypeByNames = materialTypeService.findMaterialTypeByName("安全阀"); - - Long oldId = null; - List parentOldIdList = new ArrayList<>(); - List OldIdList = new ArrayList<>(); - for (MaterialType materialType : materialTypeByNames) { - parentOldIdList.add(materialType.getParentId()); - OldIdList.add(materialType.getOldId()); + boolean flag = true; + Depository depositoryById = depositoryMapper.findDepositoryById(28); + Depository depositoryTop = depositoryById; + if (Integer.compare(depositoryById.getParentId(), 0) != 0) { + // 如果不是 + List depositoryAll = depositoryMapper.findDepositoryAll(); + depositoryTop = findParentDepository(depositoryById, depositoryAll); + } + + if (!depositoryTop.getDname().contains("前置仓")) { + // 如果不是前置仓下的仓库 + flag = false; } - System.out.println(parentOldIdList); - System.out.println(OldIdList); - System.out.println(CollectionUtils.subtract(OldIdList,parentOldIdList)); + System.out.println(flag); + System.out.println(depositoryById); + System.out.println(depositoryTop); }