From f934f933155b4c65a17d18176f4a2fbf95e68535 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期三, 28 五月 2025 08:33:01 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java index 6ac3409..5dd1c51 100644 --- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java +++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java @@ -1,7 +1,6 @@ package com.zy.nc.task.handler; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.InventoryCheckOrder; @@ -66,14 +65,15 @@ public ReturnT<String> start1(List<NccSaleXsfhmxWms> wmsFlag) { try { OpenOrderPakoutParam param = new OpenOrderPakoutParam(); - param.setOrderType("閿�鍞彂璐�"); DetlDto detlDto; List<DetlDto> orderDetails = new ArrayList<>(); long i = 1; for (NccSaleXsfhmxWms nccSaleXsfhmxWms : wmsFlag) { + param.setOrderType("閿�鍞彂璐�"); detlDto = new DetlDto(); detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm()); detlDto.setAnfme(nccSaleXsfhmxWms.getNastnum().doubleValue()); + detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm()); detlDto.setLineNumber(i); detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms)); orderDetails.add(detlDto); @@ -87,7 +87,43 @@ nccSaleXsfhmxWmsService.updateBatchById(wmsFlag); } catch (Exception e) { e.printStackTrace(); - TransactionAspectSupport. currentTransactionStatus().setRollbackOnly(); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return FAIL.setMsg(e.getMessage()); + } + return SUCCESS; + } + + /** + * 鍙戣揣 + * + * @return + */ + public ReturnT<String> start1In(List<NccSaleXsfhmxWms> wmsFlag) { + try { + OpenOrderPakinParam param = new OpenOrderPakinParam(); + DetlDto detlDto; + List<DetlDto> orderDetails = new ArrayList<>(); + long i = 1; + for (NccSaleXsfhmxWms nccSaleXsfhmxWms : wmsFlag) { + param.setOrderType("閿�鍞��璐�"); + detlDto = new DetlDto(); + detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm()); + detlDto.setAnfme(nccSaleXsfhmxWms.getNastnum().doubleValue()); + detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm()); + detlDto.setLineNumber(i); + detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms)); + orderDetails.add(detlDto); + log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms)); + i++; + nccSaleXsfhmxWms.setWmsFlag(1); + param.setOrderNo(nccSaleXsfhmxWms.getVbillcode()); + } + param.setOrderDetails(orderDetails); + openService.pakinOrderCreate(param); + nccSaleXsfhmxWmsService.updateBatchById(wmsFlag); + } catch (Exception e) { + e.printStackTrace(); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return FAIL.setMsg(e.getMessage()); } return SUCCESS; -- Gitblit v1.9.1