优化审批流接口，修改 货转接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/approvalFlow/AuditPathsController.java

@@ -48,7 +48,7 @@ public class AuditPathsController extends BaseController {
      * 审批通过
      */
     @RepeatSubmit
-    @GetMapping("/approved")
+    @PostMapping("/approved")
     public AjaxResult approved(@RequestBody AuditItems auditItems) {
         if (StringUtils.isNull(auditItems.getActId())) {
             return AjaxResult.error("操作失败 未找到活动号，请确认");
@@ -66,7 +66,7 @@ public class AuditPathsController extends BaseController {
      * 审批驳回
      */
     @RepeatSubmit
-    @GetMapping("/approvalRejected")
+    @PostMapping("/approvalRejected")
     public AjaxResult approvalRejected(@RequestBody AuditItems auditItems) {
         if (StringUtils.isNull(auditItems.getActId())) {
             return AjaxResult.error("操作失败 未找到活动号，请确认");
@@ -110,7 +110,7 @@ public class AuditPathsController extends BaseController {
      * 根据id、actId 查询审批流
      */
     @PreAuthorize("@ss.hasPermi('warehouse:paths:query')")
-    @GetMapping(value = "/projectEndQueryPendingVal")
+    @PostMapping(value = "/projectEndQueryPendingVal")
     @RepeatSubmit
     public AjaxResult projectEndQueryPendingVal(@RequestBody AuditItems auditItems) {
         if (StringUtils.isNull(auditItems) || StringUtils.isNull(auditItems.getId()) || StringUtils.isNull(auditItems.getActId())) {
@@ -123,7 +123,7 @@ public class AuditPathsController extends BaseController {
      * 首页查询待审审批流
      */
     @PreAuthorize("@ss.hasPermi('warehouse:paths:query')")
-    @GetMapping(value = "/selectAllAuditItems")
+    @PostMapping(value = "/selectAllAuditItems")
     @RepeatSubmit
     public AjaxResult selectAllAuditItems(@RequestBody AuditItems auditItems) {
         /*if (StringUtils.isNull(auditItems)) {

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

@@ -80,14 +80,14 @@ public class TWarehouseGoodsTransferController extends BaseController {
     }
 
     /**
-     * 新增货转详情主表
+     * 货转暂存
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     @RepeatSubmit
     public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
-                          @RequestParam("tWhgenleg") String tWhgenleg,
+                          @RequestParam("tEnclosure") String tWhgenleg,
                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
                           @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
@@ -105,6 +105,30 @@ public class TWarehouseGoodsTransferController extends BaseController {
     }
 
     /**
+     * 货转提交
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:add')")
+    @Log(title = "详情主表", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/warehouseSubmission")
+    @RepeatSubmit
+    public AjaxResult warehouseSubmission(@RequestParam("tWarehouseBills") String tWarehouseBills,
+                                          @RequestParam("tEnclosure") String tEnclosure,
+                                          @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
+                                          @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
+                                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
+        String billsType = "HQZY";
+        if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
+            return AjaxResult.error("未找到仓库主表数据，请确认");
+        }
+        if (StringUtils.isNull(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
+            return AjaxResult.error("未找到仓库明细数据，请确认");
+        }
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return itWarehouseBillsService.warehouseSubmission(tWarehouseBills, tWarehousebillsfeesCr,
+                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);
+    }
+
+    /**
      * 新增出库详情入账
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:add')")
@@ -170,15 +194,14 @@ public class TWarehouseGoodsTransferController extends BaseController {
     }
 
     /**
-     * 撤销出库库
+     * 撤销货转
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/updateCredit")
     @RepeatSubmit
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
-                                   @RequestParam("warehousebillsitems") String warehousebillsitems,
-                                   @RequestParam("whgenleg") String whgenleg) {
+                                   @RequestParam("warehousebillsitems") String warehousebillsitems) {
         String billsType = "HQZYRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());

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

@@ -80,36 +80,27 @@ public class TWarehouseOutStockController extends BaseController {
     }
 
     /**
-     * 新增出库详情主表
+     * 出库暂存
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
-                          @RequestParam("tWhgenleg") String tWhgenleg,
+                          @RequestParam("tEnclosure") String tEnclosure,
                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
                           @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
         String billsType = "SJCK";
-        /*if (StringUtils.isEmpty(tWarehouseBills)) {
+        if (StringUtils.isEmpty(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("提交失败：请检查主表数据");
         }
-        if (tWarehousebillsitems.equals("[]")) {
+        if (StringUtils.isEmpty(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
             return AjaxResult.error("提交失败：请检查库存明细数据");
         }
-        if (tWhgenleg.equals("[]")) {
-            return AjaxResult.error("提交失败：请检查附件信息");
-        }
-        if (tWarehousebillsfeesDr.equals("[]")) {
-            return AjaxResult.error("提交失败：请检查收款明细数据");
-        }
-        if (tWarehousebillsfeesCr.equals("[]")) {
-            return AjaxResult.error("提交失败：请检查付款明细数据");
-        }*/
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,
-                tWarehousebillsfeesDr, tWarehousebillsitems, tWhgenleg, loginUser, billsType);
+                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);
     }
 
 

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/mapper/AuditItemsMapper.java

@@ -76,4 +76,11 @@ public interface AuditItemsMapper {
      * @return
      */
     int deleteUpLevelId(AuditItems auditItems);
+
+    /**
+     *  弹窗页查询审批流
+     * @param auditItems 条件
+     * @return
+     */
+    List<Map<String, Object>> selectWarehouseApprover(AuditItems auditItems);
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.approvalFlow.service.impl;
 
 import java.util.*;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -211,16 +212,15 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
     }
 
     /**
-     *  首页点击查看审批流 获取对应数据
+     *  单据点击查看审批流
      * @param auditItems 条件
      * @return 结果
      */
     @Override
     public AjaxResult projectEndQueryPendingVal(AuditItems auditItems) {
         if (auditItems.getActId() >= 110 && auditItems.getActId() <= 140) {
-            // 库存总账审批
-            Map<String, Object> map = tWarehouseBillsService.selectTWarehousebillsById(auditItems.getId());
-            return AjaxResult.success(map);
+            List<Map<String, Object>> mapList = auditItemsMapper.selectWarehouseApprover(auditItems);
+            return AjaxResult.success(mapList);
         } else if (auditItems.getActId() >= 210 && auditItems.getActId() <= 230) {
             // 财务审批
         }
@@ -228,7 +228,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
     }
 
     /**
-     *  单据点击查看审批流
+     *  首页点击查看审批流 获取对应数据
      * @param auditItems  查询条件
      * @return 结果
      */

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TGoods.java

@@ -54,7 +54,7 @@ public class TGoods extends BaseEntity {
      * 包装规格,20、25、35、50、850,kg
      */
     @Excel(name = "包装规格,20、25、35、50、850,kg")
-    private Long fPackagespecs;
+    private String fPackagespecs;
 
     /**
      * 颜色
@@ -134,11 +134,11 @@ public class TGoods extends BaseEntity {
         return fSpecs;
     }
 
-    public void setfPackagespecs(Long fPackagespecs) {
+    public void setfPackagespecs(String fPackagespecs) {
         this.fPackagespecs = fPackagespecs;
     }
 
-    public Long getfPackagespecs() {
+    public String getfPackagespecs() {
         return fPackagespecs;
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehousebillsitems.java

@@ -124,7 +124,7 @@ public class TWarehousebillsitems extends BaseEntity {
      * 包装规格
      */
     @Excel(name = "包装规格")
-    private Long fPackagespecs;
+    private String fPackagespecs;
 
     /**
      * 计划毛重
@@ -401,11 +401,11 @@ public class TWarehousebillsitems extends BaseEntity {
         return fOriginalbilldate;
     }
 
-    public void setfPackagespecs(Long fPackagespecs) {
+    public void setfPackagespecs(String fPackagespecs) {
         this.fPackagespecs = fPackagespecs;
     }
 
-    public Long getfPackagespecs() {
+    public String getfPackagespecs() {
         return fPackagespecs;
     }
 

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

@@ -50,7 +50,7 @@ public interface ITWarehouseBillsService {
      * @return 结果
      */
     public AjaxResult insertTWarehousebills(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr,
-                                            String tWarehousebillsitems, String tWhgenleg, LoginUser loginUser, String billsType);
+                                            String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String billsType);
 
     /**
      * 修改详情主表

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

@@ -368,7 +368,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     /**
-     * 新增详情主表
+     * 仓库暂存接口
      *
      * @param tWarehouseBills       仓库主表
      * @param tWarehousebillsfeesCr 仓库费付款用明细表
@@ -436,7 +436,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     wbItem.setCreateTime(new Date());
                     wbItem.setfBillstatus(10L);
                     tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
-                    if (!billsType.equals("HQZY")) {
+                    if (!"HQZY".equals(billsType)) {
                         // 添加状态log
                         insertTWarehousebillsLog(wbItem, 10L, loginUser);
                     }
@@ -488,13 +488,23 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success("成功", map);
     }
 
-
+    /**
+     * 仓库模块提交接口
+     *
+     * @param tWarehouseBills       仓库主表
+     * @param tWarehousebillsfeesCr 仓库费用付款明细表
+     * @param tWarehousebillsfeesDr 仓库费用收款明细表
+     * @param tWarehousebillsitems  仓库货物明细表
+     * @param tEnclosure
+     * @param loginUser             当前登陆人
+     * @param billsType             操作状态
+     * @return
+     */
     @Override
     @Transactional
     public AjaxResult warehouseSubmission(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr,
                                           String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String billsType) {
         Long fPid = null;
-        Map<String, Object> map = new HashMap<>();
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
         if (StringUtils.isNull(warehouseBills.getfId())) {
             warehouseBills.setfBillstatus(4L);
@@ -525,14 +535,21 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         int line = 0;
         for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
             line++;
-            // 除了入库其他模块不需要更新主表的 仓储费计费日期到明细表，其他模块 应从库存总账把仓储费计费日期 赋给明细表
-            if ("SJRK".equals(billsType)) {
-                wbItem.setfChargedate(warehouseBills.getfChargedate());
-                wbItem.setfOriginalbilldate(warehouseBills.getfBsdate());
-            }
-            if (!wbItem.getfBillstatus().equals(40L)) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("库存明细第" + line + "行状态异常，请确认");
+            if ("SJRK".equals(billsType) || "SJCK".equals(billsType)) {
+                // 除了入库其他模块不需要更新主表的 仓储费计费日期到明细表，其他模块 应从库存总账把仓储费计费日期 赋给明细表
+                if ("SJRK".equals(billsType)) {
+                    wbItem.setfChargedate(warehouseBills.getfChargedate());
+                    wbItem.setfOriginalbilldate(warehouseBills.getfBsdate());
+                }
+                if (!wbItem.getfBillstatus().equals(40L)) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("库存明细第" + line + "行状态异常，请确认");
+                }
+            } else {
+                if (!wbItem.getfBillstatus().equals(6L)) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("库存明细第" + line + "行状态异常，请确认");
+                }
             }
             if (StringUtils.isNull(wbItem.getfChargedate())) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -1530,7 +1547,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     tWarehousebills.setfCorpid(fCorpid);
                     TWhgenleg tWhgenle2 = queryTWhgenleg(tWarehousebills, wb);
                     updateTWhgenlegData(wb, tWhgenle2.getfId(), "SJCKRevoke");
-                } else if ("HQZYRevoke".equals(billsType)) { // 货转撤销 HQZYRevoke
+                } else if ("HQZYRevoke".equals(billsType)) { // 货转撤销
                     Long fCorpid = tWarehousebills.getfCorpid();// 原货权方
                     Long fTocorpid = tWarehousebills.getfTocorpid(); // 新货权方
                     //  1、新货权方撤销入库
@@ -1545,9 +1562,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     }
                     //  2、原货权方撤销出库
                     // 查询库存总账
+                    tWarehousebills.setfCorpid(fCorpid);
                     TWhgenleg tWhgenle2 = queryTWhgenleg(tWarehousebills, wb);
                     updateTWhgenlegData(wb, tWhgenle2.getfId(), "SJCKRevoke");
-                    tWarehousebills.setfCorpid(fCorpid);
                 }
                 i++;
                 wb.setfBillstatus(10L);

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsMapper.xml

@@ -177,4 +177,20 @@
             AND item.level_id > #{auditItems.levelId}
     </delete>
 
+    <select id="selectWarehouseApprover" parameterType="com.ruoyi.approvalFlow.domain.AuditItems" resultType="Map">
+        SELECT
+            aud.id,
+            us.user_name AS userName,
+            us.nick_name AS nickName,
+            aud.audit_status AS auditStatus,
+            aud.audit_msg AS auditMsg,
+            aud.audit_item AS auditItem
+        FROM
+            audit_items aud
+            LEFT JOIN sys_user us ON us.user_id = aud.audit_user_id
+        WHERE
+            aud.act_id = #{actId}
+            AND aud.bill_id = #{id}
+    </select>
+
 </mapper>

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -318,13 +318,6 @@
                 f_grossweightC = f_grossweightC - #{map.warehousebillsitems.fGrossweight},
                 f_qtyblc = f_qtyblc + #{map.warehousebillsitems.fQty}
             </if>
-            /*判断是否撤销货转*/
-            <if test="map.billType == 'HQZYRevoke'">
-                f_qtyC = f_qtyC - #{map.warehousebillsitems.fQty},
-                f_volumnC = f_volumnC - #{map.warehousebillsitems.fVolumn},
-                f_netweightC = f_netweightC - #{map.warehousebillsitems.fNetweight},
-                f_grossweightC = f_grossweightC - #{map.warehousebillsitems.fGrossweight}
-            </if>
             -- update_by = NOW()
         </trim>
         where f_id = #{map.whgenlegId}

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -379,17 +379,17 @@
 
     <delete id="deleteTWarehousebillsByIds" parameterType="String">
         delete
-        item.*,
-        bill.*,
-        fess.*,
-        enclosure.*
+            item.*,
+            bill.*,
+            fess.*,
+            enclosure.*
         from
-        t_warehousebills bill
-        LEFT JOIN t_warehousebillsfees fess ON fess.f_pid = bill.f_id
-        LEFT JOIN t_enclosure enclosure ON enclosure.f_pid = bill.f_id
-        LEFT JOIN t_warehousebillsitems item ON item.f_pid = bill.f_id
+            t_warehousebills bill
+            LEFT JOIN t_warehousebillsfees fess ON fess.f_pid = bill.f_id
+            LEFT JOIN t_enclosure enclosure ON enclosure.f_pid = bill.f_id
+            LEFT JOIN t_warehousebillsitems item ON item.f_pid = bill.f_id
         where
-        bill.f_id in
+            bill.f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">
             #{fId}
         </foreach>