完成组合出库功能修改

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

@@ -637,6 +637,20 @@ public class GroupController {
                 result += groupInfoByGid.size();
             }
         }
+        if (map.containsKey("constructionUnitId")) {
+            String constructionUnitId = map.get("constructionUnitId").toString();
+            if ("".equals(constructionUnitId)) {
+                map.remove("constructionUnitId");
+            }
+        }
+        if (map.containsKey("adminorgId")) {
+            String adminorgId = map.get("adminorgId").toString();
+            if ("".equals(adminorgId)) {
+                map.put("adminorgId", userToken.getMaindeparment());
+            }
+        } else {
+            map.put("adminorgId", userToken.getMaindeparment());
+        }
         try {
             integer += groupService.insertApplicationOutRecord(map, userToken); // 插入主订单
         } catch (Exception e) {

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

@@ -607,7 +607,7 @@ public class GroupServiceImpl implements GroupService {
             }
         }
         // 用于统计出库物料总数
-        Integer quantityForTotal = 0;
+        double quantityForTotal = 0;
 
         // 用于统计出库物料金额总数
         double priceForTotal = 0;
@@ -654,7 +654,7 @@ public class GroupServiceImpl implements GroupService {
                 }
             }
         }
-        paramForOut.put("quantity", quantityForTotal);
+        paramForOut.put("quantity", quantityForTotal * 100);
         paramForOut.put("price", priceForTotal);
         paramForOut.put("applicantTime", System.currentTimeMillis());
         paramForOut.put("istransfer", 2);
@@ -671,7 +671,7 @@ public class GroupServiceImpl implements GroupService {
         parentId = paramForOut.get("id");
 
         // 插入子订单
-        result += insertApplicationOutMinRecord(userToken, code, parentId, gid, quantityForGroup, depositoryIdList);
+        result += insertApplicationOutMinRecord(map, code, parentId, gid, quantityForGroup, depositoryIdList);
 
         if (params != null && params.size() > 0) {
             // 如果提交的不是单个
@@ -693,7 +693,7 @@ public class GroupServiceImpl implements GroupService {
                     quantityForTotal += quantityForGroup * groupInfo.getQuantity();
                     priceForTotal += inventory.get(0).getPrice() * 100 * quantityForGroup;
                 }
-                result += insertApplicationOutMinRecord(userToken, code, parentId, gid, quantityForGroup, depositoryIdList);
+                result += insertApplicationOutMinRecord(map, code, parentId, gid, quantityForGroup, depositoryIdList);
             }
 
         }
@@ -951,7 +951,7 @@ public class GroupServiceImpl implements GroupService {
     /**
      * 用于插入子出库订单
      *
-     * @param userToken        申请人
+     * @param map        申请条件
      * @param code             出库单号
      * @param parentId         主单号
      * @param gid              组合id
@@ -959,7 +959,7 @@ public class GroupServiceImpl implements GroupService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public Integer insertApplicationOutMinRecord(UserByPort userToken, String code, Object parentId, Integer gid, Integer quantityForGroup, List<Integer> depositoryIdList) {
+    public Integer insertApplicationOutMinRecord(Map<String,Object> map, String code, Object parentId, Integer gid, Integer quantityForGroup, List<Integer> depositoryIdList) {
 
         // 用于存储申请数
         Integer result = 0;
@@ -1056,10 +1056,14 @@ public class GroupServiceImpl implements GroupService {
                 paramForOutMin.put("unit", groupInfo.getUnit());
                 paramForOutMin.put("mid", mid);
                 paramForOutMin.put("trueOut", 0);
-                paramForOutMin.put("quantity", quantity);
+                paramForOutMin.put("quantity", quantity * 100);
                 paramForOutMin.put("code", code);
                 paramForOutMin.put("placeId", 0);
+                paramForOutMin.put("constructionUnitId", map.get("constructionUnitId"));
+                paramForOutMin.put("adminorgId", map.get("adminorgId"));
+
                 result += depositoryRecordMapper.insertApplicationOutRecordMin(paramForOutMin);
+
             } else {
                 throw new MyException(groupInfo.getMname() + ",库存不足");
             }

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

@@ -47,7 +47,7 @@ public class TestForOther {
         ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
         approver.setUserId("PangFuZhen");
         approvalInfo.setApprover(approver);
-        depositoryRecordService.reviewByQyWxApprovalOut("5",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303180009", false,2);
+        depositoryRecordService.reviewByQyWxApprovalOut("1",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303180021", false,2);
     }