From ea3151e1e9378a8454d3119908b47aa72f8869e6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 28 二月 2024 16:33:46 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs
---
src/main/java/com/zy/asrs/controller/PlaQtyController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaQtyController.java b/src/main/java/com/zy/asrs/controller/PlaQtyController.java
index 3e2ef0b..dee0d6c 100644
--- a/src/main/java/com/zy/asrs/controller/PlaQtyController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaQtyController.java
@@ -57,6 +57,9 @@
if (Cools.isEmpty(manPakOut.getStatus()) || manPakOut.getStatus() != 1) {
return false;
}
+ if(plaQty.getReturned() > 0){
+ return false;
+ }
return true;
}).collect(Collectors.toList());
@@ -86,6 +89,7 @@
map.put("id", plaQty.getId());
map.put("value", orderNo);
map.put("customer", plaQty.getCustomer());
+ map.put("type","returned");
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1