From fbc49df4eea567a1a12074318d789dbde2f1ff6b Mon Sep 17 00:00:00 2001
From: liuxm <liuxm_a@163.com>
Date: 星期二, 04 六月 2024 09:53:59 +0800
Subject: [PATCH] 生产计划部分修改

---
 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/QueryVo.java    |    2 +-
 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
index 3466bb7..c9f9598 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
@@ -210,7 +210,7 @@
     public QueryResultVo<List<PrEquip>> selectSomeEquip(QueryVo queryVo) {
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
         //鏌ヨ绗﹀悎鏉′欢鐨勮褰曟�绘暟
-        Long itemTotal = assemblyDao.selectSomeCount(params);
+        Long itemTotal = equipDao.selectSomeCount(params);
         QueryResultVo<List<PrEquip>> rsVo = new QueryResultVo<>(queryVo.pageSize, queryVo.pageCurr) ;
         //璁$畻鍒嗛〉绛変俊鎭�
         rsVo.calculateAndSet(itemTotal, params);
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/QueryVo.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/QueryVo.java
index a3e12f4..c3d35bc 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/QueryVo.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/QueryVo.java
@@ -13,7 +13,7 @@
     public String startDate;
     public String endDate;
     public Long proId;
-//    public Long batchId;
+    public Long batchId;
     public Long planId;
     public Integer addNum;
 }

--
Gitblit v1.8.0