From 7860df0abacea1ddaf2bc03bbc4e78dd0bfc083b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期一, 15 七月 2024 20:45:47 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlMapper.xml | 2 +-
src/main/resources/mapper/WrkDetlLogMapper.xml | 2 +-
src/main/java/com/zy/asrs/entity/OrderDetl.java | 2 +-
src/main/java/com/zy/asrs/controller/MobileController.java | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e8e3056..67a2145 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -248,9 +248,9 @@
if (Cools.isEmpty(batch)){
return R.error().add("鍙傛暟涓虹┖");
}
- String[] batch1 = batch.split("绠卞彿锛�");
- String[] batch2 = batch1[1].split("瑙勬牸锛�");
- batch = batch2[0];
+// String[] batch1 = batch.split("绠卞彿锛�");
+// String[] batch2 = batch1[1].split("瑙勬牸锛�");
+// batch = batch2[0];
String orderNo = "";
// WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
@@ -279,7 +279,7 @@
orderDetlService.updateById(orderDetl);
return R.ok();
} catch (Exception e){
- return R.error().add(e);
+ return R.error().add(e.getMessage());
}
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index a6dfdc7..64d160d 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -473,7 +473,7 @@
}
public String getQty$(){
- if (getAnfme().equals(getQty())){
+ if (this.anfme.equals(this.qty)){
return "宸插畬鎴�";
}
return "鏈畬鎴�";
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 1d01920..4ba2dbd 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -111,7 +111,7 @@
where batch = #{batch}
and order_no is not null
and order_no != ''
- order by io_time
+ order by io_time desc
</select>
</mapper>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 7f73c7f..9e6fe08 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -142,7 +142,7 @@
where batch = #{batch}
and order_no is not null
and order_no != ''
- order by io_time
+ order by io_time desc
</select>
</mapper>
--
Gitblit v1.9.1