From b47369fbc73269f0661ba169c6387e04fb037e87 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 16 三月 2026 14:26:23 +0800
Subject: [PATCH] 发货通知单打印日志
---
src/main/java/com/zy/common/service/erp/ErpService.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 bdb282e..e6ec01d 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -140,8 +140,9 @@
* @return
*/
public List<OutStockBill> syncOutStock() {
- return erpSqlServer.select("SELECT * FROM xtyasrs_dual.dbo.OutStockBill where Fflag_rw=0", OutStockBill.class);
-// return erpSqlServer.select("SELECT * FROM xtyasrs_dual.dbo.OutStockBill where Fflag_rw=0", OutStockBill.class);
+ List<OutStockBill> list = erpSqlServer.select("SELECT * FROM xtyasrs_dual.dbo.OutStockBill where Fflag_rw=0", OutStockBill.class);
+ log.info("outStock鍚屾鏉ユ簮锛欵RP搴搙tyasrs_dual鏈鍑哄簱鍗曟暟={}", list != null ? list.size() : 0);
+ return list;
}
/**
@@ -165,9 +166,10 @@
* @return
*/
public List<OutStockBillEntry> syncOutStockDetail(Integer FInterID) {
-// String sql = "SELECT * FROM xtyasrs_dual.dbo.OutStockBillEntry where FSourceBillNo!='' and FAuxCommitQty=0 and FInterID=" + FInterID;
String sql = "SELECT * FROM xtyasrs_dual.dbo.OutStockBillEntry where FAuxCommitQty=0 and FInterID=" + FInterID;
- return erpSqlServer.select(sql, OutStockBillEntry.class);
+ List<OutStockBillEntry> list = erpSqlServer.select(sql, OutStockBillEntry.class);
+ log.info("outStock鍚屾鏉ユ簮锛欵RP鍑哄簱鏄庣粏 FInterID={}, 鏉℃暟={}", FInterID, list != null ? list.size() : 0);
+ return list;
}
/**
@@ -452,10 +454,18 @@
}
}
if (complete) {
- sql = "select * from OutStockbillEntry where 1=1 and FInterID = {1,number,#} and FAuxCommitQty != FQty";
+ sql = "select * from OutStockbillEntry where 1=1 and FInterID = {1,number,#}";
sql = MessageFormat.format(sql, Fnumber, FInterID);
List<OutStockBillEntry> select1 = erpSqlServer.select(sql, OutStockBillEntry.class);
- if(select1.size()<1){
+
+ boolean flag = true;
+ for(OutStockBillEntry outStockBillEntry1 : select1){
+ if (outStockBillEntry1.getFAuxCommitQty().compareTo(outStockBillEntry1.getFQty()) == -1) {
+ flag = false;
+ }
+ }
+
+ if(flag){
if (!completeCPakOut(FBillNo) ) {
log.error("{}鍑哄簱鍗曟爣璁板畬鎴愬け璐�", FBillNo);
}
--
Gitblit v1.9.1