功能修改

src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java

@@ -466,20 +466,22 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl<LdOneOutStorageMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean delete(Long id) {
-        //根据id删除一级出库表
+        LdOneOutStorage oneOutStorage = this.getById(id);
-        this.removeById(id);
         //根据id查询一级出库明细
         List<LdOneOutStorageDetail> oneOutStorageDetails = oneOutStorageDetailService.list(Wrappers.<LdOneOutStorageDetail>lambdaQuery().eq(LdOneOutStorageDetail::getOneOutStorageId,id));
-        //还原库存
+        if("2".equals(oneOutStorage.getStatus())){
-        for (LdOneOutStorageDetail ldOneOutStorageDetail : oneOutStorageDetails) {
+            //已提交的还原库存
-            System.out.println(ldOneOutStorageDetail.getOneFormId());
+            for (LdOneOutStorageDetail ldOneOutStorageDetail : oneOutStorageDetails) {
-            // 库存
+                System.out.println(ldOneOutStorageDetail.getOneFormId());
-            LdOneForm oneForm = oneFormService.getByMaterialCode(ldOneOutStorageDetail.getMaterialCode(),ldOneOutStorageDetail.getOneFormId());
+                // 库存
-            // 计算数量 金额
+                LdOneForm oneForm = oneFormService.getByMaterialCode(ldOneOutStorageDetail.getMaterialCode(),ldOneOutStorageDetail.getOneFormId());
-            BigDecimal result = oneForm.getNum().add(ldOneOutStorageDetail.getOutboundQuantity());
+                // 计算数量 金额
-            oneForm.setNum(result);
+                BigDecimal result = oneForm.getNum().add(ldOneOutStorageDetail.getOutboundQuantity());
-            oneFormService.updateById(oneForm);
+                oneForm.setNum(result);
+                oneFormService.updateById(oneForm);
+            }
         }
+
         List<Long> detailIdList = oneOutStorageDetails.stream().map(LdOneOutStorageDetail::getId).collect(Collectors.toList());
         if(!CollectionUtils.isEmpty(detailIdList)){
             oneOutStorageDetailService.removeByIds(detailIdList);
@@ -507,7 +509,8 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl<LdOneOutStorageMappe
                 twoPutStorageDetailService.removeByIds(twoDetailIdList);
             }
         }
-
+        //根据id删除一级出库表
+        this.removeById(id);
         return true;
     }
 }

src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java

@@ -440,6 +440,8 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl<LdOnePutStorageMappe
         // 3.删除明细
         deleteDetails(dto);
 
+        // 4. 提交审批
+        submitForApproval(dto);
         return true;
     }