From 8665f2f7f1dd64787b0b62fe1f76a22ccbfd3f24 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 15:32:13 +0800
Subject: [PATCH] 聚乳酸明细分页限制最多500条数据
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index b9de9de..bd496c1 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -130,7 +130,7 @@
this.updateById(pla);
SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
- null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
});
}
@@ -163,13 +163,16 @@
Object create_time = page.getCondition().get("create_time");
Object brand = page.getCondition().get("brand");
Object status = page.getCondition().get("status");
+ String type = (String) page.getCondition().get("type");
+ String workshop = (String) page.getCondition().get("workshop");
+
String createTime = create_time == null ? null : create_time.toString();
if(!Cools.isEmpty(createTime)){
String[] dates = createTime.split(" - ");
stime = DateUtils.convert(dates[0]);
etime = DateUtils.convert(dates[1]);
}
- plaList=baseMapper.getStockStatisAll(brand == null ? null:brand.toString(), status == null ? null:status.toString(), stime,etime);
+ plaList=baseMapper.getStockStatisAll(brand == null ? null:brand.toString(), status == null ? null:status.toString(), stime,etime, type, workshop);
double weightSum = plaList.stream().mapToDouble(Pla::getWeight).sum();
--
Gitblit v1.9.1