添加入库明细提交审核(未完成未完成未完成)

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

@@ -335,6 +335,18 @@ public class TWarehouseInStockController extends BaseController {
     }
 
     /**
+     * 入库明细提交审批确认
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:add')")
+    @Log(title = "详情主表", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/addDetails/{fId}")
+    @RepeatSubmit
+    public AjaxResult addDetails(@PathVariable("fId") Long fId) {
+        String billsType = "SJRKITEM";
+        return itWarehouseBillsService.addDetails(fId, billsType);
+    }
+
+    /**
      *   明細流水号
      */
     @PostMapping(value = "/serialNumber")

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/impl/FTmsaccbillsServiceImpl.java

@@ -255,7 +255,6 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
         }
         fTmsaccbills.setfAmtcr(amt);
         fTmsaccbills.setfAmtdr(amtDr);
-        System.out.println("更新金额：" + fTmsaccbills.toString());
         fTmsaccbillsMapper.updateFTmsaccbills(fTmsaccbills);
         map.put("tFee", fTmsaccbillsMapper.selectFTmsaccbillsById(fPid));
         return AjaxResult.success("成功", map);

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

@@ -3,8 +3,6 @@ package com.ruoyi.warehouseBusiness.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -322,6 +320,10 @@ public class TWarehousebillsitems extends BaseEntity {
     @Excel(name = "封号")
     private String fSealno;
 
+    /** 明细审批状态 */
+    @Excel(name = "明细审批状态")
+    private Long fItemstatus;
+
     /**
      * 备注
      */
@@ -795,6 +797,14 @@ public class TWarehousebillsitems extends BaseEntity {
         this.fOrgwarehouseInformation = fOrgwarehouseInformation;
     }
 
+    public Long getfItemstatus() {
+        return fItemstatus;
+    }
+
+    public void setfItemstatus(Long fItemstatus) {
+        this.fItemstatus = fItemstatus;
+    }
+
     @Override
     public String toString() {
         return "TWarehousebillsitems{" +

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsitemsMapper.java

@@ -133,6 +133,13 @@ public interface TWarehousebillsitemsMapper extends BaseMapper<TWarehousebillsit
     public TWarehousebillsitems selectItemQtyByFPid(Long fPid);
 
     /**
+     *  根据主表id查询明细状态
+     * @param fId
+     * @return
+     */
+    public List<TWarehousebillsitems> selectItemsStatusByPid(Long fId);
+
+    /**
      *  根据主表id查询明细最小日期
      * @param fId
      * @return

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

@@ -453,4 +453,9 @@ public interface ITWarehouseBillsService {
      * 查询仓储仓管员角色用户
      */
     public AjaxResult queryClerkRoleList();
+
+    /**
+     * 入库明细提交审批确认
+     */
+    public AjaxResult addDetails(Long fId, String billsType);
 }

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

@@ -3020,6 +3020,86 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     /**
+     * 入库明细提交审批确认
+     *
+     *  待完善！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！
+     */
+    @Override
+    @Transactional
+    public AjaxResult addDetails(Long fId, String billsType) {
+        TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(fId);
+        if (StringUtils.isNull(tWarehouseBills)) {
+            return AjaxResult.error("未找到仓储信息，请确认是否存在");
+        }
+        List<TWarehousebillsitems> warehousebillsitemsList = tWarehousebillsitemsMapper.selectItemsStatusByPid(fId);
+        if (StringUtils.isEmpty(warehousebillsitemsList)) {
+            return AjaxResult.error("未找到仓储库存明细信息，请确认是否存在");
+        }
+        for (TWarehousebillsitems item : warehousebillsitemsList) {
+            if (item.getfItemstatus() != 40L || item.getfItemstatus() == 50L) {
+                return AjaxResult.error("库存明细中存在审核中数据，无法再次提交请核");
+            }
+        }
+        boolean isApprove;
+        long itemStatus = 6L;
+        SysConfig sysConfig = queryWarehouseConfig(billsType);
+        if (StringUtils.isNull(sysConfig)) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("系统参数异常，未找到开启审批流参数");
+        }
+        if ("0".equals(sysConfig.getConfigValue())) {
+            isApprove = true;
+            itemStatus = 4L;
+            tWarehouseBills.setfItemsStatus(3L);
+            tWarehouseBills.setUpdateTime(new Date());
+            tWarehouseBills.setUpdateBy(SecurityUtils.getUsername());
+        } else {
+            tWarehouseBills.setfItemsStatus(4L);
+            tWarehouseBills.setUpdateTime(new Date());
+            tWarehouseBills.setUpdateBy(SecurityUtils.getUsername());
+        }
+        tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
+        for (TWarehousebillsitems item : warehousebillsitemsList) {
+            item.setUpdateTime(new Date());
+            item.setUpdateBy(SecurityUtils.getUsername());
+            item.setfItemstatus(itemStatus);
+            tWarehousebillsitemsMapper.updateTWarehousebillsitems(item);
+        }
+        /*if (isApprove) {
+            AuditItems auditItems = new AuditItems();
+            auditItems.setLevelId(0L);
+            auditItems.setBillId(warehouseBills.getfId());
+            auditItems.setActId(actId);
+            auditItems.setIffinalItem("F");
+            auditItems.setBillNo(tWarehouseBills.getfBillno());
+            // 存储委托方（货权方）
+            auditItems.setRefno1(tWarehouseBills.getfCorpid() + "");
+            // 存储业务类型（业务类型）
+            auditItems.setRefno2(tWarehouseBills.getfBilltype());
+            // 存储提单号（提单号）
+            auditItems.setRefno3(tWarehouseBills.getfMblno());
+            auditItems.setSendUserId(loginUser.getUser().getUserId());
+            auditItems.setSendName(SecurityUtils.getUsername());
+            auditItems.setSendTime(new Date());
+            auditItems.setAuditUserId(loginUser.getUser().getUserId());
+            auditItems.setAuditItem(new Date());
+            auditItems.setAuditOpTime(new Date());
+            auditItems.setAuditMsg("提交");
+            auditItems.setAuditStatus("O");
+            AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
+//            Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
+            String code = approvalFlow.get("code").toString();
+//                Long code = Long.valueOf(String.valueOf(ajaxResult.get("code"))).longValue();
+            if ("500".equals(code)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            }
+            return approvalFlow;
+        }*/
+
+        return AjaxResult.success();
+    }
+
+    /**
      * 出库、调拨、货转 确认
      *
      * @param warehouseBills
@@ -4592,6 +4672,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             key = "transfer.orders.approvalFlow";
         } else if ("HWTG".equals(billsType)) {
             key = "cargoClearance.orders.approvalFlow";
+        } else if ("SJRKITEM".equals(billsType)) {
+//            key = "cargoClearance.orders.approvalFlow";
         }
         return sysConfigMapper.checkConfigKeyUnique(key);
     }

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

@@ -675,6 +675,17 @@
             f_pid = #{fId}
     </select>
 
+    <select id="selectItemsStatusByPid" resultType="com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems">
+        SELECT
+            f_id,
+            f_billstatus,
+            f_itemstatus
+        FROM
+            t_warehousebillsitems
+        WHERE
+            f_pid = #{fId}
+    </select>
+
     <update id="warehouseItemFollowUpdate" parameterType="Long">
         update
             t_warehousebillsitems