zhangyuewww 3 năm trước cách đây
mục cha
commit
be209ec045

+ 2 - 7
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseReceiptReportServiceImpl.java

@@ -62,7 +62,6 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
             List<String> statusList = Lists.newArrayList(StatusEnum.PUR_RETURN.getFlag());
             statusSet.addAll(statusList);
         }
-
         //公司id
         pageView.put("compId", purchaseReceiptReport.getCompId());
         pageView.put("searchKeyWord", purchaseReceiptReport.getSearchKeyWord());
@@ -72,9 +71,7 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
         pageView.put("contractNo", purchaseReceiptReport.getContractNo());
         pageView.put("businessKeys", businessKeys);
         pageView.put("statusSet", statusSet);
-
-
-        // 查询采购订单总数
+        // 查询采购入库总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<PurchaseReceiptReport> dataList = baseMapper.getListByCondition(pageView);
         Page<PurchaseReceiptReport> page = new Page<>();
@@ -85,10 +82,8 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
         return page;
     }
 
-
     /**
      * 编辑采购入库统计
-     *
      * @param purchaseReceiptReport
      * @return
      */
@@ -102,7 +97,6 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
         }
     }
 
-
     /**
      * 补货结转
      * @param purchaseReceiptReport
@@ -123,6 +117,7 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
         }
         return "OK";
     }
+
     /**
      * 出纳付款
      * @param purchaseReceiptReport

+ 1 - 6
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SalesDeliveryReportServiceImpl.java

@@ -38,7 +38,6 @@ public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryRep
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
 
-
     /**
      * 销售出库统计列表
      * @param salesDeliveryReport
@@ -56,7 +55,6 @@ public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryRep
             List<String> statusList = Lists.newArrayList(StatusEnum.PUR_RETURN.getFlag());
             statusSet.addAll(statusList);
         }
-
         //公司id
         pageView.put("compId", salesDeliveryReport.getCompId());
         pageView.put("searchKeyWord", salesDeliveryReport.getSearchKeyWord());
@@ -66,9 +64,7 @@ public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryRep
         pageView.put("contractNo", salesDeliveryReport.getContractNo());
         pageView.put("businessKeys", businessKeys);
         pageView.put("statusSet", statusSet);
-
-
-        // 查询采购订单总数
+        // 查询销售出库总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<SalesDeliveryReport> dataList = baseMapper.getListByCondition(pageView);
         Page<SalesDeliveryReport> page = new Page<>();
@@ -136,7 +132,6 @@ public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryRep
         return "NG";
     }
 
-
     /**
      * 批量开发票
      * @param salesDeliveryReport