仓库业务->修改bug

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/feesModify/TWarehousebillsModifyController.java

@@ -7,7 +7,6 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsModify;
 import com.ruoyi.warehouseBusiness.domain.dto.WarehousebillsModifyDTO;
-import com.ruoyi.warehouseBusiness.domain.vo.WarehousebillsModifyVO;
 import com.ruoyi.warehouseBusiness.service.ITWarehousebillsModifyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -78,6 +77,16 @@ public class TWarehousebillsModifyController extends BaseController {
     }
 
     /**
+     * 撤回已经审核的数据
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:modify:edit')")
+    @Log(title = "仓库主(出入库)", businessType = BusinessType.UPDATE)
+    @GetMapping("/revokeById")
+    public AjaxResult revoke(@RequestParam("id") Long id) {
+        return tWarehousebillsModifyService.revokeReviewedById(id);
+    }
+
+    /**
      * 删除仓库主(出入库)
      */
     @PreAuthorize("@ss.hasPermi('warehouse:modify:remove')")

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -637,7 +637,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                             warehousebillsModifyService.additionalFeeInformation(auditItems.getBillId(), WarehouseTypeEnum.APPROVE);
                         } else if ("F".equals(at.getIffinalItem())) {
                             fettle = 5L;
-                            warehousebillsModifyService.additionalFeeInformation(auditItems.getBillId(), WarehouseTypeEnum.APPROVE);
+                            warehousebillsModifyService.additionalFeeInformation(auditItems.getBillId(), WarehouseTypeEnum.UNDER_REVIEW);
                         }
                     }
                     if ("F".equals(at.getIffinalItem())) {

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehousebillsModifyService.java

@@ -71,4 +71,11 @@ public interface ITWarehousebillsModifyService {
      */
     AjaxResult selectTWarehousebillsFeesById(Long fId, String type);
 
+    /**
+     * 已经审核完成，要撤回
+     *
+     * @param id 主表id
+     * @return
+     */
+    AjaxResult revokeReviewedById(Long id);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehousebillsModifyServiceImpl.java

@@ -288,7 +288,6 @@ public class TWarehousebillsModifyServiceImpl implements ITWarehousebillsModifyS
             li.setUpdateBy(SecurityUtils.getUsername());
             li.setfStatus(Long.parseLong(typeEnum.getType()));
             li.setfBillstatus(Long.parseLong(typeEnum.getType()));
-            tWarehousebillsfeesModifyMapper.updateTWarehousebillsfeesModify(li);
             if (typeEnum.getType().equals(WarehouseTypeEnum.APPROVE.getType())) {
                 // 往仓储费用表追加数据
                 TWarehousebillsfees warehousebillsfees = new TWarehousebillsfees();
@@ -307,7 +306,9 @@ public class TWarehousebillsModifyServiceImpl implements ITWarehousebillsModifyS
                 warehousebillsfees.setfStlamountNo(null);
                 warehousebillsfees.setfInvnos(null);
                 warehousebillsfeesMapper.insertTWarehousebillsfees(warehousebillsfees);
+                li.setSrcId(warehousebillsfees.getfId());
             }
+            tWarehousebillsfeesModifyMapper.updateTWarehousebillsfeesModify(li);
         });
     }
 
@@ -434,6 +435,30 @@ public class TWarehousebillsModifyServiceImpl implements ITWarehousebillsModifyS
     }
 
     /**
+     * 已经审核完成，要撤回
+     *
+     * @param id 主表id
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult revokeReviewedById(Long id) {
+        TWarehousebillsModify warehousebillsModify = tWarehousebillsModifyMapper.selectTWarehousebillsModifyById(id);
+        if (Objects.isNull(warehousebillsModify) || !warehousebillsModify.getfStatus().equals(FeesTypeEnum.APPROVE.getType())) {
+            throw new WarehouseException("无效id或未审核完成");
+        }
+        List<TWarehousebillsfeesModify> warehousebillsfeesModifies = tWarehousebillsfeesModifyMapper.selectListByPid(id);
+        warehousebillsfeesModifies.forEach(li -> {
+            warehousebillsfeesMapper.deleteTWarehousebillsfeesById(li.getSrcId());
+        });
+        warehousebillsModify.setfStatus(FeesTypeEnum.SAVE.getType());
+        warehousebillsModify.setUpdateTime(new Date());
+        warehousebillsModify.setUpdateBy(SecurityUtils.getUsername());
+        tWarehousebillsModifyMapper.updateTWarehousebillsModify(warehousebillsModify);
+        return AjaxResult.success();
+    }
+
+    /**
      * 撤回已提交的审批
      *
      * @param id