修改bug

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<Place> 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())) {

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();

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;
                             }

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);

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<String> s = excelService.writeExcelForPrint(2, 4,userByPort);
+        // 需要出库的子订单
     }