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 | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
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 623c72a..f4e3d9d 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -113,6 +113,7 @@
"and isb.FBillNo= ''{2}''";
sql = MessageFormat.format(sql, increment, Fnumber, FBillNo);
if (erpSqlServer.update(sql) > 0) {
+// log.error("鏇存柊ERP涓棿琛ㄦ垚鍔�===>>[FBillNo:{},Fnumber:{},increment:{}]",FBillNo,Fnumber,increment);
List<InStockBillEntry> inStockBillEntries = getInStockBillEntry(FBillNo);
boolean complete = true;
// 姣旇緝鍗曠瑪璧勬枡鐗╂枡鏄惁鍏ㄩ儴瀹屾垚
@@ -137,6 +138,7 @@
}
return true;
} else {
+ log.error("鏇存柊ERP涓棿琛ㄥけ璐�===>>[FBillNo:{},Fnumber:{},increment:{}]",FBillNo,Fnumber,increment);
return false;
}
}
@@ -228,14 +230,14 @@
/**
* 搴撳瓨鐩樼偣
- * @param FItemID 鐗╂枡鍐呯爜
+ * @param FNumber 鐗╂枡鍐呯爜
* @param qty 鏁伴噺锛堟琛ㄧず鐩樼泩銆佽礋琛ㄧず鐩樹簭锛�
*/
- public boolean checkStockEntity(Integer FItemID, Integer FEntryID, Double qty){
- String sql = "insert [dbo].[StockCheckRecord] ([FItemID],[FEntryID], [CheckQty],[Fflag_rw],[Fflag_finish]) values ({0,number,#}, {1,number,#}, {2,number,#}, 0, 0);";
- sql = MessageFormat.format(sql, FItemID, FEntryID, qty);
+ public boolean checkStockEntity(String FNumber, Double qty){
+ String sql = "insert [dbo].[StockCheckRecord] ([FNumber],[CheckQty],[Fflag_rw],[Fflag_finish],[sync_id]) values (''{0}'', {1,number,#}, 0, 0, -1);";
+ sql = MessageFormat.format(sql, FNumber, qty);
if (erpSqlServer.update(sql) == 0) {
- log.error("{}鏂板鐩樼偣璁板綍澶辫触", FItemID);
+ log.error("{}鏂板鐩樼偣璁板綍澶辫触", FNumber);
return false;
}
return true;
@@ -298,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