[CODE]: 权限添加、调拨货物通关区分、审批更新活动号

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TChargeController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.finance;
 
+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 TChargeController extends BaseController {
      * 查询财务数据主列表
      */
     @PreAuthorize("@ss.hasPermi('finance:charge:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TFee tFee) {
         tFee.setfBilltype("SF");
@@ -50,6 +52,7 @@ public class TChargeController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('finance:charge:export')")
     @Log(title = "财务数据主", businessType = BusinessType.EXPORT)
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TFee tFee) {
         List<TFee> list = tFeeService.selectTFeeList(tFee);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TContrastController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.finance;
 
+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;
@@ -15,7 +16,6 @@ import com.ruoyi.finance.domain.TWareHouseFees;
 import com.ruoyi.finance.service.ITFeeService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItem;
-import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +39,7 @@ public class TContrastController extends BaseController {
      * 查询财务数据主列表
      */
     @PreAuthorize("@ss.hasPermi('finance:contrast:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TFee tFee) {
         tFee.setfBilltype("DZ");
@@ -52,6 +53,7 @@ public class TContrastController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('finance:contrast:export')")
     @Log(title = "财务数据主", businessType = BusinessType.EXPORT)
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TFee tFee) {
         List<TFee> list = tFeeService.selectTFeeList(tFee);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TPaymentController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.finance;
 
+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 TPaymentController extends BaseController {
      * 查询财务数据主列表
      */
     @PreAuthorize("@ss.hasPermi('finance:payment:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TFee tFee) {
         tFee.setfBilltype("FF");
@@ -50,6 +52,7 @@ public class TPaymentController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('finance:payment:export')")
     @Log(title = "财务数据主", businessType = BusinessType.EXPORT)
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TFee tFee) {
         List<TFee> list = tFeeService.selectTFeeList(tFee);

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.reportManagement;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.finance.domain.TWareHouseFees;
@@ -30,6 +31,7 @@ public class PayableController extends BaseController {
      * 查询应付总账列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:payable:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo chargeList(TWareHouseFees tWareHouseFees) {
         startPage();

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.reportManagement;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.finance.domain.TWareHouseFees;
@@ -30,6 +31,7 @@ public class ProfitController extends BaseController {
      * 查询应收总账列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:profit:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo chargeList(TWareHouseFees tWareHouseFees) {
         startPage();

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

@@ -1,19 +1,15 @@
 package com.ruoyi.web.controller.warehouse.reportManagement;
 
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.DataScope;
 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.finance.domain.TWareHouseFees;
 import com.ruoyi.finance.service.ITFeeService;
-import com.ruoyi.reportManagement.domain.TWhgenleg;
-import com.ruoyi.reportManagement.service.ITWhgenlegService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
@@ -35,6 +31,7 @@ public class ReceivableController extends BaseController {
      * 查询应收总账列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:receivable:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo chargeList(TWareHouseFees tWareHouseFees) {
         startPage();

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

@@ -1,21 +1,19 @@
 package com.ruoyi.web.controller.warehouse.reportManagement;
 
+import com.ruoyi.common.annotation.DataScope;
 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.TWareHouseItemsExcel;
-import com.ruoyi.reportManagement.domain.TWhgenleg;
-import com.ruoyi.reportManagement.service.ITWhgenlegService;
-import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItem;
 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 org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
@@ -35,6 +33,7 @@ public class TWarehousebillsitemsSummaryController extends BaseController {
     /**
      * 查询库存总账列表
      */
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
@@ -46,6 +45,7 @@ public class TWarehousebillsitemsSummaryController extends BaseController {
      * 导出库存总账列表
      */
     @Log(title = "出入库统计", businessType = BusinessType.EXPORT)
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TWarehouseBills tWarehouseBills) {
         List<TWareHouseItemsExcel> list = itWarehouseBillsService.selectTWarehousebillsItemsList(tWarehouseBills);

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.reportManagement;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -32,6 +33,7 @@ public class TWhgenlegController extends BaseController {
      * 查询库存总账列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:whgenleg:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TWhgenleg tWhgenleg) {
         startPage();
@@ -44,6 +46,7 @@ public class TWhgenlegController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:whgenleg:export')")
     @Log(title = "库存总账", businessType = BusinessType.EXPORT)
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TWhgenleg tWhgenleg) {
         List<TWhgenleg> list = tWhgenlegService.selectTWhgenlegList(tWhgenleg);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TStorageFeeCalculationController.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;
@@ -39,6 +40,7 @@ public class TStorageFeeCalculationController extends BaseController {
      * 查询入库详情主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:list')")
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
@@ -66,6 +68,7 @@ public class TStorageFeeCalculationController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:export')")
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TWarehouseBills tWarehouseBills) {
         tWarehouseBills.setfBilltype("JSCCF");

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

@@ -15,7 +15,6 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
-import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -63,6 +62,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:export')")
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     @RepeatSubmit
     public AjaxResult export(TWarehouseBills tWarehouseBills) {

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

@@ -87,7 +87,7 @@ public class TWarehouseOutStockController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:export')")
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
-    @RepeatSubmit
+    @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TWarehouseBills tWarehouseBills) {
         tWarehouseBills.setfBilltype("SJCK");

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

@@ -51,7 +51,11 @@ public class TWarehouseStockTransferController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
-        tWarehouseBills.setfBilltype("CKDB");
+        if(tWarehouseBills.getType().equals("1")){
+            tWarehouseBills.setfBilltype("CKDB");
+        }else{
+            tWarehouseBills.setfBilltype("HWTG");
+        }
         List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
         return getDataTable(list);
     }
@@ -65,7 +69,11 @@ public class TWarehouseStockTransferController extends BaseController {
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TWarehouseBills tWarehouseBills) {
-        tWarehouseBills.setfBilltype("CKDB");
+        if(tWarehouseBills.getType().equals("1")){
+            tWarehouseBills.setfBilltype("CKDB");
+        }else{
+            tWarehouseBills.setfBilltype("HWTG");
+        }
         List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
         ExcelUtil<TWarehouseBills> util = new ExcelUtil<TWarehouseBills>(TWarehouseBills.class);
         return util.exportExcel(list, "warehousebills");
@@ -92,8 +100,14 @@ public class TWarehouseStockTransferController extends BaseController {
                           @RequestParam("tEnclosure") String tEnclosure,
                           @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                           @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
-                          @RequestParam("warehousebillsitems") String warehousebillsitems) {
-        String billsType = "CKDB";
+                          @RequestParam("warehousebillsitems") String warehousebillsitems,
+                          @RequestParam("type") String type) {
+        String billsType =null;
+        if(type.equals("1")){
+             billsType = "CKDB";
+        }else{
+             billsType = "HWTG";
+        }
         if (StringUtils.isNull(warehouseBills) || "{}".equals(warehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据，请确认");
         }
@@ -115,13 +129,20 @@ public class TWarehouseStockTransferController extends BaseController {
                                       @RequestParam("tEnclosure") String tEnclosure,
                                       @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                       @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
-                                      @RequestParam("warehousebillsitems") String warehousebillsitems
+                                      @RequestParam("warehousebillsitems") String warehousebillsitems,
+                                      @RequestParam("type") String type
     ) {
+        String billtystatus =null;
+        if(type.equals("1")){
+            billtystatus = "DB";
+        }else{
+            billtystatus = "TG";
+        }
         Long billsType = 20L;
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems, tEnclosure,
-                warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType, "DB");
+                warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType, billtystatus);
     }
 
     /**
@@ -156,8 +177,14 @@ public class TWarehouseStockTransferController extends BaseController {
                                           @RequestParam("tEnclosure") String tEnclosure,
                                           @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                           @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
-                                          @RequestParam("warehousebillsitems") String warehousebillsitems) {
-        String billsType = "CKDB";
+                                          @RequestParam("warehousebillsitems") String warehousebillsitems,
+                                          @RequestParam("type") String type) {
+            String billsType =null;
+            if(type.equals("1")){
+                billsType = "CKDB";
+            }else{
+                billsType = "HWTG";
+            }
         if (StringUtils.isNull(warehouseBills) || "{}".equals(warehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据，请确认");
         }
@@ -244,8 +271,14 @@ public class TWarehouseStockTransferController extends BaseController {
                                    @RequestParam("tEnclosure") String tEnclosure,
                                    @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                    @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
-                                   @RequestParam("warehousebillsitems") String warehousebillsitems) {
-        String billsType = "CKDBRevoke";
+                                   @RequestParam("warehousebillsitems") String warehousebillsitems,
+                                   @RequestParam("type") String type) {
+        String billsType =null;
+        if(type.equals("1")){
+             billsType = "CKDBRevoke";
+        }else{
+             billsType = "HWTGRevoke";
+        }
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems,
@@ -263,8 +296,14 @@ public class TWarehouseStockTransferController extends BaseController {
                                 @RequestParam("tEnclosure") String tEnclosure,
                                 @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                 @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
-                                @RequestParam("warehousebillsitems") String warehousebillsitems) {
-        String billsType = "CKDB";
+                                @RequestParam("warehousebillsitems") String warehousebillsitems,
+                                @RequestParam("type") String type) {
+            String billsType =null;
+            if(type.equals("1")){
+                billsType = "CKDB";
+            }else{
+                billsType = "HWTG";
+            }
         if (StringUtils.isNull(warehouseBills) || "{}".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息，请确认");
         }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -219,7 +219,7 @@
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
 
-    <update id="updateCarsDriverNamePhone" parameterType="int">
+    <update id="updateCarsDriverNamePhone" parameterType="Long">
 		UPDATE sys_user u
 		LEFT JOIN F_TMSORDERBILLSCARS car ON u.user_id = car.driver_user_id
 		SET car.driver_name = u.nick_name,

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

@@ -1,16 +1,11 @@
 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;
 import com.ruoyi.approvalFlow.domain.*;
 import com.ruoyi.approvalFlow.mapper.*;
 import com.ruoyi.approvalFlow.service.IAuditPathsService;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -35,6 +30,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.util.*;
+
 /**
  * 审批流配置主Service业务层处理
  *
@@ -253,7 +250,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
      */
     @Override
     public AjaxResult projectEndQueryPendingVal(AuditItems auditItems) {
-        if (auditItems.getActId() >= 110 && auditItems.getActId() <= 150) {
+        if (auditItems.getActId() >= 110 && auditItems.getActId() <= 160) {
             List<Map<String, Object>> mapList = auditItemsMapper.selectWarehouseApprover(auditItems);
             return AjaxResult.success(mapList);
         } else if (auditItems.getActId() >= 210 && auditItems.getActId() <= 230) {
@@ -330,7 +327,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         return AjaxResult.error("审批通过失败: 更新审批状态失败");
                     }
-                    if (auditItems.getActId() >= 110 && auditItems.getActId() <= 150) {
+                    if (auditItems.getActId() >= 110 && auditItems.getActId() <= 160) {
                         if ("T".equals(at.getIffinalItem())) {
                             fettle = 6L;
                         } else if ("F".equals(at.getIffinalItem())) {
@@ -425,7 +422,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
     @Transactional
     public AjaxResult approvalRejected(AuditItems auditItems) {
         long fettle = 0L;
-        if (auditItems.getActId() >= 110 && auditItems.getActId() <= 150) {
+        if (auditItems.getActId() >= 110 && auditItems.getActId() <= 160) {
             fettle = 3L;
             tWarehouseBillsMapper.warehouseFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
             tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
@@ -538,7 +535,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
     @Transactional
     public AjaxResult revoke(AuditItems auditItems) {
         long fettle = 0L;
-        if (auditItems.getActId() >= 110 && auditItems.getActId() <= 150) {
+        if (auditItems.getActId() >= 110 && auditItems.getActId() <= 160) {
             fettle = 2L;
             // 查询仓库状态
             TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(auditItems.getBillId());

ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/TWareHouseFees.java

@@ -2,11 +2,12 @@ package com.ruoyi.finance.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 
 import java.util.Date;
 import java.util.List;
 
-public class TWareHouseFees {
+public class TWareHouseFees extends BaseEntity {
 
     /**
      * 客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name

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

@@ -328,6 +328,16 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "车辆类型")
     private Long fCartype ;
 
+    /** 1: 调拨，2：货物通关 */
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
     /**
      * 查询时间区间
@@ -360,6 +370,20 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "仓库")
     private Long fLocation;
 
+    /**
+     * 贸易方式(数据字典),对应t_trademodels
+     */
+    @Excel(name = "贸易方式(数据字典),对应t_trademodels ")
+    private Long fNewTrademodeid;
+
+    public Long getfNewTrademodeid() {
+        return fNewTrademodeid;
+    }
+
+    public void setfNewTrademodeid(Long fNewTrademodeid) {
+        this.fNewTrademodeid = fNewTrademodeid;
+    }
+
     public Long getfLocation() {
         return fLocation;
     }

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

@@ -294,9 +294,23 @@ public class TWarehousebillsitems extends BaseEntity {
     @Excel(name = "仓库/库区/库位")
     private String fOrgwarehouseInformation;
 
+    /**
+     * 备注
+     */
+    private String remark;
     private String timeStartBsdate;
     private String timeEndBsdate;
 
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public String getTimeStartBsdate() {
         return timeStartBsdate;
     }

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

@@ -93,6 +93,8 @@ public class BillnoSerialServiceImpl implements IBillnoSerialService {
             billNo = "JSSF" + billNo;
         }  else if ("JSFF".equals(billType)) {
             billNo = "JSFF" + billNo;
+        } else if ("HWTG".equals(billType)) {
+            billNo = "HWTG" + billNo;
         }
         return billNo;
     }

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

@@ -279,7 +279,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      */
     @Override
     public List<Map<String, Object>> selectWarehouseBusinessList(TWarehouseBills tWarehousebills) {
-        if(tWarehousebills.getfBilltype().equals("JSCCF") |  tWarehousebills.getfBilltype().equals("HQZY") ){
+        if(tWarehousebills.getfBilltype().equals("JSCCF") |  tWarehousebills.getfBilltype().equals("HQZY") | tWarehousebills.getfBilltype().equals("HWTG")){
             return tWarehouseBillsMapper.selectWarehouseBusinessList1(tWarehousebills);
         }else {
             return tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills);
@@ -336,9 +336,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if ("SJRK".equals(warehouseBills.getfBilltype())) {
             tWhgenleg.setfOriginalbilldate(warehousebillsitems.getfBsdate());
         }
-        if ("HQZY".equals(warehouseBills.getfBilltype()) || "CKDB".equals(warehouseBills.getfBilltype())) {
+        if ("HQZY".equals(warehouseBills.getfBilltype()) | "CKDB".equals(warehouseBills.getfBilltype()) | "HWTG".equals(warehouseBills.getfBilltype()) ) {
             tWhgenleg.setfOriginalbilldate(warehousebillsitems.getfOriginalbilldate());
-            if ("CKDB".equals(warehouseBills.getfBilltype())) {
+            if ("CKDB".equals(warehouseBills.getfBilltype()) | "HWTG".equals(warehouseBills.getfBilltype()) ) {
                 tWhgenleg.setfCorpid(warehouseBills.getfCorpid());
             } else {
                 // 客户
@@ -458,12 +458,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
             List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
             for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
-                boolean warehouseStatus = "SJRK".equals(billsType) || "SJCK".equals(billsType) || "CKDB".equals(billsType);
+                boolean warehouseStatus = "SJRK".equals(billsType) || "SJCK".equals(billsType) || "CKDB".equals(billsType) || "HWTG".equals(billsType) ;
                 // 仓储计费日期
                 wbItem.setfBilltype(billsType);
                 if ("SJRK".equals(billsType)) {
                     wbItem.setfChargedate(warehouseBills.getfChargedate());
                     wbItem.setfBillingway(warehouseBills.getfBillingway());
+                    wbItem.setfMblno(warehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号
                 }
                 if (null != wbItem.getfId()) {
                     wbItem.setUpdateTime(new Date());
@@ -478,7 +479,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     } else {
                         wbItem.setfBillstatus(10L);
                     }
-                    wbItem.setfMblno(warehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号
                     wbItem.setfPid(fPid);
                     wbItem.setCreateBy(loginUser.getUser().getUserName());
                     wbItem.setCreateTime(new Date());
@@ -582,6 +582,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         } else if ("HQZY".equals(billsType)) {
             actId = 130L;
             key = "warehouse.transfer.ApprovalFlow";
+        } else if ("HWTG".equals(billsType)) {
+            actId = 160L;
+            key = "warehouse.cargoClearance.ApprovalFlow";
         }
         SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique(key);
         if (StringUtils.isNull(sysConfig)) {
@@ -636,13 +639,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         int line = 0;
         for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
             line++;
-            if ("SJRK".equals(billsType) || "SJCK".equals(billsType) || "CKDB".equals(billsType)) {
+            if ("SJRK".equals(billsType) || "SJCK".equals(billsType) || "CKDB".equals(billsType)  || "HWTG".equals(billsType) ) {
                 // 除了入库其他模块不需要更新主表的 仓储费计费日期到明细表，其他模块 应从库存总账把仓储费计费日期 赋给明细表
                 if ("SJRK".equals(billsType)) {
                     wbItem.setfMblno(warehouseBills.getfMblno());
                     wbItem.setfBillingway(warehouseBills.getfBillingway());
                     wbItem.setfChargedate(warehouseBills.getfChargedate());
                     wbItem.setfOriginalbilldate(warehouseBills.getfBsdate());
+                    wbItem.setfMblno(warehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号
                 }
                 if (!wbItem.getfBillstatus().equals(40L)) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -671,7 +675,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             wbItem.setCreateTime(new Date());
             wbItem.setfBillno(warehouseBills.getfBillno());
             wbItem.setCreateBy(loginUser.getUser().getUserName());
-            wbItem.setfMblno(warehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号
             tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
         }
         if (StringUtils.isNotNull(tWarehousebillsfeesCr) && !"[]".equals(tWarehousebillsfeesCr)) {
@@ -1159,7 +1162,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 item.setfBillstatus(40L);
                 item.setUpdateBy(loginUser.getUser().getUserName());
                 item.setUpdateTime(new Date());
-                item.setfMblno(tWarehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号
+                if("SJRK".equals(billsType)){
+                    item.setfMblno(tWarehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号
+                }
                 num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(item);
                 // 添加状态log
                 insertTWarehousebillsLog(item, 40L, loginUser);
@@ -1262,7 +1267,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             long warehouselocId = 0L;
             long transferWarehouselocid = 0L;
-            if ("CKDB".equals(billsType)) {
+            if ("CKDB".equals(billsType) | "HWTG".equals(billsType)) {
                 warehouselocId = wbItem.getfWarehouselocid();
                 transferWarehouselocid = wbItem.getfTransferWarehouselocid();
 //                wbItem.setfWarehouselocid(transferWarehouselocid);
@@ -1320,7 +1325,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     warehousebillsfees.add(fees);*/
                 }
                 wbItem.setfBillstatus(40L);
-            } else if ("CKDB".equals(billsType)) { // 调拨查询
+            } else if ("CKDB".equals(billsType) || "HWTG".equals(billsType)) { // 调拨查询
                 if (StringUtils.isNull(tWhgenle)) { // 为空 提示没有库存
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("库存明细第" + i + "行库存为空");
@@ -1332,6 +1337,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         wbItem.setfWarehouselocid(warehouselocId);
                         updateTWhgenlegData(wbItem, tWhgenle.getfId(), "SJCK");
                     }
+                    if("HWTG".equals(billsType)){
+                        tWarehouseBills.setfTrademodeid(tWarehouseBills.getfNewTrademodeid());
+                    }
                     // 3、 进行入库操作 查询是否存在库存
                     wbItem.setfWarehouselocid(transferWarehouselocid); // 新库区
                     TWhgenleg tWhgenle1 = queryTWhgenleg(tWarehouseBills, wbItem);
@@ -1492,6 +1500,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 serialNumber = billnoSerialServiceImpl.getSerialNumber("CK", time);
             } else if ("DB".equals(billtystatus)) { //生成 出库 流水号
                 serialNumber = billnoSerialServiceImpl.getSerialNumber("DB", time);
+            } else if ("TG".equals(billtystatus)) { //生成 出库 流水号
+                serialNumber = billnoSerialServiceImpl.getSerialNumber("TG", time);
             }
         }
         int i=1;
@@ -1506,7 +1516,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if(item.getfSerialNumber()==null ||  item.getfSerialNumber().equals("")){
                     item.setfSerialNumber(serialNumber);
                 }
-                item.setfMblno(tWarehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号
                 item.setfBillstatus(status);
                 item.setUpdateTime(new Date());
                 item.setUpdateBy(loginUser.getUser().getUserName());
@@ -2184,6 +2193,31 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TWhgenleg tWhgenle2 = queryTWhgenleg(tWarehousebills, wb);
                     updateTWhgenlegData(wb, tWhgenle2.getfId(), "SJCKRevoke");
                     wb.setfBillstatus(10L);
+                } else if ("HWTGRevoke".equals(billsType)) { // 调拨 撤销
+                    // 贸易方式
+                    Long oldfTrademodeid = tWarehousebills.getfTrademodeid();
+                    // 新贸易方式
+                    Long newfTrademodeid = tWarehousebills.getfNewTrademodeid();
+                    Long warehouselocid = wb.getfWarehouselocid();// 原货仓库
+                    Long transferWarehouselocid = wb.getfTransferWarehouselocid(); // 新仓库
+                    //  1、新货权方撤销入库
+                    // 查询库存总账
+                    wb.setfWarehouselocid(transferWarehouselocid);
+                    tWarehousebills.setfTrademodeid(newfTrademodeid); // 查询用新的
+                    TWhgenleg tWhgenle1 = queryTWhgenleg(tWarehousebills, wb);
+                    if (StringUtils.isNotNull(tWhgenle1) && (wb.getfQty() <= tWhgenle1.getfQtyblc())) {
+                        updateTWhgenlegData(wb, tWhgenle1.getfId(), "SJRKRevoke");
+                    } else {
+                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                        return AjaxResult.error("第" + i + "行撤销数大于库存结余数");
+                    }
+                    //  2、原货权方撤销出库
+                    // 查询库存总账
+                    wb.setfWarehouselocid(warehouselocid);
+                    tWarehousebills.setfTrademodeid(oldfTrademodeid); // 撤销回到旧的
+                    TWhgenleg tWhgenle2 = queryTWhgenleg(tWarehousebills, wb);
+                    updateTWhgenlegData(wb, tWhgenle2.getfId(), "SJCKRevoke");
+                    wb.setfBillstatus(10L);
                 } else if ("HQZYRevoke".equals(billsType)) { // 货转撤销
                     Long fCorpid = tWarehousebills.getfCorpid();// 原货权方
                     Long fTocorpid = tWarehousebills.getfTocorpid(); // 新货权方

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -39,7 +39,12 @@
      </sql>
 
     <select id="selectTFeeList" parameterType="TFee" resultMap="TFeeResult">
-        <include refid="selectTFeeVo"/>
+        select
+            ware.*
+        from
+            t_fee ware
+            left join sys_user u on ware.create_by = u.user_name
+            left join sys_dept d on ware.f_deptid = d.dept_id
         <where>
             <if test="fBillno != null  and fBillno != ''">and f_billno = #{fBillno}</if>
             <if test="fCtrlcorpid != null ">and f_ctrlcorpid = #{fCtrlcorpid}</if>
@@ -68,6 +73,7 @@
             <if test="bank != null ">and bank = #{bank}</if>
             <if test="waterBillNo != null ">and water_bill_no = #{waterBillNo}</if>
         </where>
+        ${params.dataScope}
     </select>
 
     <select id="selectTFeeList1" parameterType="TFee" resultType="Map">
@@ -88,6 +94,8 @@
         FROM
             t_fee AS f
         LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
+        left join sys_user u on f.create_by = u.user_name
+        left join sys_dept d on f.f_deptid = d.dept_id
         <where>
             <if test="fBillno != null  and fBillno != ''">and f.f_billno = #{fBillno}</if>
             <if test="fCtrlcorpid != null ">and f.f_ctrlcorpid = #{fCtrlcorpid}</if>
@@ -111,6 +119,7 @@
             <if test="bank != null ">and f.bank = #{bank}</if>
             <if test="waterBillNo != null ">and f.water_bill_no = #{waterBillNo}</if>
         </where>
+        ${params.dataScope}
     </select>
 
     <select id="selectTFeeById" parameterType="Long" resultMap="TFeeResult">
@@ -559,6 +568,8 @@
             SUM(w.f_stlamount) AS fStlamount
         FROM
             t_warehousebills t
+                left join sys_user u on t.create_by = u.user_name
+                left join sys_dept d on t.f_bsdeptid = d.dept_id
                 LEFT JOIN t_corps c ON c.f_id = t.f_corpid
                 LEFT JOIN (
                 SELECT
@@ -625,6 +636,7 @@
                 and ifnull(w.f_amount, 0) - ifnull(w.f_stlamount, 0) != 0
             </if>
             and  t.f_review_date IS NOT NULL
+            ${params.dataScope}
             GROUP BY
             w.f_pid,
             w.f_dc,
@@ -691,6 +703,8 @@
         FROM
         t_warehousebillsfees w
         LEFT JOIN t_warehousebills t ON t.f_id = w.f_pid
+        left join sys_user u on t.create_by = u.user_name
+        left join sys_dept d on t.f_bsdeptid = d.dept_id
         LEFT JOIN t_corps c ON c.f_id = t.f_corpid
         LEFT JOIN t_corps c1 ON c1.f_id = w.f_corpid
         <where>
@@ -727,6 +741,7 @@
                 </foreach>
             </if>
             and  w.f_review_date IS NOT NULL
+            ${params.dataScope}
             GROUP BY
             w.f_mblno
         </where>

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

@@ -49,7 +49,12 @@
     </sql>
 
     <select id="selectTWhgenlegList" parameterType="TWhgenleg" resultMap="TWhgenlegResult">
-        <include refid="selectTWhgenlegVo"/>
+        select
+            ware.*
+        from
+            t_whgenleg ware
+            left join sys_user u on ware.create_by = u.user_name
+            left join sys_dept d on u.dept_id = d.dept_id
         <where>
             <if test="fOriginalbillno != null  and fOriginalbillno != ''">and f_originalbillno = #{fOriginalbillno}</if>
             <if test="fChargedate != null ">and f_chargedate = #{fChargedate}</if>
@@ -75,6 +80,7 @@
             <if test="fMarks != null  and fMarks != ''">and f_marks = #{fMarks}</if>
             <if test="fOriginalbilldate != null ">and f_originalbilldate = #{fOriginalbilldate}</if>
         </where>
+        ${params.dataScope}
     </select>
 
     <select id="selectInventoryList" parameterType="TWhgenleg" resultType="Map">
@@ -113,6 +119,8 @@
             leg.f_cntrno AS fCntrno
         FROM
             t_whgenleg leg
+            left join sys_user u on leg.create_by = u.user_name
+            left join sys_dept d on u.dept_id = d.dept_id
             LEFT JOIN t_corps corp ON corp.f_id = leg.f_corpid
             LEFT JOIN t_goods goods ON goods.f_id = leg.f_goodsid
             LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouse_locationid
@@ -158,8 +166,8 @@
             <if test="fLocation != null  and fLocation ==0 ">
                 and ware.ancestors  LIKE  concat('%', #{fWarehouseLocationid}, '%')
             </if>
-
         </where>
+        ${params.dataScope}
     </select>
 
     <select id="selectTWhgenleg" parameterType="TWhgenleg" resultMap="TWhgenlegResult">

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

@@ -65,6 +65,7 @@
         <result property="fBstime"    column="f_bstime"    />
         <result property="fCartype"    column="f_cartype"    />
         <result property="fGoodsid"    column="f_goodsid"    />
+        <result property="fNewTrademodeid"    column="f_new_trademodeid"    />
     </resultMap>
 
     <sql id="selectTWarehousebillsVo">
@@ -76,7 +77,7 @@
                f_ifdamage, f_bankcorpid, f_billtype, f_billstatus, del_flag, create_by, create_time,
                f_items_status, update_by, update_time, remark, f_billing_deadline, f_product_name,
                f_review_date, f_truckno, f_driver_name, f_driver_tel, f_driver_id_car, f_business_type,f_labour,f_fleet,
-               f_bstime,f_cartype ,f_goodsid  from t_warehousebills
+               f_bstime,f_cartype ,f_goodsid ,f_new_trademodeid  from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -136,6 +137,7 @@
             <if test="fBillingDeadline != null "> and f_billing_deadline = #{fBillingDeadline}</if>
             <if test="fBilltype != null  and fBilltype != ''">and f_billtype = #{fBilltype}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
+            <if test="fNewTrademodeid != null ">and f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
         ${params.dataScope}
     </select>
@@ -269,9 +271,10 @@
             <if test="fBillstatus != null  and fBillstatus != ''">and bill.f_billstatus = #{fBillstatus}</if>
             <if test="fItemsStatus != null  and fItemsStatus != ''">and bill.f_items_status = #{fItemsStatus}</if>
             <if test="createBy != null and createBy != ''">and bill.create_by = #{createBy}</if>
+            <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
-            ORDER BY  bill.f_billstatus , bill.f_bsdate  DESC
         ${params.dataScope}
+            ORDER BY  bill.f_billstatus , bill.f_bsdate  DESC
     </select>
 
     <select id="selectWarehouseBusinessList1" parameterType="TWarehousebills" resultType="Map">
@@ -389,9 +392,10 @@
             <if test="fBillstatus != null  and fBillstatus != ''">and bill.f_billstatus = #{fBillstatus}</if>
             <if test="fItemsStatus != null  and fItemsStatus != ''">and bill.f_items_status = #{fItemsStatus}</if>
             <if test="createBy != null and createBy != ''">and bill.create_by = #{createBy}</if>
+            <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
-        ORDER BY  bill.f_billstatus , bill.f_bsdate  DESC
         ${params.dataScope}
+        ORDER BY  bill.f_billstatus , bill.f_bsdate  DESC
     </select>
 
     <select id="selectTWarehousebillsById" parameterType="Long" resultMap="TWarehousebillsResult">
@@ -462,6 +466,8 @@
             END AS fBilltype
         FROM
             t_warehousebills leg
+                left join sys_user u on leg.create_by = u.user_name
+                left join sys_dept d on leg.f_bsdeptid = d.dept_id
                 LEFT JOIN t_warehousebillsitems it ON leg.f_id = it.f_pid
                 LEFT JOIN t_goods goo ON it.f_goodsid = goo.f_id
                 LEFT JOIN t_corps co ON leg.f_corpid = co.f_id
@@ -476,6 +482,7 @@
             AND leg.f_billtype in ('SJRK','CKDB')
             <if test="fGoodsid != null ">and it.f_goodsid = #{fGoodsid}</if>
             <if test="fTrademodeid != null ">and leg.f_trademodeid = #{fTrademodeid}</if>
+            <if test="fNewTrademodeid != null ">and leg.f_new_trademodeid = #{fNewTrademodeid}</if>
             <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
             <if test="fMblno != null ">and leg.f_mblno = #{fMblno}</if>
             <if test="fLocation != null  and fLocation ==1 ">
@@ -491,6 +498,7 @@
                 and it.f_bsdate &lt;= #{timeInterval[1]}
             </if>
         </where>
+        ${params.dataScope}
     </select>
     <select id="selectInventorySJCKList" parameterType="TWarehousebills"  resultType="java.util.Map">
         SELECT
@@ -525,6 +533,8 @@
         END AS fWarehouseLocationids
         FROM
         t_warehousebills leg
+        left join sys_user u on leg.create_by = u.user_name
+        left join sys_dept d on leg.f_bsdeptid = d.dept_id
         LEFT JOIN t_warehousebillsitems it ON leg.f_id = it.f_pid
         LEFT JOIN t_goods goo ON it.f_goodsid = goo.f_id
         LEFT JOIN t_corps co ON leg.f_corpid = co.f_id
@@ -539,6 +549,7 @@
             AND leg.f_billtype in ('SJCK','CKDB')
             <if test="fGoodsid != null ">and it.f_goodsid = #{fGoodsid}</if>
             <if test="fTrademodeid != null ">and leg.f_trademodeid = #{fTrademodeid}</if>
+            <if test="fNewTrademodeid != null ">and leg.f_new_trademodeid = #{fNewTrademodeid}</if>
             <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
             <if test="fMblno != null ">and leg.f_mblno = #{fMblno}</if>
             <if test="fLocation != null  and fLocation ==1 ">
@@ -554,6 +565,7 @@
                 and it.f_bsdate &lt;= #{timeInterval[1]}
             </if>
         </where>
+        ${params.dataScope}
     </select>
     <select id="selectTWarehousebillsItemList"
             resultType="com.ruoyi.reportManagement.domain.TWareHouseItemsExcel">
@@ -593,6 +605,7 @@
         <if test="fBilltype != null">AND leg.f_billtype = #{fBilltype}</if>
         <if test="fGoodsid != null ">and it.f_goodsid = #{fGoodsid}</if>
         <if test="fTrademodeid != null ">and leg.f_trademodeid = #{fTrademodeid}</if>
+        <if test="fNewTrademodeid != null ">and leg.f_new_trademodeid = #{fNewTrademodeid}</if>
         <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
         <if test="fMblno != null ">and leg.f_mblno = #{fMblno}</if>
         <if test="fLocation != null  and fLocation ==1 ">
@@ -671,6 +684,7 @@
             <if test="fBstime != null">f_bstime,</if>
             <if test="fCartype != null">f_cartype,</if>
             <if test="fGoodsid != null">f_goodsid,</if>
+            <if test="fNewTrademodeid != null">f_new_trademodeid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -732,6 +746,7 @@
             <if test="fBstime != null">#{fBstime},</if>
             <if test="fCartype != null">#{fCartype},</if>
             <if test="fGoodsid != null">#{fGoodsid},</if>
+            <if test="fNewTrademodeid != null">#{fNewTrademodeid},</if>
         </trim>
     </insert>
 
@@ -798,6 +813,7 @@
             <if test="fBstime != null">f_bstime = #{fBstime},</if>
             <if test="fCartype != null">f_cartype = #{fCartype},</if>
             <if test="fGoodsid != null">f_goodsid = #{fGoodsid},</if>
+            <if test="fNewTrademodeid != null">f_new_trademodeid = #{fNewTrademodeid},</if>
         </trim>
         where f_id = #{fId}
     </update>