From ef16874927c6f046462a068ea28ad969ee824ee8 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 14 Mar 2024 09:11:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E6=BD=AD=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/service/inout/IoAddInoutService.java | 2 +- .../glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 69e7464b8..1ec3fc720 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -300,7 +300,7 @@ public class IoAddInoutService { } if (StrUtil.isNotEmpty(errMsg)) { - return updateErrMsg(orderEntity, "未选择当前仓库信息"); + return updateErrMsg(orderEntity, errMsg); } orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index 09157e572..7d228a356 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -391,6 +391,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { ioOrderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);//草稿 ioOrderEntity.setCorpOrderId(billNo);//单据号 ioOrderEntity.setUpdateTime(new Date()); + ioOrderEntity.setCustomerId("110"); ioOrderEntity.setCreateTime(new Date()); Long userId = customerService.getUserId(); ioOrderEntity.setCreateUser(userId + ""); @@ -962,8 +963,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { BeanUtils.copyProperties(item, thrInvOrderDetail); thrInvOrderDetail.setOrderIdFk(billNo); thrInvOrderDetail.setRelId(sk.getRelId()); - - + thrInvOrderDetail.setSupId(sk.getSupId() + ""); Integer skCount = sk.getCount(); if (skCount != null && skCount > 0) { thrInvOrderDetail.setReCount(String.valueOf(skCount * finalCount));