From fb405f122670d390ea31d5f7694155cbe36722a4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 01 四月 2024 08:52:16 +0800
Subject: [PATCH] #立库转平库
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 86 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index c81f99a..f090d7e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -61,50 +61,7 @@
public ReturnT<Exception> start(WrkMast wrkMast) {
try {
- if (!Cools.isEmpty(wrkMast.getBarcode())) {
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode());
- // erp鍏宠仈璁㈠崟澶勭悊
- List<WaitPakin> waitPakins = waitPakinService.selectList(wrapper);
- for (WaitPakin waitPakin : waitPakins) {
- if (!Cools.isEmpty(waitPakin.getMemo())) {
- if (waitPakin.getMemo().equals("鍘熸潗鏂�")) {
- if (!erpService.incrementPakIn(waitPakin.getSupplier(), waitPakin.getMatnr(), waitPakin.getAnfme())) {
- exceptionHandle("鏇存柊ERP鍘熸潗鏂欏叆搴撴暟鎹甗matnr={0}]澶辫触", waitPakin.getMatnr());
- }
- } else if (waitPakin.getMemo().equals("鎴愬搧")) {
- if (!erpService.incrementCPakIn(waitPakin.getSupplier(), waitPakin.getMatnr(), waitPakin.getAnfme())) {
- exceptionHandle("鏇存柊ERP鎴愬搧鍏ュ簱鏁版嵁[matnr={0}]澶辫触", waitPakin.getMatnr());
- }
- }
- }
- }
-
- // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
- waitPakinLogService.save(wrkMast.getBarcode());
- // 鍒犻櫎鍏ュ簱閫氱煡妗�
- waitPakinService.delete(wrapper);
- }
-
- // erp鍏宠仈鍑哄簱璁㈠崟澶勭悊
- if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 53) {
- EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
- // 鑾峰彇宸ヤ綔妗ｅ唴鐗╂枡娓呭崟
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(wrapper.eq("wrk_no", wrkMast.getWrkNo()).and().isNotNull("supplier"));
- for (WrkDetl wrkDetl: wrkDetls) {
- if (!Cools.isEmpty(wrkDetl)) {
- Integer FInterI = outStockDanService.queryOutStockFInterID(wrkDetl.getSupplier()); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
- if (!Cools.isEmpty(FInterI)) {
- if (!erpService.incrementCPakOut(FInterI, wrkDetl.getMatnr(), wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
- exceptionHandle("[xtyasrs_dual]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0},FBillNo={1}]澶辫触", wrkDetl.getMatnr(),wrkDetl.getSupplier());
- }
- if (!outStockDanService.incrementCPakOut(FInterI, wrkDetl.getMatnr(), wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
- exceptionHandle("[xtyasrs]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0},FBillNo={1}]澶辫触", wrkDetl.getMatnr(),wrkDetl.getSupplier());
- }
- }
- }
- }
- }
if (!Cools.isEmpty(wrkMast.getPdcType()) && wrkMast.getPdcType().equals("Y")){
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (Cools.isEmpty(wrkDetls)){
@@ -158,6 +115,49 @@
}
}
}
+ if (!Cools.isEmpty(wrkMast.getBarcode())) {
+ Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode());
+ // erp鍏宠仈璁㈠崟澶勭悊
+ List<WaitPakin> waitPakins = waitPakinService.selectList(wrapper);
+ for (WaitPakin waitPakin : waitPakins) {
+ if (!Cools.isEmpty(waitPakin.getMemo())) {
+ if (waitPakin.getMemo().equals("鍘熸潗鏂�")) {
+ if (!erpService.incrementPakIn(waitPakin.getSupplier(), waitPakin.getMatnr(), waitPakin.getAnfme())) {
+ exceptionHandle("鏇存柊ERP鍘熸潗鏂欏叆搴撴暟鎹甗matnr={0}]澶辫触", waitPakin.getMatnr());
+ }
+ } else if (waitPakin.getMemo().equals("鎴愬搧")) {
+ if (!erpService.incrementCPakIn(waitPakin.getSupplier(), waitPakin.getMatnr(), waitPakin.getAnfme())) {
+ exceptionHandle("鏇存柊ERP鎴愬搧鍏ュ簱鏁版嵁[matnr={0}]澶辫触", waitPakin.getMatnr());
+ }
+ }
+ }
+
+ }
+
+ // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
+ waitPakinLogService.save(wrkMast.getBarcode());
+ // 鍒犻櫎鍏ュ簱閫氱煡妗�
+ waitPakinService.delete(wrapper);
+ }
+ // erp鍏宠仈鍑哄簱璁㈠崟澶勭悊
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 53) {
+ EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
+ // 鑾峰彇宸ヤ綔妗ｅ唴鐗╂枡娓呭崟
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(wrapper.eq("wrk_no", wrkMast.getWrkNo()).and().isNotNull("supplier"));
+ for (WrkDetl wrkDetl: wrkDetls) {
+ if (!Cools.isEmpty(wrkDetl)) {
+ Integer FInterI = outStockDanService.queryOutStockFInterID(wrkDetl.getSupplier()); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
+ if (!Cools.isEmpty(FInterI)) {
+ if (!erpService.incrementCPakOut(FInterI, wrkDetl.getMatnr(), wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
+ exceptionHandle("[xtyasrs_dual]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0},FBillNo={1}]澶辫触", wrkDetl.getMatnr(),wrkDetl.getSupplier());
+ }
+ if (!outStockDanService.incrementCPakOut(FInterI, wrkDetl.getMatnr(), wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
+ exceptionHandle("[xtyasrs]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0},FBillNo={1}]澶辫触", wrkDetl.getMatnr(),wrkDetl.getSupplier());
+ }
+ }
+ }
+ }
+ }
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
--
Gitblit v1.9.1