From 80ce0de01bd20da10383704e5abd469cdd492089 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 16 六月 2023 15:45:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs_test' into stasrs_test
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index e938d45..fb062fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -177,7 +177,8 @@
}
Double anfme = orderDetl.getAnfme();
- if ( anfme > (anfme - sum)) {
+ Double workQty = orderDetl.getWorkQty();
+ if ( anfme - (workQty+sum) < 0) {
throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
}
}
@@ -563,6 +564,7 @@
manLocDetl.setBatch(jsonOrderDetl.getBatch());
manLocDetl.setOwner(orderDetl.getOwner());
manLocDetl.setWeight(jsonOrderDetl.getWeight());
+ manLocDetl.setOrderNo(jsonOrderDetl.getOrderNo());
if(!manLocDetlService.insert(manLocDetl)){
return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
}
--
Gitblit v1.9.1