From 1785c00d14acc07a3143ed7ce4fa05d5975984f9 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 24 Mar 2023 15:12:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DepositoryRecordController.java | 10 +++++----- .../controller/GroupController.java | 4 ++-- .../controller/MaterialController.java | 2 +- .../service/impl/DepositoryRecordServiceImpl.java | 7 ++++--- .../dreamchaser/depository_manage/TestForOther.java | 13 +++++++++++-- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 946432c1..4fa70f9e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -462,7 +462,7 @@ public class DepositoryRecordController { departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId()); + departmentHeadId = new StringBuilder(userToken.getId().toString()); String workwechat = userToken.getWorkwechat(); if(workwechat == null || "".equals(workwechat)){ workwechat = userToken.getWechat(); @@ -999,7 +999,7 @@ public class DepositoryRecordController { departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId()); + departmentHeadId = new StringBuilder(userToken.getId().toString()); String workwechat = userToken.getWorkwechat(); if(workwechat == null || "".equals(workwechat)){ workwechat = userToken.getWechat(); @@ -1305,7 +1305,7 @@ public class DepositoryRecordController { departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId()); + departmentHeadId = new StringBuilder(userToken.getId().toString()); String workwechat = userToken.getWorkwechat(); if(workwechat == null || "".equals(workwechat)){ workwechat = userToken.getWechat(); @@ -1453,7 +1453,7 @@ public class DepositoryRecordController { departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId()); + departmentHeadId = new StringBuilder(userToken.getId().toString()); String workwechat = userToken.getWorkwechat(); if(workwechat == null || "".equals(workwechat)){ workwechat = userToken.getWechat(); @@ -1488,7 +1488,7 @@ public class DepositoryRecordController { // 获取当前仓库所有库位 List placeByDid = placeService.findPlaceByDid(depositoryId); // 遍历当前物料存储的库位 - for (int j = 1; j < s.length; j++) { + for (int j = 0; j < s.length; j++) { // 获取当前库位 for (Place place1 : placeByDid) { if (s[j].equals(place1.getCode())) { diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java index 6a2708b9..60def5a2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -619,7 +619,7 @@ public class GroupController { departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId()); + departmentHeadId = new StringBuilder(userToken.getId().toString()); String workwechat = userToken.getWorkwechat(); if(workwechat == null || "".equals(workwechat)){ workwechat = userToken.getWechat(); @@ -794,7 +794,7 @@ public class GroupController { departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId()); + departmentHeadId = new StringBuilder(userToken.getId().toString()); String workwechat = userToken.getWorkwechat(); if(workwechat == null || "".equals(workwechat)){ workwechat = userToken.getWechat(); 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 d3cec534..285f8e00 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -749,7 +749,7 @@ public class MaterialController { // 如果是基础单位 for (InventoryP inventoryP : inventoryPList) { double integer = inventoryP.getBaseUnitQuantity(); - if (quantity <= (integer - inventoryP.getNumberOfTemporary())) { // 如果当前数量合适则跳出循环 + if (quantity <= (integer - (int)(inventoryP.getNumberOfTemporary() / 100))) { // 如果当前数量合适则跳出循环 flag = true; break; } 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 df4f6d8a..1ae66b18 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 @@ -2082,7 +2082,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 将当前redis中存储的spno删除 redisTemplate.delete(spNo); } - } else { + } + else { // 如果是部门负责人 String departmentheadTime = recordP.getDepartmentheadTime(); @@ -2455,9 +2456,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { flagForHasOtherDepository = false; } } + UserByPort applicantUser = LinkInterfaceUtil.FindUserById(record.getApplicantId(), userToken); - if (map.containsKey("departmentheadPass") && !flagForHasOtherDepository) { + if (map.containsKey("departmentheadPass") && !flagForHasOtherDepository && Integer.compare(applicantUser.getMaindeparment(),361) != 0) { String result = ""; String simpleTime = DateUtil.getSimpleTime(new Date()); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); @@ -2511,7 +2513,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { public void run() { // 获取responseCode（key为申请人number） //获取申请人信息 - UserByPort applicantUser = LinkInterfaceUtil.FindUserById(record.getApplicantId(), userToken); String key = "user:" + applicantUser.getNumber() + ":QyWxOutId:" + id; String responseCode = (String) redisTemplate.opsForHash().get(key, "responseCode"); qyWxOperationService.updateTemplateCard(responseCode, userToken.getName(), finalResult, userAgent); diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java index 93e1a43c..88de9d57 100644 --- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java +++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java @@ -12,6 +12,8 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONPObject; import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.mapper.DepositoryMapper; +import com.dreamchaser.depository_manage.mapper.DepositoryRecordMapper; +import com.dreamchaser.depository_manage.mapper.MaterialMapper; import com.dreamchaser.depository_manage.pojo.RestResponse; import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo; import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details; @@ -21,6 +23,7 @@ import com.dreamchaser.depository_manage.service.impl.QyWxOperationService; import com.dreamchaser.depository_manage.utils.CreateQrCodeUtil; import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil; import com.dreamchaser.depository_manage.utils.ZipMultiFileUtil; +import javafx.scene.paint.Material; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -41,10 +44,15 @@ public class TestForOther { @Autowired DepositoryRecordService depositoryRecordService; + @Autowired + DepositoryRecordMapper depositoryRecordMapper; @Autowired ExcelService excelService; + @Autowired + MaterialMapper materialMapper; + @Test @@ -53,10 +61,11 @@ public class TestForOther { ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver(); approver.setUserId("PangFuZhen"); approvalInfo.setApprover(approver); -// depositoryRecordService.reviewByQyWxApprovalOut("1",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303210016", false,2); - depositoryRecordService.reviewByQyWxApprovalIn("[1]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303220009"); + depositoryRecordService.reviewByQyWxApprovalOut("1",approvalInfo,"8ffd487e6b203bffa21142d383b70f47","2","202303240030", false,2); +// depositoryRecordService.reviewByQyWxApprovalIn("[1]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303220009"); // UserByPort userByPort = LinkInterfaceUtil.FindUserById(78, null); // List s = excelService.writeExcelForPrint(2, 4,userByPort); + // 需要出库的子订单 }