diff --git a/pom.xml b/pom.xml index 68cfee9..1ee5390 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,13 @@ 2.3.1 + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.7 + + com.alibaba easyexcel diff --git a/zi-wms-boot/src/main/resources/application.yml b/zi-wms-boot/src/main/resources/application.yml index b28bc9d..9889567 100644 --- a/zi-wms-boot/src/main/resources/application.yml +++ b/zi-wms-boot/src/main/resources/application.yml @@ -118,4 +118,8 @@ com: - GetAreaList - UserLogin - UserLogout - \ No newline at end of file +# application.yml +pagehelper: + helperDialect: oracle + reasonable: true + supportMethodsArguments: true diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java index 4fc0e26..55a23ee 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java @@ -3,6 +3,7 @@ package com.cim.idm.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.cim.idm.model.DeliveryDto; +import com.cim.idm.model.PageDto; import com.cim.idm.service.IDeliveryService; import com.cim.idm.utils.AjaxResult; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -29,4 +30,12 @@ public class DeliveryController { DeliveryDto dto = JSON.toJavaObject(in, DeliveryDto.class); return AjaxResult.me().setSuccess(true).setMessage(deliveryService.createDelivery(dto)); } + + /** + * 获取采购单 + */ + @PostMapping(value = "/getPurchase") + public AjaxResult getPurchase(@RequestBody PageDto in) { + return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getPurchase(in)); + } } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java b/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java index d69bde2..b005b09 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java @@ -1,5 +1,7 @@ package com.cim.idm.dao; +import com.cim.idm.model.MaterialReceiveRequest; +import com.cim.idm.model.PurchaseDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -23,4 +25,12 @@ public interface DeliveryDao { int bindDelivery(@Param("siteName") String siteName, @Param("receiveRequestName") String receiveRequestName, @Param("nameList") List nameList); + + /** + * 获取采购订单 + * @param dto 请求 + * @return 采购订单 + */ + List getPurchase(@Param("dto") PurchaseDto dto, + @Param("typeList") List typeList); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java new file mode 100644 index 0000000..c5570d2 --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java @@ -0,0 +1,11 @@ +package com.cim.idm.model; + +import lombok.Data; +import com.alibaba.fastjson.JSONObject; + +@Data +public class PageDto { + private Integer pageNum; + private Integer pageSize; + private JSONObject params; +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java new file mode 100644 index 0000000..521d9de --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java @@ -0,0 +1,12 @@ +package com.cim.idm.model; + +import lombok.Data; + +@Data +public class PurchaseDto { + // siteName + private String siteName; + + // 单号名称 + private String receiveRequestName; +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java index 68fcd59..0184213 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java @@ -1,6 +1,9 @@ package com.cim.idm.service; import com.cim.idm.model.DeliveryDto; +import com.cim.idm.model.MaterialReceiveRequest; +import com.cim.idm.model.PageDto; +import com.github.pagehelper.PageInfo; public interface IDeliveryService { /** @@ -9,4 +12,11 @@ public interface IDeliveryService { * @return 到货单 */ String createDelivery(DeliveryDto dto); + + /** + * 获取采购订单 + * @param dto 请求 + * @return 采购订单 + */ + PageInfo getPurchase(PageDto dto); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java index bbfa6c6..c9a6235 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java @@ -1,10 +1,16 @@ package com.cim.idm.service.Impl; +import com.alibaba.fastjson.JSON; import com.cim.idm.constants.ReceiveTypeEnums; import com.cim.idm.dao.DeliveryDao; import com.cim.idm.model.DeliveryDto; +import com.cim.idm.model.MaterialReceiveRequest; +import com.cim.idm.model.PageDto; +import com.cim.idm.model.PurchaseDto; import com.cim.idm.service.IDeliveryService; import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey; +import com.github.pagehelper.PageInfo; +import com.github.pagehelper.page.PageMethod; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,4 +38,11 @@ public class DeliveryServiceImpl implements IDeliveryService { deliveryDao.bindDelivery(dto.getSiteName(), dto.getReceiveRequestName(), collect); return "更新成功"; } + + @Override + public PageInfo getPurchase(PageDto dto) { + PageMethod.startPage(dto.getPageNum(), dto.getPageSize()); + PurchaseDto purchaseDto = JSON.toJavaObject(dto.getParams(), PurchaseDto.class); + return new PageInfo<>(deliveryDao.getPurchase(purchaseDto, ReceiveTypeEnums.getPurchase())); + } } diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml index 0a5c9f6..fd88341 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml @@ -15,4 +15,16 @@ #{name} + + \ No newline at end of file