From bd80bef8c6ea2763993ff3ef065ee474b11222a4 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 02 八月 2022 09:17:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 12 +++++++-----
src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java | 4 ++--
src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 1 +
src/main/resources/mapper/OutStockMapper.xml | 6 +++---
src/main/resources/application.yml | 2 +-
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index 9438b0d..eb55b3d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -515,11 +515,13 @@
List<LocNormal> locNormal = new ArrayList<>();
List<LocNormal> locNormalResult = new ArrayList<>();
for (Integer i = 0; i < matList.size(); i++) {
- if(matList.get(i).getFnumber().equals(matnr)){
- locNormal = baseMapper.queryLocNorlMatnr(matnr, mnemonic);
- }else {
- continue;
- }
+// matnr = matList.get(i).getFnumber();
+// if(matList.get(i).getFnumber().equals(matnr)){
+// locNormal = baseMapper.queryLocNorlMatnr(matnr, mnemonic);
+// }else {
+// continue;
+// }
+ locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber(), mnemonic) ;
if (locNormal.size() > 0) {
for (LocNormal e:locNormal) {
LocNormal obj = new LocNormal();
diff --git a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
index 6bc6046..c32a211 100644
--- a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
@@ -204,9 +204,9 @@
// 鐢熸垚宸ヤ綔妗�
for (OutLocDto dto : dtos) {
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
- if (ioType == null) {
+// if (ioType == null) {
ioType = dto.isAll() ? 101 : 103;
- }
+// }
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
// 鑾峰彇璺緞
diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
index b137659..5af0ae6 100644
--- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
+++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
@@ -233,6 +233,7 @@
//鍚屼竴鍗曞彿瀛樺湪鐩稿悓鐗╂枡缂栫爜鏁版嵁锛岃鍗曞彿涓嶄簣澶勭悊
Number fnumberCount = erpService.QueryFnumberOutCount(outStockBill.getFInterID());
if(fnumberCount.intValue() > 1){
+ log.info("鍑哄簱閫氱煡鍗曞瓨鍦ㄧ墿鏂欑浉鍚屾暟鎹甗FBillNo={},FInterID={},]", outStockBill.getFBillNo(), outStockBill.getFInterID());
if (!erpService.haveReadOutBill(outStockBill.getFBillNo(),outStockBill.getFInterID(),-1)) {
log.error("鏇存柊鍑哄簱閫氱煡鍗曡鍙栫姸鎬佷负-1澶辫触[FBrNo={},FInterID={}]", outStockBill.getFBrNo(),outStockBill.getFInterID());
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a37abf2..e44999a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,7 +45,7 @@
erp:
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- ur: jdbc:sqlserver://192.168.4.23:1433;databasename=xtyasrs_dual
+ ur: jdbc:sqlserver://192.168.0.253:1433;databasename=xtyasrs_dual
# ur: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs_dual
username: sa
password: sa@123
diff --git a/src/main/resources/mapper/OutStockMapper.xml b/src/main/resources/mapper/OutStockMapper.xml
index c4b6c79..7603842 100644
--- a/src/main/resources/mapper/OutStockMapper.xml
+++ b/src/main/resources/mapper/OutStockMapper.xml
@@ -91,7 +91,7 @@
a.FOrderInterID,a.FAuxQty,a.FCommitQty,a.FAuxPrice,a.FDate,a.FNote, a.Fnumber, a.FSourceBillNo, b.FBillNo,
b.FAdd
from OutStockBillEntry a left join OutStockBill b on a.FInterID = b.FInterID
- where b.FBillNo = #{FBillNo}) t where 1 = 1
+ where b.FBillNo = #{FBillNo} and b.Fflag_finish != 1 and a.FQty > a.FAmount) t where 1 = 1
</select>
<select id="queryMatWithLoc" resultMap="BaseResultMap">
@@ -100,8 +100,8 @@
and b.loc_sts = 'F'
and a.matnr = #{matnr}
order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time)
- desc,
+ DATEPART(yyyy,a.appe_time),DATEPART(mm,a.appe_time),DATEPART(dd,a.appe_time)
+ ASC,
case
when (left(a.loc_no, 2) = '01') then 0
when (left(a.loc_no, 2) = '02') then 1
--
Gitblit v1.9.1