Browse Source

[CODE]: 撤销请核,加上判断财务已经对帐或者收费或者付费,不能撤销,同时提示 对帐或者收费或者付费 -- 论垃圾代码怎么产生的

maxianghua 4 years ago
parent
commit
eea37ba7b1

+ 9 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseGoodsTransferController.java

@@ -192,6 +192,15 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit
     public AjaxResult withdrawById(@PathVariable("fId") Long fId) {
+        // 查询是否对账、收费、付费
+        int result = itWarehouseBillsService.derecognition(fId);
+        if(result == 1){
+            return AjaxResult.error("撤销请核失败,财务已对账");
+        } else if (result == 2){
+            return AjaxResult.error("撤销请核失败,财务已收费");
+        } else if (result == 3){
+            return AjaxResult.error("撤销请核失败,财务已付费");
+        }
         String billsType = "HQZYRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());

+ 9 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -162,6 +162,15 @@ public class TWarehouseInStockController extends BaseController {
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit
     public AjaxResult withdrawById(@PathVariable("fId") Long fId) {
+        // 查询是否对账、收费、付费
+        int result = itWarehouseBillsService.derecognition(fId);
+        if(result == 1){
+            return AjaxResult.error("撤销请核失败,财务已对账");
+        } else if (result == 2){
+            return AjaxResult.error("撤销请核失败,财务已收费");
+        } else if (result == 3){
+            return AjaxResult.error("撤销请核失败,财务已付费");
+        }
         String billsType = "SJRKRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());

+ 9 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseOutStockController.java

@@ -182,6 +182,15 @@ public class TWarehouseOutStockController extends BaseController {
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit
     public AjaxResult withdrawById(@PathVariable("fId") Long fId) {
+        // 查询是否对账、收费、付费
+        int result = itWarehouseBillsService.derecognition(fId);
+        if(result == 1){
+            return AjaxResult.error("撤销请核失败,财务已对账");
+        } else if (result == 2){
+            return AjaxResult.error("撤销请核失败,财务已收费");
+        } else if (result == 3){
+            return AjaxResult.error("撤销请核失败,财务已付费");
+        }
         String billsType = "SJCKRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());

+ 9 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseStockTransferController.java

@@ -219,6 +219,15 @@ public class TWarehouseStockTransferController extends BaseController {
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit
     public AjaxResult withdrawById(@PathVariable("fId") Long fId) {
+        // 查询是否对账、收费、付费
+        int result = itWarehouseBillsService.derecognition(fId);
+        if(result == 1){
+            return AjaxResult.error("撤销请核失败,财务已对账");
+        } else if (result == 2){
+            return AjaxResult.error("撤销请核失败,财务已收费");
+        } else if (result == 3){
+            return AjaxResult.error("撤销请核失败,财务已付费");
+        }
         String billsType = "CKDBRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());

+ 6 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsfeesMapper.java

@@ -87,4 +87,10 @@ public interface TWarehousebillsfeesMapper extends BaseMapper<TWarehousebillsfee
     List<TWarehousebillsfees> selectTWarehousebillsfeesByPId(Long fPid);
 
     List<TWarehousebillsfees> selectWarehousebillsfeesByPId(Long fId);
+
+    public int selectReconciliation(Long fId);
+
+    public int selectCharge(Long fId);
+
+    public int selectPay(Long fId);
 }

+ 1 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -188,4 +188,5 @@ public interface ITWarehouseBillsService {
 
     AjaxResult serialNumber( String billsType);
 
+    public int derecognition(Long fId);
 }

+ 19 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -810,6 +810,25 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success("成功",map);
     }
 
+    @Override
+    public int derecognition(Long fId) {
+        // 查询对账
+        int reconciliation = tWarehousebillsfeesMapper.selectReconciliation(fId);
+        // 查询收费
+        int charge = tWarehousebillsfeesMapper.selectCharge(fId);
+        // 查询付费
+        int pay = tWarehousebillsfeesMapper.selectPay(fId);
+        if(reconciliation <=0 ){
+            return 1;
+        }else if(charge <=0){
+            return 2;
+        }else if(pay <=0){
+            return 3;
+        }else {
+            return 4;
+        }
+    }
+
     /**
      * 根据仓库主表id 更新对应明细表状态
      *

+ 10 - 0
ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsfeesMapper.xml

@@ -119,6 +119,16 @@
         <include refid="selectTWarehousebillsfeesVo"/>
         where f_pid = #{fId}
     </select>
+    <select id="selectReconciliation" resultType="java.lang.Integer">
+        SELECT count(f_id) FROM   t_warehousebillsfees  WHERE f_pid = #{fId} AND f_accamount_date IS NOT NULL;
+    </select>
+    <select id="selectCharge" resultType="java.lang.Integer">
+        SELECT count(f_id) FROM   t_warehousebillsfees  WHERE f_pid = #{fId} AND  f_dc = 'D'  AND f_stlamount_date IS NOT NULL;
+    </select>
+    <select id="selectPay" resultType="java.lang.Integer">
+        SELECT count(f_id) FROM   t_warehousebillsfees  WHERE f_pid = #{fId} AND  f_dc = 'C'  AND f_stlamount_date IS NOT NULL;
+    </select>
+
 
     <insert id="insertTWarehousebillsfees" parameterType="TWarehousebillsfees" useGeneratedKeys="true"
             keyProperty="fId">