优化计算仓储费，去除多余打印语句

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

@@ -50,7 +50,6 @@ public class TWarehouseInStockController extends BaseController {
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
-        System.out.println(tWarehouseBills.toString());
         startPage();
         tWarehouseBills.setfBilltype("SJRK");
         List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);

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

@@ -180,7 +180,7 @@ public class TWarehouseOutStockController extends BaseController {
     /**
      * 撤销入库信息
      */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:revoke')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:edit')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit

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

@@ -50,7 +50,6 @@ public class TWarehouseStockTransferController extends BaseController {
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
-        System.out.println(tWarehouseBills.toString());
         startPage();
         tWarehouseBills.setfBilltype("CKDB");
         List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -362,7 +362,6 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
         BigDecimal result = num1.divide(num2,2,BigDecimal.ROUND_HALF_UP);
         int i = new Double(result.doubleValue()*100).intValue();
         String str = i +  "%";
-        System.out.println(str);
         return str;
     }
 

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

@@ -703,7 +703,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     @Override
-    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(Long  fId) {
+    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(Long fId) {
         return tWarehouseBillsMapper.selectTWarehousebillsItemsList(fId);
     }
 
@@ -718,7 +718,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (StringUtils.isNull(fPid)) {
             return AjaxResult.error("仓库更新状态未找到主表信息，请与管理员联系");
         }
-        try{
+        try {
             tWarehouseBillsMapper.warehouseFollowUpdate(fPid, fettle);
             tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(fPid, fettle);
             TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(fPid);
@@ -726,8 +726,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 fettle = 40L;
             }
             tWarehousebillsitemsMapper.warehouseItemFollowUpdate(fPid, fettle);
-        } catch (Exception e){
-            return   AjaxResult.error("更新库存费用状态失败，请联系管理员");
+        } catch (Exception e) {
+            return AjaxResult.error("更新库存费用状态失败，请联系管理员");
         }
         return AjaxResult.success();
     }
@@ -1110,7 +1110,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
 
     /**
-     *  打印作业单
+     * 打印作业单
+     *
      * @param warehouseBills
      * @param warehousebillsitems
      * @param tEnclosure
@@ -1255,7 +1256,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             BigDecimal amt = (BigDecimal) objectMap.get("amt");
             map.put("feeId", feeId);
             map.put("itemFeeId", objectMap.get("feeId"));
-            sumAmt = sumAmt.add(amt).setScale(2,BigDecimal.ROUND_HALF_UP);
+            sumAmt = sumAmt.add(amt).setScale(2, BigDecimal.ROUND_HALF_UP);
             TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
             tWarehousebillsitems.setfAmt(amt);
             tWarehousebillsitems.setfSrcid(fId);
@@ -1276,7 +1277,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehousebillsitems.setfChargedate((Date) item.get("fChargedate"));
             tWarehousebillsitems.setfOriginalbilldate((Date) item.get("fOriginalbilldate"));
             tWarehousebillsitems.setfBillingDeadline(warehouseBills.getfBillingDeadline());
-            System.out.println(tWarehousebillsitems.toString());
             tWarehousebillsitemsMapper.insertTWarehousebillsitems(tWarehousebillsitems);
             itemsList.add(tWarehousebillsitems);
         }
@@ -1386,6 +1386,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tFees.setfStatus("2");
         tFees.setDelFlag("0");
         List<TFees> feesList = tFeesMapper.selectTFeesList(tFees);
+        if (itemsList.size() <= 0) {
+            return AjaxResult.error("未找到合适的库存明细");
+        }
         map.put("goodsList", goods);
         map.put("feesList", feesList);
         map.put("warehouseBills", tWarehouseBills);
@@ -1578,7 +1581,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         } else if (dictLabel.equals(fixed)) {
             fQty = new BigDecimal(1);
         }
-        return fQty.setScale(2,BigDecimal.ROUND_HALF_UP);
+        return fQty.setScale(2, BigDecimal.ROUND_HALF_UP);
     }
 
     // 入库 收费明细 校验
@@ -1679,7 +1682,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
 
     /**
-     *  撤销入库
+     * 撤销入库
+     *
      * @param fId
      * @param loginUser
      * @param billsType
@@ -1758,7 +1762,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         updateTWhgenlegData(wb, tWhgenle1.getfId(), "SJRKRevoke");
                     } else {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return AjaxResult.error("第" + i + "行撤销数大于库存结余数") ;
+                        return AjaxResult.error("第" + i + "行撤销数大于库存结余数");
                     }
                     //  2、原货权方撤销出库
                     // 查询库存总账

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

@@ -112,7 +112,6 @@
             AND agreement.del_flag = '0'
             AND agreement.f_feetypeid = '0'
             AND items.del_flag = '0'
-            AND items.f_status = 'T'
         ORDER BY
             items.f_fromdays
     </select>