From d0a5c06aa6f6eb85966bf944b72fd7998161e189 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 24 九月 2021 13:20:29 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/service/erp/ErpService.java | 3 ---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 16 +++-------------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index c0112f1..11a0bf7 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -86,22 +86,13 @@
for (WrkDetl wrkDetl: wrkDetls) {
if (!Cools.isEmpty(wrkDetl)) {
Integer FInterI = outStockService.queryOutStockFInterID(wrkDetl.getSupplier()); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
- log.info("incrementCPakOut---" + wrkMast.getWrkNo() + "----FInterI" + FInterI);
if (!Cools.isEmpty(FInterI)) {
if (!erpService.incrementCPakOut(FInterI, wrkDetl.getMatnr(), wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
- log.error("erpService.incrementCPakOut");
exceptionHandle("[xtyasrs_dual]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0}]澶辫触", wrkDetl.getMatnr());
}
-// if (!outStockService.incrementCPakOut(FInterI, wrkDetl.getMatnr(), wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
-// exceptionHandle("[xtyasrs]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0}]澶辫触", wrkDetl.getMatnr());
-// }
- }
- if (wrkDetl.getMemo().equals("鍘熸潗鏂�")) {
- // 寰呭疄鐜�
-
-
- } else if (wrkDetl.getMemo().equals("鎴愬搧")) {
-
+ if (!outStockService.incrementCPakOut(FInterI, wrkDetl.getMatnr(), wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
+ exceptionHandle("[xtyasrs]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0}]澶辫触", wrkDetl.getMatnr());
+ }
}
}
}
@@ -124,7 +115,6 @@
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
} catch (Exception e) {
-// e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setContent(e);
}
diff --git a/src/main/java/com/zy/common/service/erp/ErpService.java b/src/main/java/com/zy/common/service/erp/ErpService.java
index c40e9c7..f4e3d9d 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -301,11 +301,9 @@
String sql = "update OutStockbillEntry set FAuxCommitQty = (FAuxCommitQty + {0,number,#}) where 1=1 and Fnumber = ''{1}'' and FInterID = {2,number,#}";
sql = MessageFormat.format(sql, increment, Fnumber, FInterID);
try {
- log.info("step 1 ====> {}" , sql);
if (erpSqlServer.update(sql) > 0) {
sql = "select * from OutStockbillEntry where 1=1 and Fnumber = ''{0}'' and FInterID = {1,number,#}";
sql = MessageFormat.format(sql, Fnumber, FInterID);
- log.info("step 2 ====> {}" , sql);
List<OutStockBillEntry> select = erpSqlServer.select(sql, OutStockBillEntry.class);
OutStockBillEntry outStockBillEntry = select.get(0);
boolean complete = false;
@@ -339,7 +337,6 @@
private boolean completeCPakOut(String FBillNo){
String sql = "update OutStockbill set Fflag_finish = 1 where FBillNo = ''{0}''";
sql = MessageFormat.format(sql, FBillNo);
- log.info("step 3 ====> {}" , sql);
return erpSqlServer.update(sql) > 0;
}
--
Gitblit v1.9.1