版本3.2.1 升级为 4.8.0

pom.xml

@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.2.1</version>
+    <version>4.8.0</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依管理系统</description>
 
     <properties >
-        <ruoyi.version>3.2.1</ruoyi.version>
+        <ruoyi.version>4.8.0</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>

ruoyi-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/plugin/CcbController.java

@@ -70,7 +70,7 @@ public class CcbController {
     }
 
     /**
-     * 保管凭证号详情
+     * 保管凭证号详
      *
      * @param voucher 报文
      * @return 结果

ruoyi-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-fleet/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillscarsService.java

@@ -101,7 +101,7 @@ public interface IftmsorderbillscarsService {
      * @param operationType 状态
      * @return  结果
      */
-    public AjaxResult driverSave(String cars, String fees, String attachs, String operationType);
+    public AjaxResult    driverSave(String cars, String fees, String attachs, String operationType);
 
     /**
      *  司机操作接单/提箱/装卸货/还卸柜/回单操作  提交

ruoyi-framework/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-quartz/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-shipping/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrnoServiceImpl.java

@@ -24,7 +24,6 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.shipping.domain.*;
 import com.ruoyi.shipping.excel.*;
 import com.ruoyi.shipping.mapper.*;
-import com.ruoyi.system.mapper.SysDictDataMapper;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.openxml4j.util.ZipSecureFile;
 import org.apache.poi.ss.usermodel.*;
@@ -39,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.system.mapper.SysDictDataMapper;
 
 import static com.ruoyi.common.utils.poi.Excel.filter;
 
@@ -50,12 +50,14 @@ import static com.ruoyi.common.utils.poi.Excel.filter;
  */
 @Service
 public class TCntrnoServiceImpl implements ITCntrnoService {
+
     @Autowired
     private TCntrnoMapper tCntrnoMapper;
     @Autowired
     private TCntrtrackingMapper tCntrtrackingMapper;
     @Autowired
     private TCntrMapper tCntrMapper;
+
     @Autowired
     private SysDictDataMapper sysDictDataMapper;
     @Autowired

ruoyi-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-warehouse/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5547,6 +5547,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             fMblnoMsgList.addAll(resultVO.getfMblnoMsgList());
         }
+
+        // 查询 在库物资
         List<CalculateStorageFeesInfoVO> whgenlegfeesInfoVOList = tWhgenlegMapper.selectStorageFeeItemList1(tWarehouseBills);
         if (CollectionUtils.isNotEmpty(whgenlegfeesInfoVOList)) {
             // 如果是计算之前日期的库存总帐则需要使用当时日期的准确数量
@@ -5937,7 +5939,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         for (TWarehouseBills tWarehouseBills : tWarehouseBillsList) {
             // 计划物资明细
             List<TWarehousebillsfees> itemsList = new ArrayList<>();
-            // 查询 出库 货转的库存明细
+            // 查询 出库 货转  调拨的库存明细
             List<Map<String, Object>> warehousebillsitemsList = tWarehousebillsitemsMapper.selectStorageFeeItemList(tWarehouseBills);
             String cangKey = sysConfigServiceImpl.selectConfigByKey("agreement.warehouse");
             if (CollectionUtils.isNotEmpty(warehousebillsitemsList)) {

ruoyi-wechatProgram/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>4.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>