From 23d7909b52e22eb42900a506c7d8b72f58f28944 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 03 七月 2023 17:36:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index b8a039c..a105620 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -71,7 +71,8 @@
//鍒ゆ柇鏄惁鏈夊叆搴撳姩浣� "N"娌℃湁 鈥淵鈥濇湁
// interData.getFQty().compareTo(waitPakin.getAnfme())
- if (waitPakin.getIoStatus().equals("N") && waitPakin.getAnfme() < interData.getFQty().doubleValue() ) {
+ Double userQty = waitPakin.getNqty() - waitPakin.getAnfme(); //閫氱煡鍏ュ簱閲� - 绛夊緟鍏ュ簱閲� = 宸插畬鎴愬叆搴撴暟閲�; 淇敼鏁伴噺涓嶈兘灏忎簬宸插畬鎴愭暟閲�
+ if (waitPakin.getIoStatus().equals("N") && userQty <= interData.getFQty().doubleValue() ) {
//鍒ゆ柇浼犲叆鐨勬暟閲忔槸鍚︿负0鏉ユ墽琛屽垹闄ゆ垨鑰呬慨鏀�
if (interData.getFQty().compareTo(BigDecimal.ZERO) == 0) {
waitPakinService.delete(wrapper);
@@ -82,7 +83,8 @@
object.put("msg", "鍒犻櫎鎴愬姛");
jsonArray.add(object);
} else {
- waitPakin.setAnfme(interData.getFQty().doubleValue());
+// waitPakin.setAnfme(interData.getFQty().doubleValue());
+ waitPakin.setAnfme(interData.getFQty().doubleValue() - userQty);
waitPakinService.update(waitPakin, wrapper);
JSONObject object = new JSONObject();
object.put("Fnumber", interData.getFnumber());
@@ -97,7 +99,7 @@
object.put("FInterID", interData.getFInterID());
object.put("Fnumber", interData.getFnumber());
object.put("code", 500);
- object.put("msg", "宸插湪鍏ュ簱涓紝鏃犳硶鍙栨秷");
+ object.put("msg", "宸插叆搴撴暟閲忓ぇ浜庡緟淇敼閲忥紝鏃犳硶淇敼");
jsonArray.add(object);
}
}
@@ -220,6 +222,7 @@
}
jsonObject1.put("data", jsonArray);
+ log.info("ERP鍙栨秷浠诲姟--WMS杩斿洖缁撴灉===>>"+ jsonObject1.toJSONString());
return jsonObject1;
}
--
Gitblit v1.9.1