测试 mapper

pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
+
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
     <version>3.2.1</version>
@@ -11,8 +11,8 @@
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依管理系统</description>
-    
-    <properties>
+
+    <properties >
         <ruoyi.version>3.2.1</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -32,11 +32,11 @@
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
     </properties>
-	
+
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
-        
+
             <!-- SpringBoot的依赖配置-->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -45,28 +45,28 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            
+
             <!--阿里数据库连接池 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid-spring-boot-starter</artifactId>
                 <version>${druid.version}</version>
             </dependency>
-	        
+
             <!-- 解析客户端操作系统、浏览器等 -->
             <dependency>
                 <groupId>eu.bitwalker</groupId>
                 <artifactId>UserAgentUtils</artifactId>
                 <version>${bitwalker.version}</version>
             </dependency>
-			
+
             <!-- pagehelper 分页插件 -->
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
                 <artifactId>pagehelper-spring-boot-starter</artifactId>
                 <version>${pagehelper.boot.version}</version>
             </dependency>
-			
+
             <!-- 获取系统信息 -->
             <dependency>
                 <groupId>com.github.oshi</groupId>
@@ -85,7 +85,7 @@
                 <artifactId>jna-platform</artifactId>
                 <version>${jna.version}</version>
             </dependency>
-			
+
             <!-- swagger2-->
             <dependency>
                 <groupId>io.springfox</groupId>
@@ -102,28 +102,28 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-			
+
             <!-- swagger2-UI-->
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-swagger-ui</artifactId>
                 <version>${swagger.version}</version>
             </dependency>
-            
+
             <!--io常用工具类 -->
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
                 <version>${commons.io.version}</version>
             </dependency>
-	
+
             <!--文件上传工具类 -->
             <dependency>
                 <groupId>commons-fileupload</groupId>
                 <artifactId>commons-fileupload</artifactId>
                 <version>${commons.fileupload.version}</version>
             </dependency>
-			
+
             <!-- excel工具 -->
             <dependency>
                 <groupId>org.apache.poi</groupId>
@@ -137,56 +137,56 @@
                 <artifactId>velocity</artifactId>
                 <version>${velocity.version}</version>
             </dependency>
-	        
+
             <!-- 阿里JSON解析器 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
                 <version>${fastjson.version}</version>
             </dependency>
-			
+
             <!--Token生成与解析-->
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
                 <artifactId>jjwt</artifactId>
                 <version>${jwt.version}</version>
             </dependency>
-			
+
             <!--验证码 -->
             <dependency>
                 <groupId>com.github.penggle</groupId>
                 <artifactId>kaptcha</artifactId>
                 <version>${kaptcha.version}</version>
             </dependency>
-            
+
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-quartz</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-	
+
             <!-- 代码生成-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-generator</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-			
+
             <!-- 核心模块-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-framework</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-			
+
             <!-- 系统模块-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-system</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-			
+
             <!-- 通用工具-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -285,4 +285,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
+</project>

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

@@ -4503,10 +4503,20 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
         tWarehouseBills.setUpdateTime(new Date());
         fPid = tWarehouseBills.getfId();
+        //李俊平测试
+        List<Map<String, Object>> stockList1 = tWhgenlegMapper.selectStockListCk(tWarehouseBills.getfMblno(), tWarehouseBills.getfCorpid());
+        if (CollectionUtil.isEmpty(stockList1)) {
+            return AjaxResult.error("请求银行反馈异常，未找到库存"+stockList1);
+        }
+
         tEnclosureMapper.deleteByFPid(fPid);
         tWarehousebillsfeesMapper.deleteByFPid(fPid);
         tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems);
+
+
+
+
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
         int i = 1;
         List<TFees> feesList = new ArrayList<>();
@@ -4642,6 +4652,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 return AjaxResult.error("库存明细更新失败");
             }
 
+
             // 处理银行反馈
             if (WarehouseTypeEnum.SJCK.getType().equals(billsType)) {
                 SysConfig feedbackConfig = sysConfigMapper.checkConfigKeyUnique("bank.feedback");

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

@@ -1590,11 +1590,15 @@
         left join t_warehouse t5 on t5.f_id = t1.f_warehouseid
         left join t_warehousebillsitems t6 on t6.f_billno = t1.f_originalbillno
         <where>
-            t3.dict_type = 'data_goods_category'
-            <if test="fMblno != null and fMblno != ''"> AND t1.f_mblno = #{fMblno}</if>
-            AND t3.status = 0
+            <if test="corpId != null "> and t3.status = 0 </if>
+            <if test="corpId != null "> and t3.dict_type = 'data_goods_category' </if>
+            <if test="corpId != null "> and t1.f_qtyD != 0 </if>
+            <if test="corpId != null "> and t1.f_qtyblc &gt; 0 </if>
+            <if test="corpId != null "> and t1.f_grossweightblc &gt; 0 </if>
+            <if test="fMblno != null and fMblno != ''"> and t1.f_mblno = #{fMblno}</if>
 
-            <if test="corpId != null "> AND t1.f_corpid = #{corpId}</if>
+
+            <if test="corpId != null "> and t1.f_corpid = #{corpId}</if>
         </where>
     </select>
     <update id="changeBelongTo" parameterType="TWhgenleg">