2024年4月26日14:15:08

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

@@ -13,7 +13,10 @@ import com.ruoyi.approvalFlow.mapper.AuditItemsMapper;
 import com.ruoyi.approvalFlow.mapper.AuditItemsUsersMapper;
 import com.ruoyi.approvalFlow.service.impl.AuditItemsAbout;
 import com.ruoyi.approvalFlow.service.impl.AuditItemsServiceImpl;
-import com.ruoyi.basicData.domain.*;
+import com.ruoyi.basicData.domain.GoodsVO;
+import com.ruoyi.basicData.domain.TCorps;
+import com.ruoyi.basicData.domain.TFees;
+import com.ruoyi.basicData.domain.TGoods;
 import com.ruoyi.basicData.mapper.*;
 import com.ruoyi.basicData.service.impl.TWarehouseServiceImpl;
 import com.ruoyi.common.config.RuoYiConfig;
@@ -395,10 +398,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 corpsList.add(corps);
             }
         }
-        List<TWarehouseArea> warehouseAreaList = new ArrayList<>();
-        /*List<Long> warehouseAreaIdList = StringUtils.integerDeduplication(warehouseAreaId);
+        /*TWarehouse tWarehouse = new TWarehouse();
+        tWarehouse.setParentId(tWarehousebills.getfWarehouseid());
+        List<TWarehouse> warehouseAreaList = tWarehouseMapper.selectTWarehouseList(tWarehouse);*/
+        List<TWarehouse> warehouseAreaList = new ArrayList<>();
+       /* List<Long> warehouseAreaIdList = StringUtils.integerDeduplication(warehouseAreaId);
         for (Long warehouseArea : warehouseAreaIdList) {
-            TWarehouseArea tWarehouseArea = tWarehouseAreaMapper.selectTWarehouseAreaById(warehouseArea);
+            TWarehouse tWarehouseArea = tWarehouseMapper.selectTWarehouseById(warehouseArea);
             if (StringUtils.isNotNull(tWarehouseArea)) {
                 warehouseAreaList.add(tWarehouseArea);
             }
@@ -7672,10 +7678,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         // 查询库存总账
                         TWhgenleg whgenleg = queryWhgenlegService.stockWhgenleg(tWarehousebills, wb, goods.getIfCntrno(), WarehouseTypeEnum.UNDO_OPERATION.getType());
                         updateTWhgenlegData(wb, whgenleg.getfId(), WarehouseTypeEnum.SJCK_REVOKE.getType());
-                    }else{
+                    } else {
                         TWhgenleg whgenleg = queryWhgenlegService.stockWhgenleg(tWarehousebills, wb, goods.getIfCntrno(), WarehouseTypeEnum.UNDO_OPERATION.getType());
                         if (StringUtils.isNotNull(whgenleg) && (wb.getfQty().compareTo(whgenleg.getfQtyblc()) <= 0)) {
-                            updateTWhgenlegDataNew(tWarehousebills,wb, whgenleg.getfId(), WarehouseTypeEnum.SJRK_REVOKE.getType());
+                            updateTWhgenlegDataNew(tWarehousebills, wb, whgenleg.getfId(), WarehouseTypeEnum.SJRK_REVOKE.getType());
                         } else {
                             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                             return AjaxResult.error("第" + i + "行撤销数大于库存结余数");
@@ -10875,6 +10881,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 }
                 if (warehousebillsitems.getfGoodsid() != null) {
                     itemList.add(warehousebillsitems);
+                }else{
+                    return AjaxResult.error("第"+line+"行货物名称为空");
                 }
             }
         } catch (IOException e) {
@@ -10956,7 +10964,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             return AjaxResult.success(itemList);
         } else {
-            return AjaxResult.success(errinfo.toString(), itemList);
+            return AjaxResult.error(errinfo.toString());
+//            return AjaxResult.success(errinfo.toString(), itemList);
         }
     }