From 3564a9bd2257f8db9d805ddbe56f0354b64dc652 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 09:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inout/IoChangeInoutService.java | 30 +++++++++---------- .../service/inout/IoCheckInoutService.java | 2 ++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 96c6213b..9aa37fe0 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -190,23 +190,25 @@ public class IoChangeInoutService { String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(targetBustypeEntity.getPrefix()), "yyyyMMdd")); outOrder.setBillNo(orderNo); - if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + if (bussinessChangeTypeEntity.getCreateType() == 1) {//送货至入库补单 outOrder.setCustomerId(corpName); outOrder.setFromCorp(corpName); outOrder.setFromInvCode(null); outOrder.setFromDeptCode(null); - } else if (targetBustypeEntity.getActionType() == 2) { - outOrder.setCustomerId(null); - outOrder.setFromCorp(null); - InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode("1000001"); - outOrder.setFromInvCode(invWarehouseEntity.getCode()); - outOrder.setFromDeptCode(invWarehouseEntity.getParentId()); - } else if (targetBustypeEntity.getActionType() == 3) { - outOrder.setCustomerId(null); - outOrder.setFromCorp(null); - InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode("1000002"); - outOrder.setFromInvCode(invWarehouseEntity.getCode()); - outOrder.setFromDeptCode(invWarehouseEntity.getParentId()); + } else if (bussinessChangeTypeEntity.getCreateType() == 3) { //寄售、预验收补单 + if (targetBustypeEntity.getActionType() == 2) { + outOrder.setCustomerId(null); + outOrder.setFromCorp(null); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode("1000001"); + outOrder.setFromInvCode(invWarehouseEntity.getCode()); + outOrder.setFromDeptCode(invWarehouseEntity.getParentId()); + } else if (targetBustypeEntity.getActionType() == 3) { + outOrder.setCustomerId(null); + outOrder.setFromCorp(null); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode("1000002"); + outOrder.setFromInvCode(invWarehouseEntity.getCode()); + outOrder.setFromDeptCode(invWarehouseEntity.getParentId()); + } } else { outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); InvWarehouseEntity curInv = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode()); @@ -227,9 +229,7 @@ public class IoChangeInoutService { InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode()); outOrder.setInvCode(invWarehouseEntity.getCode()); outOrder.setDeptCode(invWarehouseEntity.getParentId()); - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); - //互填单号 orderEntity.setUllageSupNo(outOrder.getBillNo()); orderEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 0b44e2f1..ef81f845 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -811,6 +811,8 @@ public class IoCheckInoutService { }); } + + //校验是否是不入库存单据 if (bussinessTypeEntity.isInStock()) { //生成库存