From 3e8b02f468f302763c3792efa3f9164dae3e0874 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 01 九月 2022 17:50:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 6 ++++++
src/main/java/com/zy/asrs/entity/WaitPakin.java | 6 ++++++
src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 4 ++++
src/main/resources/mapper/WaitPakinMapper.xml | 1 +
src/main/resources/mapper/WaitPakinLogMapper.xml | 1 +
src/main/java/com/zy/common/web/WcsController.java | 8 +++++---
6 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 2df04fb..429ed0a 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -80,6 +80,12 @@
private Double anfme;
/**
+ * 鏀舵枡鏁伴噺
+ */
+ @ApiModelProperty(value= "鏀舵枡鏁伴噺")
+ private Double nqty;
+
+ /**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index ff28ed5..9e60133 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -72,6 +72,12 @@
private Double anfme;
/**
+ * 鏀舵枡鏁伴噺
+ */
+ @ApiModelProperty(value= "鏀舵枡鏁伴噺")
+ private Double nqty;
+
+ /**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
index 5af0ae6..a1c7963 100644
--- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
+++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
@@ -98,6 +98,7 @@
try {
if (one == null) {
waitPakin.setAnfme(entry.getFAuxQty());
+ waitPakin.setNqty(entry.getFAuxQty());
if (!waitPakinService.insert(waitPakin)) {
log.error("鎻愬彇鍘熸潗鏂欏叆搴撻�氱煡鍗旾nStockBillEntry澶辫触[FBillNo={},Fnumber={}]", waitPakin.getSupplier(), waitPakin.getMatnr());
} else {
@@ -105,6 +106,7 @@
}
} else {
waitPakin.setAnfme(entry.getFAuxQty());
+ waitPakin.setNqty(entry.getFAuxQty());
if (!waitPakinService.update(waitPakin, wrapper)) {
log.error("鏇存柊鍘熸潗鏂欏叆搴撻�氱煡鍗旾nStockBillEntry澶辫触[FBillNo={},Fnumber={}]", waitPakin.getSupplier(), waitPakin.getMatnr());
} else {
@@ -167,6 +169,7 @@
WaitPakin one = waitPakinService.selectOne(wrapper);
if (one == null) {
waitPakin.setAnfme(cpicmo.getFAuxQty());
+ waitPakin.setNqty(cpicmo.getFAuxQty());
if (!waitPakinService.insert(waitPakin)) {
log.error("鎻愬彇鎴愬搧鍏ュ簱閫氱煡鍗旵PICMO澶辫触[FBillNo={},Fnumber={}]", waitPakin.getSupplier(), waitPakin.getMatnr());
} else {
@@ -174,6 +177,7 @@
}
} else {
waitPakin.setAnfme(cpicmo.getFAuxQty());
+ waitPakin.setNqty(cpicmo.getFAuxQty());
if (!waitPakinService.update(waitPakin, wrapper)) {
log.error("鍚屾鏇存柊鎴愬搧鍏ュ簱閫氱煡鍗旵PICMO澶辫触[FBillNo={},Fnumber={}]", waitPakin.getSupplier(), waitPakin.getMatnr());
} else {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 01f1f0f..8330c69 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);
}
}
diff --git a/src/main/resources/mapper/WaitPakinLogMapper.xml b/src/main/resources/mapper/WaitPakinLogMapper.xml
index f5b5a55..3ab5aab 100644
--- a/src/main/resources/mapper/WaitPakinLogMapper.xml
+++ b/src/main/resources/mapper/WaitPakinLogMapper.xml
@@ -13,6 +13,7 @@
<result column="warehouse" property="warehouse" />
<result column="brand" property="brand" />
<result column="anfme" property="anfme" />
+ <result column="nqty" property="nqty" />
<result column="altme" property="altme" />
<result column="zpallet" property="zpallet" />
<result column="bname" property="bname" />
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
index 213a681..31e9b34 100644
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ b/src/main/resources/mapper/WaitPakinMapper.xml
@@ -13,6 +13,7 @@
<result column="warehouse" property="warehouse" />
<result column="brand" property="brand" />
<result column="anfme" property="anfme" />
+ <result column="nqty" property="nqty" />
<result column="altme" property="altme" />
<result column="zpallet" property="zpallet" />
<result column="bname" property="bname" />
--
Gitblit v1.9.1