From b6ef0496d7b4930bb96b5b986dab74241e44a77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 31 May 2023 15:36:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=8D=89=E7=A8=BF=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=88=9B=E5=BB=BA=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index b6301be71..38a9021cb 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -17,6 +17,7 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; +import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.http.sync.SpGetHttpClient; @@ -31,6 +32,7 @@ import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.PdaBusOrderResponse; import com.glxp.api.service.auth.InvBusUserService; import com.glxp.api.service.auth.InvWarehouseService; +import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; @@ -75,6 +77,8 @@ public class IoOrderController extends BaseController { IoAddInoutService ioAddInoutService; @Resource IoCheckInoutService ioCheckInoutService; + @Resource + BasicCorpService basicCorpService; /** * 查询单据列表 @@ -270,10 +274,27 @@ public class IoOrderController extends BaseController { IoOrderEntity orderEntity = new IoOrderEntity(); if (StrUtil.isEmpty(addOrderRequest.getAction())) return ResultVOUtils.error(500, "单据类型不能为空"); - orderEntity.setAction(addOrderRequest.getAction()); + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction()); + BasicCorpEntity basicCorpEntity = new BasicCorpEntity(); + //要是特殊往来信息没有就创建 + if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) { + basicCorpEntity = basicCorpService.selectByName(orderEntity.getFromCorp()); + if (basicCorpEntity == null) { + basicCorpEntity = new BasicCorpEntity(); + basicCorpEntity.setErpId(CustomUtil.getUnitId()); + basicCorpEntity.setCorpType(ConstantStatus.CORP_SICK); + basicCorpEntity.setOutType(ConstantStatus.CORP_SICK_SICK); + basicCorpEntity.setName(addOrderRequest.getFromCorp()); + basicCorpEntity.setId(IdUtil.getSnowflakeNextId()); + basicCorpService.insert(basicCorpEntity); + } + orderEntity.setFromCorp(basicCorpEntity.getErpId()); + }else { + orderEntity.setFromCorp(addOrderRequest.getFromCorp()); + } + orderEntity.setAction(addOrderRequest.getAction()); orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); - orderEntity.setFromCorp(addOrderRequest.getFromCorp()); orderEntity.setRemark(addOrderRequest.getRemark()); orderEntity.setFromInvCode(addOrderRequest.getFromInvCode()); orderEntity.setDeptCode(addOrderRequest.getDeptCode());