From 539d9ffc477d28a23a923b41fdeabc8c37c99ce6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 九月 2024 14:43:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PlaController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index b449dca..dc23bfc 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -229,7 +229,7 @@
pla.setWeightAnfme(0.0);
plaService.updateById(pla);
SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
- null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
});
return R.ok();
@@ -362,7 +362,8 @@
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<Pla> wrapper = new EntityWrapper<Pla>().setSqlSelect("batch")
.andNew().like("batch", condition)
- .groupBy("batch");
+ .groupBy("batch")
+ .orderBy("batch",false);
List<Pla> plas = plaService.selectPage(new Page<Pla>(1, 30), wrapper).getRecords();
List<KeyValueVo> valueVos = new ArrayList<>();
for (Pla pla : plas) {
--
Gitblit v1.9.1