From 4c4b488961660194d75e910e476ede81e6061b3d Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 05 五月 2021 12:58:10 +0800
Subject: [PATCH] 1.立库、平库入库修改功能调整，生产单号列前置 2.erp对接功能微调
---
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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 1d9ec03..ae26fdb 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -64,11 +64,11 @@
CPICMO cpicmo = select.get(0);
boolean complete = false;
if (cpicmo.getFQty() > 0) {
- if (cpicmo.getFAuxCommitQty() >= cpicmo.getFQty()) {
+ if (cpicmo.getFAuxCommitQty() == cpicmo.getFQty()) {
complete = true;
}
} else {
- if (cpicmo.getFAuxCommitQty() >= cpicmo.getFAuxQty()) {
+ if (cpicmo.getFAuxCommitQty() == cpicmo.getFAuxQty()) {
complete = true;
}
}
@@ -96,6 +96,36 @@
@Override
public void pdaLocNormalIn(List<LocNormal> list) {
+ // 骞充粨鍏ュ簱鍚庢洿鏂颁腑闂磋〃鏁版嵁锛孎flag_finish鏀逛负1锛岃〃绀哄钩浠撳叆搴撴垚鍔�
+ if (list.size() > 0) {
+ for (Integer i = 0; i < list.size(); i++) {
+ if (!Cools.isEmpty(list.get(i).getSupplier())) { // 瀛樺湪鍏ュ簱鍗曞彿鐨勬墠杩涜erp鏇存柊
+ String sql = "update CPICMO set FAuxCommitQty = (FAuxCommitQty + {0,number,#}) where 1=1 and Fnumber = ''{1}'' and FBillNo = ''{2}''";
+ sql = MessageFormat.format(sql, list.get(i).getAnfme(), list.get(i).getMatnr(), list.get(i).getSupplier());
+ if (erpSqlServer.update(sql) > 0) {
+ sql = "select * from CPICMO where 1=1 and Fnumber = ''{0}'' and FBillNo = ''{1}''";
+ sql = MessageFormat.format(sql, list.get(i).getMatnr(), list.get(i).getSupplier());
+ List<CPICMO> select = erpSqlServer.select(sql, CPICMO.class);
+ CPICMO cpicmo = select.get(0);
+ boolean complete = false;
+ if (cpicmo.getFQty() > 0) {
+ if (cpicmo.getFAuxCommitQty() == cpicmo.getFQty()) {
+ complete = true;
+ }
+ } else {
+ if (cpicmo.getFAuxCommitQty() == cpicmo.getFAuxQty()) {
+ complete = true;
+ }
+ }
+ if (complete) {
+ if (!completeCPakIn(list.get(i).getSupplier(), list.get(i).getMatnr())) {
+ log.error("{}骞充粨鍏ュ簱鍗曟爣璁板畬鎴愬け璐�", list.get(i).getSupplier());
+ }
+ }
+ }
+ }
+ }
+ }
baseMapper.pdaLocNormalIn(list);
}
--
Gitblit v1.9.1