From 999430aa526a1ff41eee049669e6035c26153377 Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Wed, 12 Jul 2023 09:59:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=80=E6=9D=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=AE=A2=E6=88=B7=E7=9A=84=E5=8C=BB=E7=96=97?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E4=B8=8D=E4=BC=9A=E6=98=BE=E7=A4=BA=E8=AF=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/basic/BasicCorpController.java | 4 ++-- .../java/com/glxp/api/controller/inout/IoOrderController.java | 1 + src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java | 2 ++ src/main/java/com/glxp/api/req/inout/AddOrderRequest.java | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index aada9dbca..a52b72484 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -127,9 +127,9 @@ public class BasicCorpController { BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); basicUnitMaintainEntity.setErpId(CustomUtil.getId()); if(basicUnitMaintainSaveRequest.getCorpType()==1){ - basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK); - }else{ basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); + }else{ + basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK); } basicUnitMaintainEntity.setUpdateTime(new Date()); basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId()); 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 c98143e4d..4d3b6066d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -265,6 +265,7 @@ public class IoOrderController extends BaseController { @PostMapping("warehouse/inout/saveOrderWeb") @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) { + System.out.println(addOrderRequest.toString()); IoOrderEntity orderEntity = new IoOrderEntity(); if (StrUtil.isEmpty(addOrderRequest.getAction())) return ResultVOUtils.error(500, "单据类型不能为空"); diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java index a073f5b2a..46403344b 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java @@ -50,6 +50,8 @@ public class IoCodeTempEntity { */ @TableField(value = "nameCode") private String nameCode; + private String fromCorpName; + private String fromName; /** * 批次号 diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index ad736bdca..c8ab40a79 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -10,6 +10,7 @@ public class AddOrderRequest { private String action; private String fromCorp; private String fromCorpName; + private String fromName; private String fromInvCode; private String deptCode; private String invCode;