Merge remote-tracking branch 'gitlab/main'

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/impl/TbAssetInventoryServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.*;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.asset.mapper.TbAssetInformationMapper;
 import com.ruoyi.asset.mapper.TbLocationMapper;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.inventory.domain.TagInfo;
 import com.ruoyi.inventory.domain.TbInventoryDetail;
 import com.ruoyi.inventory.domain.dto.TakeStockDTO;
@@ -99,21 +100,21 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
             if (!orderNumber.isEmpty()){
                 return takeStock(orderNumber, epcList, 2L);
             }else {
-                return takeStock2(location, 2L, epcList, orderNumber);
+                return takeStock2(location, 2L, epcList);
             }
         }else if (list.size()>intersection.size()){
             //盘盈
             if (!orderNumber.isEmpty()){
                 return takeStock(orderNumber, epcList, 1L);
             }else {
-                return takeStock2(location, 1L, epcList, orderNumber);
+                return takeStock2(location, 1L, epcList);
             }
         }else if (intersection.size()==rfidList.size()){
             //正常
             if (!orderNumber.isEmpty()){
                 return takeStock(orderNumber, epcList, 3L);
             }else {
-                return takeStock2(location, 3L, epcList, orderNumber);
+                return takeStock2(location, 3L, epcList);
             }
         }else {
             return 0;
@@ -205,7 +206,7 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
         }
     }
 
-    private int takeStock2(String location, Long result, List<String> list, String orderNumber){
+    private int takeStock2(String location, Long result, List<String> list){
         TbAssetInventory inventory = new TbAssetInventory();
         inventory.setInventoryStatus(2L);
         inventory.setInventoryResult(result);
@@ -213,13 +214,19 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
         inventory.setInventoryLocation(location);
         inventory.setInventoryDate(new Date());
         inventory.setName("线下自测");
+        int i = insertTbAssetInventory(inventory);
+        if(i < 1){
+            throw new ServiceException("生成盘点记录失败");
+        }
+        String orderNumber = inventory.getOrderNumber();
         //插入盘点明细
+
         TbInventoryDetail detail = new TbInventoryDetail();
         for (String number : list) {
             detail.setOrderNumber(orderNumber);
             detail.setInventoryMetadata(JSONUtil.toJsonStr(informationMapper.selectTbAssetInformationByAssetNumber(number)));
             tbInventoryDetailMapper.insertTbInventoryDetail(detail);
         }
-        return insertTbAssetInventory(inventory);
+        return 1;
     }
 }

ruoyi-common/pom.xml

@@ -20,8 +20,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>10</source>
-                    <target>10</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
         </plugins>