From e3dda6df25d822a918c863a66eb0d2daaf4ba4ef Mon Sep 17 00:00:00 2001 From: x_z Date: Sat, 24 Dec 2022 20:59:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E5=85=BB?= =?UTF-8?q?=E6=8A=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/WareHouseController.java | 2 +- .../inventory/DeviceMAOrderController.java | 7 ++++--- .../admin/dao/inventory/DeviceMAOrderDao.java | 3 ++- .../inventory/FilterDeviceMAOrderRequest.java | 5 +++++ .../res/inventory/DeviceMAOrderResponse.java | 17 +++++++++++++++++ .../service/inventory/DeviceMAOrderService.java | 3 ++- .../impl/DeviceMAOrderServiceImpl.java | 3 ++- .../mapper/inventory/DeviceMAOrderDao.xml | 17 ++++++++++------- 8 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderResponse.java diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 0f9ea0e5..304843c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -755,7 +755,7 @@ public class WareHouseController { return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); } } else { - int count = invProductDetailService.vailStockCount(code, addOrderRequest.getInvStorageCode(), addOrderRequest.getInvWarehouseCode(), null); + int count = invProductDetailService.vailStockCount(code, addOrderRequest.getLocStorageCode(), addOrderRequest.getInvWarehouseCode(), null); if (count <= 0) { return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); } else { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java index f20931b4..a1e0d8be 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java @@ -5,6 +5,7 @@ import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse; import com.glxp.api.admin.service.inventory.DeviceMAOrderService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -37,9 +38,9 @@ public class DeviceMAOrderController { */ @GetMapping("/device/MA/order/filterList") public BaseResponse filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest) { - List list = deviceMAOrderService.filterList(filterDeviceMAOrderRequest); - PageInfo pageInfo = new PageInfo<>(list); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + List list = deviceMAOrderService.filterList(filterDeviceMAOrderRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); return ResultVOUtils.success(pageSimpleResponse); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java index 3f90f8de..3e5c9fda 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java @@ -3,6 +3,7 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; +import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -22,5 +23,5 @@ public interface DeviceMAOrderDao { int updateByPrimaryKey(DeviceMAOrderEntity record); - List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest); + List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java index 6374bc40..4860bdde 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java @@ -26,4 +26,9 @@ public class FilterDeviceMAOrderRequest extends ListPageRequest { */ private Integer status; + /** + * 设备编号 + */ + private String code; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderResponse.java new file mode 100644 index 00000000..319fff17 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderResponse.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.res.inventory; + +import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; +import lombok.Data; + +/** + * 设备养护记录接口响应结果实体 + */ +@Data +public class DeviceMAOrderResponse extends DeviceMAOrderEntity { + + /** + * 设备编号 + */ + private String code; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java index 5f4fc68c..31fc59d5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java @@ -3,6 +3,7 @@ package com.glxp.api.admin.service.inventory; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; +import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; @@ -18,7 +19,7 @@ public interface DeviceMAOrderService { * @param filterDeviceMAOrderRequest * @return */ - List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest); + List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest); /** * 添加设备养护记录 diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java index 93d8de8d..b41b8eb7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; +import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse; import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.inventory.DeviceMAOrderService; import com.glxp.api.admin.util.DateUtil; @@ -44,7 +45,7 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService { private DeviceMaOrderDetailDao deviceMaOrderDetailDao; @Override - public List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest) { + public List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest) { if (null == filterDeviceMAOrderRequest) { return Collections.emptyList(); } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml index 4d402246..07f25032 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml @@ -149,19 +149,22 @@ where id = #{id,jdbcType=INTEGER} - + select dmo.*, dmod.code + from device_ma_order dmo + left join device_ma_order_detail dmod on dmo.orderId = dmod.orderIdFk - AND orderId like concat('%', #{orderId}, '%') + AND dmo.orderId like concat('%', #{orderId}, '%') - AND status = #{status} + AND dmo.status = #{status} - AND collOrderId like concat('%', #{collOrderId}, '%') + AND dmo.collOrderId like concat('%', #{collOrderId}, '%') + + + AND dmod.code like concat('%', #{code}, '%')