添加仓库数据权限

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

@@ -45,9 +45,9 @@ public class AuditPathsActsController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouse:pathsActs:list')")
     @GetMapping("/auditPathslist")
-    public Map<String, Object> auditPathslist(AuditPaths auditPaths) {
+    public Map<String, Object> auditPathslist(AuditPathsActs auditPathsActs) {
         startPage();
-        return auditPathsActsService.selectAuditPathsList(auditPaths);
+        return auditPathsActsService.selectAuditPathsList(auditPathsActs);
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.warehouseBusiness;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -38,9 +39,9 @@ public class TWarehouseGoodsTransferController extends BaseController {
      * 查询货转详情主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
-        System.out.println(tWarehouseBills.toString());
         startPage();
         tWarehouseBills.setfBilltype("HQZY");
         List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
@@ -75,6 +76,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:query')")
     @GetMapping(value = "/{fId}")
+    @RepeatSubmit
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(itWarehouseBillsService.selectTWarehousebillsById(fId));
     }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.warehouseBusiness;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,9 +35,19 @@ public class TWarehouseInStockController extends BaseController {
     private ITWarehouseBillsService itWarehouseBillsService;
 
     /**
+     * 查询出库详情主表列表
+     */
+    @GetMapping("/getWarehouseInStock")
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public String getWarehouseInStockBillsNo(TWarehouseBills tWarehouseBills) {
+        return itWarehouseBillsService.getWarehouseInStockBillsNo(tWarehouseBills);
+    }
+
+    /**
      * 查询入库详情主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         System.out.println(tWarehouseBills.toString());
@@ -46,20 +57,13 @@ public class TWarehouseInStockController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 查询出库详情主表列表
-     */
-    @GetMapping("/getWarehouseInStock")
-    public String getWarehouseInStockBillsNo(TWarehouseBills tWarehouseBills) {
-        return itWarehouseBillsService.getWarehouseInStockBillsNo(tWarehouseBills);
-    }
-
 
     /**
      * 导出入库详情主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:export')")
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TWarehouseBills tWarehouseBills) {
         tWarehouseBills.setfBilltype("SJRK");
@@ -73,6 +77,7 @@ public class TWarehouseInStockController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:query')")
     @GetMapping(value = "/{fId}")
+    @RepeatSubmit
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(itWarehouseBillsService.selectTWarehousebillsById(fId));
     }
@@ -139,6 +144,7 @@ public class TWarehouseInStockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:remove')")
     @Log(title = "详情主表", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
+    @RepeatSubmit
     public AjaxResult remove(@PathVariable Long[] fIds) {
         return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
     }
@@ -156,6 +162,7 @@ public class TWarehouseInStockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/get/{fId}")
+    @RepeatSubmit
     public AjaxResult revoke(@PathVariable("fId") Long fId) {
         String billsType = "SJRKRevoke";
         // 获取当前的用户

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.warehouseBusiness;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -37,6 +38,7 @@ public class TWarehouseOutStockController extends BaseController {
      * 查询出库详情主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
@@ -51,17 +53,41 @@ public class TWarehouseOutStockController extends BaseController {
      * 查询出库详情主表列表
      */
     @GetMapping("/getWarehouseOutStock")
+    @DataScope(deptAlias = "d", userAlias = "u")
     public String getWarehouseOutStockBillsNo(TWarehouseBills tWarehouseBills) {
         return itWarehouseBillsService.getWarehouseOutStockBillsNo(tWarehouseBills);
     }
 
-
+    /**
+     * 出库提交
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock: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 = "SJCK";
+        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:outStock:export')")
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
+    @RepeatSubmit
     @GetMapping("/export")
     public AjaxResult export(TWarehouseBills tWarehouseBills) {
         tWarehouseBills.setfBilltype("SJCK");
@@ -75,6 +101,7 @@ public class TWarehouseOutStockController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:query')")
     @GetMapping(value = "/{fId}")
+    @RepeatSubmit
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(itWarehouseBillsService.selectTWarehousebillsById(fId));
     }
@@ -85,6 +112,7 @@ public class TWarehouseOutStockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
+    @RepeatSubmit
     public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
                           @RequestParam("tEnclosure") String tEnclosure,
                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
@@ -110,6 +138,7 @@ public class TWarehouseOutStockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:edit')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TWarehouseBills tWarehouseBills) {
         return toAjax(itWarehouseBillsService.updateTWarehousebills(tWarehouseBills));
     }
@@ -120,6 +149,7 @@ public class TWarehouseOutStockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:remove')")
     @Log(title = "详情主表", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
+    @RepeatSubmit
     public AjaxResult remove(@PathVariable Long[] fIds) {
         return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
     }
@@ -138,6 +168,7 @@ public class TWarehouseOutStockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/get/{fId}")
+    @RepeatSubmit
     public AjaxResult revoke(@PathVariable("fId") Long fId) {
         String  billsType="SJCKRevoke";
         // 获取当前的用户
@@ -151,6 +182,7 @@ public class TWarehouseOutStockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/updateCredit")
+    @RepeatSubmit
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
                                    @RequestParam("warehousebillsitems") String warehousebillsitems) {
         String billsType = "SJCKRevoke";
@@ -201,6 +233,7 @@ public class TWarehouseOutStockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/addCredit")
+    @RepeatSubmit
     public AjaxResult addCredit(@RequestParam("warehouseBills") String warehouseBills,
                                 @RequestParam("warehousebillsitems") String warehousebillsitems ) {
         String billsType = "SJCK";

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

@@ -1,6 +1,8 @@
 package com.ruoyi.web.controller.warehouse.warehouseBusiness;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -35,6 +37,7 @@ public class TWarehouseTransferController extends BaseController {
      * 查询调拨详情主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
@@ -47,6 +50,7 @@ public class TWarehouseTransferController extends BaseController {
     /**
      * 查询调拨详情主表列表
      */
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/getWarehouseTransfer")
     public String getWarehouseInStockBillsNo(TWarehouseBills tWarehouseBills) {
         return itWarehouseBillsService.getWarehouseInStockBillsNo(tWarehouseBills);
@@ -59,6 +63,7 @@ public class TWarehouseTransferController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:export')")
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
+    @RepeatSubmit
     public AjaxResult export(TWarehouseBills tWarehouseBills) {
         List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
         ExcelUtil<TWarehouseBills> util = new ExcelUtil<TWarehouseBills>(TWarehouseBills.class);
@@ -70,6 +75,7 @@ public class TWarehouseTransferController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:query')")
     @GetMapping(value = "/{fId}")
+    @RepeatSubmit
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(itWarehouseBillsService.selectTWarehousebillsById(fId));
     }
@@ -80,6 +86,7 @@ public class TWarehouseTransferController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
+    @RepeatSubmit
     public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
                           @RequestParam("tWhgenleg") String tWhgenleg,
                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
@@ -118,6 +125,7 @@ public class TWarehouseTransferController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:edit')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TWarehouseBills tWarehouseBills) {
         return toAjax(itWarehouseBillsService.updateTWarehousebills(tWarehouseBills));
     }
@@ -128,6 +136,7 @@ public class TWarehouseTransferController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:remove')")
     @Log(title = "详情主表", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
+    @RepeatSubmit
     public AjaxResult remove(@PathVariable Long[] fIds) {
         return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
     }
@@ -138,6 +147,7 @@ public class TWarehouseTransferController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/get/{fId}")
+    @RepeatSubmit
     public AjaxResult revoke(@PathVariable("fId") Long fId) {
         String  billsType="CKDBRevoke";
         // 获取当前的用户

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/IAuditPathsActsService.java

@@ -65,8 +65,8 @@ public interface IAuditPathsActsService {
 
     /**
      *  查询审批流配置列表数据
-     * @param auditPaths
+     * @param auditPathsActs
      * @return
      */
-    Map<String, Object> selectAuditPathsList(AuditPaths auditPaths);
+    Map<String, Object> selectAuditPathsList(AuditPathsActs auditPathsActs);
 }

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

@@ -55,9 +55,8 @@ public class AuditPathsActsServiceImpl implements IAuditPathsActsService {
     }
 
     @Override
-    public Map<String, Object> selectAuditPathsList(AuditPaths auditPaths) {
+    public Map<String, Object> selectAuditPathsList(AuditPathsActs auditPathsActs) {
         Map<String, Object> map = new HashMap<>();
-        AuditPathsActs auditPathsActs = new AuditPathsActs();
         List<AuditPathsActs> actsList = auditPathsActsMapper.selectAuditPathsActsList(auditPathsActs);
         int count =  auditPathsActsMapper.selectAuditPathsActsCount(auditPathsActs);
         AuditPaths paths = new AuditPaths();

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

@@ -428,6 +428,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 // 仓储计费日期
                 wbItem.setfChargedate(warehouseBills.getfChargedate());
                 wbItem.setfBilltype(billsType);
+                if ("SJRK".equals(billsType)) {
+                    wbItem.setfBillingway(warehouseBills.getfBillingway());
+                }
                 if (null != wbItem.getfId()) {
                     wbItem.setUpdateBy(loginUser.getUser().getUserName());
                     wbItem.setUpdateTime(new Date());
@@ -580,6 +583,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             if ("SJRK".equals(billsType) || "SJCK".equals(billsType)) {
                 // 除了入库其他模块不需要更新主表的 仓储费计费日期到明细表，其他模块 应从库存总账把仓储费计费日期 赋给明细表
                 if ("SJRK".equals(billsType)) {
+                    wbItem.setfBillingway(warehouseBills.getfBillingway());
                     wbItem.setfChargedate(warehouseBills.getfChargedate());
                     wbItem.setfOriginalbilldate(warehouseBills.getfBsdate());
                 }

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

@@ -61,7 +61,12 @@
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
-        <include refid="selectTWarehousebillsVo"/>
+        select
+            ware.*
+        from
+            t_warehousebills ware
+            left join sys_user u on ware.create_by = u.user_name
+            left join sys_dept d on ware.f_bsdeptid = d.dept_id
         <where>
             <if test="fBillno != null  and fBillno != ''">and f_billno = #{fBillno}</if>
             <if test="fCustomsdeclartion != null  and fCustomsdeclartion != ''">and f_customsdeclartion =
@@ -112,8 +117,7 @@
             <if test="fBilltype != null  and fBilltype != ''">and f_billtype = #{fBilltype}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
         </where>
-        ORDER BY f_bsdate desc
-
+        ${params.dataScope}
     </select>
 
     <select id="selectWarehouseBusinessList" parameterType="TWarehousebills" resultType="Map">
@@ -145,6 +149,8 @@
             bill.f_billno AS fBillno
         FROM
             t_warehousebills bill
+            left join sys_user u on bill.create_by = u.user_name
+            left join sys_dept d on bill.f_bsdeptid = d.dept_id
             LEFT JOIN t_corps corp ON corp.f_id = bill.f_corpid
             LEFT JOIN t_corps corpTo ON corpTo.f_id = bill.f_tocorpid
             LEFT JOIN t_corps corpSub ON corpSub.f_id = bill.f_sbu
@@ -205,7 +211,7 @@
             <if test="fBillstatus != null  and fBillstatus != ''">and bill.f_billstatus = #{fBillstatus}</if>
             <if test="createBy != null and createBy != ''">and bill.create_by = #{createBy}</if>
         </where>
-        ORDER BY bill.f_bsdate desc
+            ${params.dataScope}
     </select>
 
     <select id="selectTWarehousebillsById" parameterType="Long" resultMap="TWarehousebillsResult">
@@ -402,7 +408,7 @@
             <if test="fettle != null">f_billstatus = #{fettle},</if>
             <if test="fettle != null and fettle == 6">f_review_date = now(),</if>
         </trim>
-        where f_pid = #{fPid}
+        where f_id = #{fPid}
     </update>
 
 </mapper>

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

@@ -126,6 +126,7 @@
             item.f_chargedate AS fChargedate,
             item.f_packagespecs AS fPackagespecs,
             item.f_plangrossweight AS fPlangrossweight,
+            item.f_originalbilldate AS fOriginalbilldate,
             item.f_plannetweight AS fPlannetweight,
             item.f_qty AS fQty,
             item.f_volumn AS fVolumn,
@@ -353,7 +354,8 @@
     <update id="warehouseItemFollowUpdate" parameterType="Long">
         update
             t_warehousebillsitems
-            set f_billstatus = #{fettle}
+        SET f_billstatus = IF
+	        ( f_billtype = 'SJCK' || f_billtype = 'SJRK', 40, #{fettle} )
         where
             f_pid = #{fPid}
     </update>