From 0df8f305406412a1229bf412a574cb026ac802cf Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 24 九月 2021 13:03:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/erp/ErpService.java | 45 ++++++++++++++++++++++++++-------------------
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 6 ++++--
2 files changed, 30 insertions(+), 21 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 03c59a9..e27f27c 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -11,6 +11,7 @@
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.OutStockBillEntry;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -24,6 +25,7 @@
/**
* Created by vincent on 2020/7/6
*/
+@Slf4j
@Service
@RestController
public class WorkLogHandler extends AbstractHandler<String> {
@@ -98,8 +100,10 @@
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())) {
@@ -116,8 +120,6 @@
}
}
}
-
-
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
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 142d9d0..f4e3d9d 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -300,30 +300,37 @@
public boolean incrementCPakOut(Integer FInterID, String Fnumber, Double increment, String FBillNo) {
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);
- 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);
- List<OutStockBillEntry> select = erpSqlServer.select(sql, OutStockBillEntry.class);
- OutStockBillEntry outStockBillEntry = select.get(0);
- boolean complete = false;
- if (outStockBillEntry.getFQty().compareTo(BigDecimal.ZERO) == 1) {
- if (outStockBillEntry.getFAuxCommitQty().compareTo(outStockBillEntry.getFQty()) > -1) {
- complete = true;
+ try {
+ 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);
+ List<OutStockBillEntry> select = erpSqlServer.select(sql, OutStockBillEntry.class);
+ OutStockBillEntry outStockBillEntry = select.get(0);
+ boolean complete = false;
+ if (outStockBillEntry.getFQty().compareTo(BigDecimal.ZERO) == 1) {
+ if (outStockBillEntry.getFAuxCommitQty().compareTo(outStockBillEntry.getFQty()) > -1) {
+ complete = true;
+ }
+ } else {
+ if (outStockBillEntry.getFAuxCommitQty().compareTo(outStockBillEntry.getFAuxQty()) > -1) {
+ complete = true;
+ }
}
+ if (complete) {
+ if (!completeCPakOut(FBillNo)) {
+ log.error("{}鍑哄簱鍗曟爣璁板畬鎴愬け璐�", FBillNo);
+ }
+ }
+ return true;
} else {
- if (outStockBillEntry.getFAuxCommitQty().compareTo(outStockBillEntry.getFAuxQty()) > -1) {
- complete = true;
- }
+ return false;
}
- if (complete) {
- if (!completeCPakOut(FBillNo)) {
- log.error("{}鍑哄簱鍗曟爣璁板畬鎴愬け璐�", FBillNo);
- }
- }
- return true;
- } else {
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error("incrementCPakOut----" + sql);
return false;
}
+
}
/* 鎴愬搧鍑哄簱鍗曟爣璁板畬鎴� */
--
Gitblit v1.9.1