修改审批相关的问题

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

@@ -1971,7 +1971,7 @@ public class PageController {
             String unit = applicationOutRecordMin.getUnit();
             if ("-1".equals(unit)) {
                 if (inventoryById.getPrice() != null) {
-                    double amounts = inventoryById.getPrice() * applicationOutRecordMin.getQuantity();
+                    double amounts = ObjectFormatUtil.multiply(inventoryById.getPrice(), applicationOutRecordMin.getQuantity());
                     sumPrice = ObjectFormatUtil.sum(sumPrice,amounts);
 
                 }

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

@@ -2794,7 +2794,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         // 用于标志该仓库是否为前置仓下的仓库
         boolean flagForHasOtherDepository = true; //默认是前置仓下的仓库
         // 获取当前出库是否为开放出库
+        String manager1 = record.getDepositoryManager();
         int flagForOpenDepository = record.getFlagForOpenDepository();
+        if (manager1 != null) {
+            flagForHasOtherDepository = false;
+        } else {
             if (flagForOpenDepository != 1) {
 
                 // 如果是开放仓库
@@ -2816,7 +2820,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     }
                 }
             }
-
+        }
         if (map.containsKey("departmentheadPass") && !flagForHasOtherDepository) {
             // 如果是第一位部门负责人审批且可进入该流程
 

src/main/java/com/dreamchaser/depository_manage/utils/ObjectFormatUtil.java

@@ -36,4 +36,11 @@ public class ObjectFormatUtil {
         return bd1.add(bd2).doubleValue();
     }
 
+    // double 类型相乘
+    public static double multiply(double d1,double d2){
+        BigDecimal bd1 = new BigDecimal(Double.toString(d1));
+        BigDecimal bd2 = new BigDecimal(Double.toString(d2));
+        return bd1.multiply(bd2).doubleValue();
+    }
+
 }

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

@@ -101,7 +101,7 @@ public class OtherTest {
     public void someTest(){
         double a = 1.1;
         double b = 2.2;
-        a += b;
+        a = ObjectFormatUtil.multiply(a,b);
         System.out.println(a);
     }