From faed059302b334b39f247fa8bde5daa8f0b924f5 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 24 十一月 2025 17:58:23 +0800
Subject: [PATCH] 1.晚上erp订单同步删除功能
---
/dev/null | 36 ------------------
src/main/java/com/zy/third/task/handler/OrderHandler.java | 39 ++++++++++++-------
2 files changed, 25 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/third/task/handler/OrderHandler.java b/src/main/java/com/zy/third/task/handler/OrderHandler.java
index dcea148..7eed914 100644
--- a/src/main/java/com/zy/third/task/handler/OrderHandler.java
+++ b/src/main/java/com/zy/third/task/handler/OrderHandler.java
@@ -219,17 +219,23 @@
throw new CoolException(fbillno + "鍗曟嵁姝ｅ湪浣滀笟涓紝鏃犳硶鍒犻櫎");
}
Mat mat = matService.selectBySku(exdInstockSource.getFitemid() + "");
- boolean delete = orderDetlService.delete(new EntityWrapper<OrderDetl>()
- .eq("order_no", order.getOrderNo())
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo())
.eq("matnr", mat.getMatnr())
.eq("batch", exdInstockSource.getFbatchno())
- .eq("anfme", exdInstockSource.getFqty()));
- if (delete) {
- log.info("鍒犻櫎璁㈠崟鏄庣粏鎴愬姛锛岃鍗曞彿={},鐗╂枡鍙�={}锛屾壒鍙�={}锛屾暟閲�={}鎴愬姛",order.getOrderNo(),exdInstockSource.getFitemid(),exdInstockSource.getFbatchno(),exdInstockSource.getFqty());
+ .eq("anfme", exdInstockSource.getFqty()<0 ? -exdInstockSource.getFqty():exdInstockSource.getFqty()));
+ if (orderDetl != null) {
+ boolean delete = orderDetlService.deleteById(orderDetl.getId());
+ if (delete) {
+ log.info("鍒犻櫎璁㈠崟鏄庣粏鎴愬姛锛岃鍗曞彿={},鐗╂枡鍙�={}锛屾壒鍙�={}锛屾暟閲�={}鎴愬姛",order.getOrderNo(),exdInstockSource.getFitemid(),exdInstockSource.getFbatchno(),exdInstockSource.getFqty());
+ }else {
+ log.error("鍒犻櫎璁㈠崟鏄庣粏澶辫触锛岃鍗曞彿={},鐗╂枡鍙�={}锛屾壒鍙�={}锛屾暟閲�={}",order.getOrderNo(),exdInstockSource.getFitemid(),exdInstockSource.getFbatchno(),exdInstockSource.getFqty());
+ throw new CoolException(fbillno + "鍗曟嵁鏄庣粏鍒犻櫎澶辫触");
+ }
}else {
- log.error("鍒犻櫎璁㈠崟鏄庣粏澶辫触锛岃鍗曞彿={},鐗╂枡鍙�={}锛屾壒鍙�={}锛屾暟閲�={}",order.getOrderNo(),exdInstockSource.getFitemid(),exdInstockSource.getFbatchno(),exdInstockSource.getFqty());
- throw new CoolException(fbillno + "鍗曟嵁鏄庣粏鍒犻櫎澶辫触");
+ log.error("娌℃湁鏌ヨ鍒拌鍗曟槑缁嗭紝璁㈠崟鍙�={},鐗╂枡鍙�={}锛屾壒鍙�={}锛屾暟閲�={}",order.getOrderNo(),exdInstockSource.getFitemid(),exdInstockSource.getFbatchno(),exdInstockSource.getFqty());
+ throw new CoolException(fbillno + "娌℃湁鏌ヨ鍒拌鍗曟槑缁�");
}
+
int orderNo = orderDetlService.selectCount(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()));
if(orderNo==0){
orderService.remove(order.getId());
@@ -353,16 +359,21 @@
throw new CoolException(fbillno + "鍗曟嵁姝ｅ湪浣滀笟涓紝鏃犳硶鍒犻櫎");
}
Mat mat = matService.selectBySku(exdInstockSource.getFitemid() + "");
- boolean delete = orderDetlService.delete(new EntityWrapper<OrderDetl>()
- .eq("order_no", order.getOrderNo())
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo())
.eq("matnr", mat.getMatnr())
.eq("batch", exdInstockSource.getFbatchno())
- .eq("anfme", exdInstockSource.getFqty()));
- if (delete) {
- log.info("鍒犻櫎璁㈠崟鏄庣粏鎴愬姛锛岃鍗曞彿={},鐗╂枡鍙�={}锛屾壒鍙�={}锛屾暟閲�={}鎴愬姛",order.getOrderNo(),exdInstockSource.getFitemid(),exdInstockSource.getFbatchno(),exdInstockSource.getFqty());
+ .eq("anfme", exdInstockSource.getFqty()<0 ? -exdInstockSource.getFqty():exdInstockSource.getFqty()));
+ if (orderDetl != null) {
+ boolean delete = orderDetlService.deleteById(orderDetl.getId());
+ if (delete) {
+ log.info("鍒犻櫎璁㈠崟鏄庣粏鎴愬姛锛岃鍗曞彿={},鐗╂枡鍙�={}锛屾壒鍙�={}锛屾暟閲�={}鎴愬姛",order.getOrderNo(),exdInstockSource.getFitemid(),exdInstockSource.getFbatchno(),exdInstockSource.getFqty());
+ }else {
+ log.error("鍒犻櫎璁㈠崟鏄庣粏澶辫触锛岃鍗曞彿={},鐗╂枡鍙�={}锛屾壒鍙�={}锛屾暟閲�={}",order.getOrderNo(),exdInstockSource.getFitemid(),exdInstockSource.getFbatchno(),exdInstockSource.getFqty());
+ throw new CoolException(fbillno + "鍗曟嵁鏄庣粏鍒犻櫎澶辫触");
+ }
}else {
- log.error("鍒犻櫎璁㈠崟鏄庣粏澶辫触锛岃鍗曞彿={},鐗╂枡鍙�={}锛屾壒鍙�={}锛屾暟閲�={}",order.getOrderNo(),exdInstockSource.getFitemid(),exdInstockSource.getFbatchno(),exdInstockSource.getFqty());
- throw new CoolException(fbillno + "鍗曟嵁鏄庣粏鍒犻櫎澶辫触");
+ log.error("娌℃湁鏌ヨ鍒拌鍗曟槑缁嗭紝璁㈠崟鍙�={},鐗╂枡鍙�={}锛屾壒鍙�={}锛屾暟閲�={}",order.getOrderNo(),exdInstockSource.getFitemid(),exdInstockSource.getFbatchno(),exdInstockSource.getFqty());
+ throw new CoolException(fbillno + "娌℃湁鏌ヨ鍒拌鍗曟槑缁�");
}
int orderNo = orderDetlService.selectCount(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()));
if(orderNo==0){
diff --git a/src/main/webapp/static/layuiadmin/json/console/prograss.js b/src/main/webapp/static/layuiadmin/json/console/prograss.js
deleted file mode 100644
index 13a093b..0000000
--- a/src/main/webapp/static/layuiadmin/json/console/prograss.js
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "code": 0
- ,"msg": ""
- ,"count": "100"
- ,"data": [{
- "prograss": "寮�浼�"
- ,"time": "涓�灏忔椂"
- ,"complete": "宸插畬鎴�"
- ,"LAY_CHECKED": true
- },{
- "prograss": "椤圭洰寮�鍙�"
- ,"time": "涓ゅ皬鏃�"
- ,"complete": "杩涜涓�"
- ,"LAY_CHECKED": true
- },{
- "prograss": "闄悆楗�"
- ,"time": "涓�灏忔椂"
- ,"complete": "鏈畬鎴�"
- },{
- "prograss": "淇敼灏廱ug"
- ,"time": "鍗婂皬鏃�"
- ,"complete": "鏈畬鎴�"
- },{
- "prograss": "淇敼澶ug"
- ,"time": "涓ゅ皬鏃�"
- ,"complete": "鏈畬鎴�"
- },{
- "prograss": "淇敼灏廱ug"
- ,"time": "鍗婂皬鏃�"
- ,"complete": "鏈畬鎴�"
- },{
- "prograss": "淇敼澶ug"
- ,"time": "涓ゅ皬鏃�"
- ,"complete": "鏈畬鎴�"
- }]
-}
\ No newline at end of file
--
Gitblit v1.9.1