From 75666e8866ad319bddd787ff2cc9aea1d6a80f84 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 15 三月 2022 14:14:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/erp/ErpService.java | 10 +++++++++-
src/main/webapp/static/js/outStockDan/outStockDan.js | 2 +-
2 files changed, 10 insertions(+), 2 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 9f3803f..4a27748 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -455,7 +455,15 @@
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);
}
diff --git a/src/main/webapp/static/js/outStockDan/outStockDan.js b/src/main/webapp/static/js/outStockDan/outStockDan.js
index 5fa7dc0..519a770 100644
--- a/src/main/webapp/static/js/outStockDan/outStockDan.js
+++ b/src/main/webapp/static/js/outStockDan/outStockDan.js
@@ -13,7 +13,7 @@
, {field: 'fmodel', align: 'center', title: '瑙勬牸', width: 200}
, {field: 'fentryID', align: 'center', title: '鍒嗗綍鍙�', width: 80}
, {field: 'forderInterID', align: 'center', title: '鍗曟嵁缂栧彿', hide: true}
- , {field: 'fauxQty', align: 'center', title: '鏁伴噺', width: 100}
+ , {field: 'fauxQty', align: 'center', title: '鍙嚭鏁伴噺', width: 100}
// , {field: 'fcommitQty', align: 'center', title: '鍙戣揣鏁伴噺'}
, {field: 'fauxPrice', align: 'center', title: '鍗曚环', width: 100}
, {field: 'fdate', align: 'center', title: '鏃ユ湡', hide: true}
--
Gitblit v1.9.1