From 344981d0bc9798dce786b07760d89d2467a85457 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 14 Jul 2022 10:38:00 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=90=8E=E7=AB=AF=E8=BF=94=E5=9B=9E=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=EF=BC=8C?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrScOrderController.java | 48 +++++++++++++++++++ .../api/admin/dao/basic/UnitMaintainDao.java | 3 ++ .../admin/dao/inventory/InvWarehouseDao.java | 3 ++ .../entity/business/StockOrderEntity.java | 3 ++ .../api/admin/entity/inout/OrderEntity.java | 5 ++ .../entity/thrsys/ThrPostOrderRequest.java | 38 +++++++++++++++ .../mybatis/mapper/basic/UnitMaintainDao.xml | 7 +++ .../mybatis/mapper/inout/OrderDao.xml | 24 +++++----- .../mapper/inventory/InvWarehouseDao.xml | 7 +++ 9 files changed, 126 insertions(+), 12 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java new file mode 100644 index 00000000..bdeec74a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java @@ -0,0 +1,48 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.dao.basic.UnitMaintainDao; +import com.glxp.api.admin.dao.inventory.InvWarehouseDao; +import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.admin.entity.basic.BussinessTypeEntity; +import com.glxp.api.admin.entity.basic.UnitMaintainEntity; +import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.api.admin.entity.thrsys.ThrPostOrderRequest; +import com.glxp.api.admin.req.inout.AddOrderRequest; +import com.glxp.api.admin.req.inout.PostOrderRequest; +import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.admin.service.basic.BussinessOriginTypeService; +import com.glxp.api.admin.service.basic.UnitMaintainService; +import com.glxp.api.common.res.BaseResponse; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +public class ThrScOrderController { + + @Resource + BussinessOriginTypeService bussinessOriginTypeService; + @Resource + UnitMaintainDao unitMaintainDao; + @Resource + InvWarehouseDao invWarehouseDao; + + @AuthRuleAnnotation("") + @PostMapping("udiwms/inout/thridOrder/upload") + public BaseResponse saveOrderWeb(@RequestBody ThrPostOrderRequest thrPostOrderRequest) { +// BussinessTypeEntity bussinessTypeEntity = bussinessOriginTypeService.findSysByAction(thrPostOrderRequest.getBillType(), thrPostOrderRequest.getThirdIdSys()); + + BussinessOriginTypeResponse bussinessOriginTypeEntity = bussinessOriginTypeService.finByThirdAction(thrPostOrderRequest.getBillType()); + UnitMaintainEntity unitMaintainEntity = unitMaintainDao.selectByThirdSys(thrPostOrderRequest.getThirdIdSys(), thrPostOrderRequest.getFromCorpId()); + InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectByThirdSys(thrPostOrderRequest.getThirdIdSys(), thrPostOrderRequest.getInvCode()); + + PostOrderRequest postOrderRequest = new PostOrderRequest(); + + + + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java index 7a2edbd4..fd902ed1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java @@ -24,4 +24,7 @@ public interface UnitMaintainDao { * @return */ UnitMaintainEntity selectThirdInfoByErpId(@Param("erpId") String erpId); + + + UnitMaintainEntity selectByThirdSys(@Param("thirdIdSys") String thirdIdSys, @Param("thirdId") String thirdId); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvWarehouseDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvWarehouseDao.java index 94539754..3bd33731 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvWarehouseDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvWarehouseDao.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.dao.inventory; +import com.glxp.api.admin.entity.basic.UnitMaintainEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; import org.apache.ibatis.annotations.Param; @@ -46,4 +47,6 @@ public interface InvWarehouseDao { boolean updateTime(@Param("code") String code, @Param("updateTime") Date updateTime); + InvWarehouseEntity selectByThirdSys(@Param("thirdIdSys") String thirdIdSys, @Param("thirdId") String thirdId); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java index b30a57ad..7e150512 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java @@ -44,4 +44,7 @@ public class StockOrderEntity { private boolean entrustEnd; + private String billTypeName; + private String subInvName; + private String invName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java index 10a74b67..aa07e09d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java @@ -58,4 +58,9 @@ public class OrderEntity { private boolean syncOutChange; private String createTime; private String fromSubInvCode; + + + private String billTypeName; + private String subInvName; + private String invName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java new file mode 100644 index 00000000..6f1f7eb9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java @@ -0,0 +1,38 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +import java.util.List; + +@Data +public class ThrPostOrderRequest { + + private String thirdIdSys; + private String billType; //单据类型 + private Integer inOutType; //出入库类型：1：出，2：入； + private String orderId; //订单号 + private String fromCorpId; //往来单位ID + private String fromCorp; //往来单位名称 + private String actDate; //单据创建日期 + private String actor; //单据创建人名称 + private String actorId; //单据创建人ID， + private String invCode; //当前所在仓库号 + private String invName; //当前所在仓库名称 + private String subInvCode; //当前所在分库号 + private String subInvName; //当前所在分库名称 + private Integer status; //单据状态 + private List codeArray; + + @Data + public static class CodeDetailEntity { + private String code; //条码 + private String batchNo; //批次号 + private String produceDate; //生产日期 + private String expireDate; //失效日期 + private String serialNo; //序列号 + private Integer count; //扫码数量 + private String supId; //供应商ID + private String supName; //供应商名称 + + } +} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml index 4dde660f..cb933ae5 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml @@ -55,4 +55,11 @@ from basic_corp where erpId = #{erpId} + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index a3dc2e1b..377d6853 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -191,7 +191,8 @@ + select * + from inv_warehouse + where ${thirdIdSys} = #{thirdId} + \ No newline at end of file