[CODE]: 入库出库汇总

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/reportManagement/TWarehousebillsitemsSummaryController.java

@@ -0,0 +1,57 @@
+package com.ruoyi.web.controller.warehouse.reportManagement;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.reportManagement.domain.TWhgenleg;
+import com.ruoyi.reportManagement.service.ITWhgenlegService;
+import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 出入库汇总Controller
+ *
+ * @author ruoyi
+ * @date 2020-12-23
+ */
+@RestController
+@RequestMapping("/warehouseBusiness/summary")
+public class TWarehousebillsitemsSummaryController extends BaseController {
+    @Autowired
+    private ITWarehouseBillsService itWarehouseBillsService;
+
+    /**
+     * 查询库存总账列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TWarehouseBills tWarehouseBills) {
+        startPage();
+        List<Map<String, Object>> list = itWarehouseBillsService.selectInventoryList(tWarehouseBills);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存总账列表
+     */
+    /*@PreAuthorize("@ss.hasPermi('warehouseBusiness:whgenleg:export')")
+    @Log(title = "库存总账", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TWhgenleg tWhgenleg) {
+        List<TWhgenleg> list = tWhgenlegService.selectTWhgenlegList(tWhgenleg);
+        ExcelUtil<TWhgenleg> util = new ExcelUtil<TWhgenleg>(TWhgenleg.class);
+        return util.exportExcel(list, "whgenleg");
+    }*/
+
+
+
+}

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

@@ -136,6 +136,10 @@ public class AuditItemsServiceImpl implements IAuditItemsService {
                     return AjaxResult.error("审批流第" + num + "级所选角色中没有用户");
                 }
             } else {
+                if(userIdList.size() ==0){
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("生成审批流明细失败，请联系管理员添加审批人员");
+                }
                 auditItem.setAuditUserId(userIdList.get(0));
                 int addAuditItem = auditItemsMapper.insertAuditItems(auditItem);
                 if (addAuditItem <= 0) {

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

@@ -6,7 +6,7 @@ import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import org.apache.ibatis.annotations.Param;
 
-import javax.xml.crypto.Data;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -89,4 +89,6 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
      * @return 详情主表集合
      */
     public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(@Param("fId") Long fid);
+
+    List<Map<String, Object>> selectInventoryList(TWarehouseBills tWarehousebills);
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.warehouseBusiness.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.reportManagement.domain.TWhgenleg;
 import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 
@@ -174,4 +175,12 @@ public interface ITWarehouseBillsService {
      * @return
      */
     public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(Long  fId);
+
+    /**
+     * 查询出入库汇总列表
+     *
+     * @param tWarehouseBills 仓储主表
+     *      * @return 库存总账集合
+     */
+    List<Map<String, Object>> selectInventoryList(TWarehouseBills tWarehouseBills);
 }

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

@@ -566,6 +566,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             isApprove = true;
         }
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
+        warehouseBills.setfItemsStatus(4L);
         if (StringUtils.isNull(warehouseBills.getfId())) {
             if (isApprove) {
                 warehouseBills.setfBillstatus(4L);
@@ -738,6 +739,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return tWarehouseBillsMapper.selectTWarehousebillsItemsList(fId);
     }
 
+    @Override
+    public List<Map<String, Object>> selectInventoryList(TWarehouseBills tWarehouseBills) {
+        return tWarehouseBillsMapper.selectInventoryList(tWarehouseBills);
+    }
+
     /**
      * 根据仓库主表id 更新对应明细表状态
      *
@@ -1468,9 +1474,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (billstatus && (StringUtils.isNull(warehouseItems) || "[]".equals(warehouseItems))) {
             return AjaxResult.error("未找到计费物资明细无法提交");
         }
-        if (billstatus && (StringUtils.isNull(warehouseFees) || "[]".equals(warehouseFees))) {
+        /*if (billstatus && (StringUtils.isNull(warehouseFees) || "[]".equals(warehouseFees))) {
             return AjaxResult.error("未找到应收款明细无法提交");
-        }
+        }*/
         if (StringUtils.isNotNull(tWarehousebills.getfId())) {
             fPid = tWarehousebills.getfId();
             tWarehousebills.setUpdateTime(new Date());

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

@@ -267,6 +267,43 @@
             w.f_id = #{fId}
     </select>
 
+    <select id="selectInventoryList" parameterType="TWarehousebills"  resultType="java.util.Map">
+        SELECT
+            co.f_name AS fName,
+            it.f_bsdate AS fBsdate,
+            leg.f_mblno AS fMblno,
+            it.f_business_type AS fBusinessType,
+            dict.dict_label AS fBusinessTypes,
+            it.f_marks AS fMarks ,
+            go.f_name AS fGoodsName,
+            area.f_name AS fWarehouseLocationids,
+            leg.f_trademodeid AS fTrademodeid,
+            it.f_qty AS fQty,
+            it.f_grossweight AS fGrossweight,
+            it.f_netweight AS fNetweight
+        FROM
+            t_warehousebills leg
+                LEFT JOIN t_warehousebillsitems it ON leg.f_id = it.f_pid
+                LEFT JOIN t_goods go ON it.f_goodsid = go.f_id
+                LEFT JOIN t_corps co ON leg.f_corpid = co.f_id
+                LEFT JOIN sys_dict_data dict ON dict.dict_value = it.f_business_type
+                LEFT JOIN t_warehouse_area area ON area.f_id = it.f_warehouselocid
+        <where>
+            dict.status = '0'
+            AND dict.dict_type = 'storage_type'
+            AND leg.f_billtype in ('SJRk','SJCK')
+            <if test="fBilltype != null">AND leg.f_billtype = #{fBilltype}</if>
+            <if test="fWarehouseid != null ">and leg.f_warehouseid = #{fWarehouseid}</if>
+            <if test="fWarehouseid != null ">and it.f_warehouselocid = #{fWarehouseid}</if>
+            <if test="fGoodsid != null ">and it.f_goodsid = #{fGoodsid}</if>
+
+            <if test="fTrademodeid != null ">and leg.f_trademodeid = #{fTrademodeid}</if>
+            <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
+            <if test="fMblno != null ">and leg.f_mblno = #{fMblno}</if>
+
+        </where>
+    </select>
+
     <insert id="insertTWarehousebills" parameterType="TWarehousebills" useGeneratedKeys="true" keyProperty="fId">
         insert into t_warehousebills
         <trim prefix="(" suffix=")" suffixOverrides=",">