From ef8863ca1753c1193b2de7c388dbfcae1b07adc3 Mon Sep 17 00:00:00 2001 From: x_z Date: Sun, 26 Jun 2022 16:13:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E4=BB=93=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=202.=E5=A7=94=E6=89=98=E9=AA=8C=E6=94=B6=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=B7=BB=E5=8A=A0=E5=88=86=E4=BB=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/EntrustReceController.java | 10 ++--- .../controller/inout/WareHouseController.java | 6 ++- .../sale/admin/dao/basic/EntrustReceDao.java | 5 +-- .../dao/inventory/InvSubWarehouseDao.java | 8 ++++ ...eRespose.java => EntrustReceResponse.java} | 37 ++++++++++++++++++- .../service/basic/EntrustReceService.java | 6 +-- .../basic/impl/EntrustReceServiceImpl.java | 21 +++++++++-- .../mybatis/mapper/basic/EntrustReceDao.xml | 2 +- .../mapper/inventory/InvSubWarehouseDao.xml | 6 +++ 9 files changed, 80 insertions(+), 21 deletions(-) rename api-admin/src/main/java/com/glxp/sale/admin/res/basic/{EntrustReceRespose.java => EntrustReceResponse.java} (58%) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java index b78e293..0364b4e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java @@ -1,7 +1,6 @@ package com.glxp.sale.admin.controller.basic; //委托验收 -import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity; @@ -10,7 +9,7 @@ import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.res.PageSimpleResponse; -import com.glxp.sale.admin.res.basic.EntrustReceRespose; +import com.glxp.sale.admin.res.basic.EntrustReceResponse; import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.EntrustReceService; @@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -39,10 +37,10 @@ public class EntrustReceController { @GetMapping("/spms/entrust/rece/filter") public BaseResponse getEntrustRece(BasicEntrustRecRequest basicExportStatusRequest) { - List entrustReceEntities = entrustReceService.filterJoinEntrustRec(basicExportStatusRequest); - PageInfo pageInfo; + List entrustReceEntities = entrustReceService.filterJoinEntrustRec(basicExportStatusRequest); + PageInfo pageInfo; pageInfo = new PageInfo<>(entrustReceEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(entrustReceEntities); return ResultVOUtils.success(pageSimpleResponse); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index efd52bd..7d22743 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -278,9 +278,13 @@ public class WareHouseController { @AuthRuleAnnotation("") @GetMapping("warehouse/inout/submitOrderWeb") public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) { + if (null != orderEntity) { + if (StrUtil.isBlank(orderEntity.getInvWarehouseCode())) { + return ResultVOUtils.error(500, "分仓未选择"); + } + } orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS); return saveOrderWeb(orderEntity); -// return ResultVOUtils.success(); } @AuthRuleAnnotation("") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java index 998ae41..6c2a2c1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java @@ -1,10 +1,9 @@ package com.glxp.sale.admin.dao.basic; -import cn.hutool.core.collection.CollUtil; import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity; import com.glxp.sale.admin.entity.basic.EntrustReceEntity; import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; -import com.glxp.sale.admin.res.basic.EntrustReceRespose; +import com.glxp.sale.admin.res.basic.EntrustReceResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -16,7 +15,7 @@ public interface EntrustReceDao { List downloadEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); - List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); + List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); boolean insertEntrustRec(EntrustReceEntity ioOrderStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java index 4dd203b..3bf3578 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java @@ -36,4 +36,12 @@ public interface InvSubWarehouseDao { * @return */ int countByParentIdAndName(@Param("parentId") String parentId, @Param("name") String name); + + /** + * 根据编码查询名称 + * + * @param code + * @return + */ + String selectNameByCode(@Param("code") String code); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceResponse.java similarity index 58% rename from api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java rename to api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceResponse.java index d84895b..9acde29 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceResponse.java @@ -5,7 +5,7 @@ import lombok.Data; import java.util.Date; @Data -public class EntrustReceRespose { +public class EntrustReceResponse { private Integer id; private String action; private String entrustInv; @@ -16,14 +16,47 @@ public class EntrustReceRespose { private String remark; private boolean finishRece; private String curName; + private String entrustName; + + /** + * 委托验收人 + */ private String employeeName; + + /** + * 分库名称 + */ private String entrustInvName; + + /** + * 当前仓库编码 + */ private String curInv; - private String curInvName; + /** + * 当前仓库名称 + */ + private String curInvName; + /** + * 委托分库编码 + */ private String entrustSubInv; + + /** + * 当前分库编码 + */ private String invWarehouseCode; + /** + * 当前分库名称 + */ + private String invWarehouseName; + + /** + * 委托分库名称 + */ + private String entrustSubInvName; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/EntrustReceService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/EntrustReceService.java index 1f76b9b..e991472 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/EntrustReceService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/EntrustReceService.java @@ -1,11 +1,9 @@ package com.glxp.sale.admin.service.basic; -import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity; import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity; import com.glxp.sale.admin.entity.basic.EntrustReceEntity; import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; -import com.glxp.sale.admin.req.basic.BasicExportStatusRequest; -import com.glxp.sale.admin.res.basic.EntrustReceRespose; +import com.glxp.sale.admin.res.basic.EntrustReceResponse; import java.util.List; @@ -17,7 +15,7 @@ public interface EntrustReceService { List downloadEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); - List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); + List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); boolean insertEntrustRec(EntrustReceEntity entrustReceEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/EntrustReceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/EntrustReceServiceImpl.java index 376e7ac..2bfe424 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/EntrustReceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/EntrustReceServiceImpl.java @@ -3,11 +3,11 @@ package com.glxp.sale.admin.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.basic.EntrustReceDao; -import com.glxp.sale.admin.entity.basic.CorpImportLogEntity; +import com.glxp.sale.admin.dao.inventory.InvSubWarehouseDao; import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity; import com.glxp.sale.admin.entity.basic.EntrustReceEntity; import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; -import com.glxp.sale.admin.res.basic.EntrustReceRespose; +import com.glxp.sale.admin.res.basic.EntrustReceResponse; import com.glxp.sale.admin.service.basic.EntrustReceService; import org.springframework.stereotype.Service; @@ -20,6 +20,8 @@ public class EntrustReceServiceImpl implements EntrustReceService { @Resource EntrustReceDao entrustReceDao; + @Resource + private InvSubWarehouseDao invSubWarehouseDao; @Override public EntrustReceEntity findById(Integer id) { @@ -58,7 +60,7 @@ public class EntrustReceServiceImpl implements EntrustReceService { } @Override - public List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest) { + public List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest) { if (basicEntrustRecRequest == null) { return Collections.emptyList(); @@ -67,7 +69,18 @@ public class EntrustReceServiceImpl implements EntrustReceService { int offset = (basicEntrustRecRequest.getPage() - 1) * basicEntrustRecRequest.getLimit(); PageHelper.offsetPage(offset, basicEntrustRecRequest.getLimit()); } - return entrustReceDao.filterJoinEntrustRec(basicEntrustRecRequest); + List entrustReceResponses = entrustReceDao.filterJoinEntrustRec(basicEntrustRecRequest); + if (CollUtil.isNotEmpty(entrustReceResponses)) { + //查询当前分库名称和委托验收分库名称 + entrustReceResponses.forEach(entrustReceResponse -> { + String invWarehouseName = invSubWarehouseDao.selectNameByCode(entrustReceResponse.getInvWarehouseCode());//查询当前分库名称 + entrustReceResponse.setInvWarehouseName(invWarehouseName); + + String entrustSubInvName = invSubWarehouseDao.selectNameByCode(entrustReceResponse.getEntrustSubInv()); + entrustReceResponse.setEntrustSubInvName(entrustSubInvName); + }); + } + return entrustReceResponses; } @Override diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index d78094e..04a6578 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -65,7 +65,7 @@ select count(*) from inv_warehouse_sub where parentId = #{parentId} and name = #{name} + + \ No newline at end of file