From 248755fa8464172a0c8ebdae3af9806d25086ee4 Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Fri, 23 May 2025 22:16:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=A4=87=E8=B4=A7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShipStockupController.java | 93 ++++++++++++------- .../service/OShipStockUpItemService.java | 6 +- .../order/service/OShipStockUpService.java | 6 +- .../impl/OShipStockUpItemServiceImpl.java | 30 ++++++ .../service/impl/OShipStockUpServiceImpl.java | 19 ++++ vue/src/api/shipping/shipping.js | 19 +++- .../views/shipping/stockup/supplier/index.vue | 5 +- .../stockup/warehouse/order_item_list.vue | 4 +- .../shipping/stockup/warehouse/order_list.vue | 4 +- 9 files changed, 141 insertions(+), 45 deletions(-) diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java index 4805387c..51a4ed73 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java @@ -1,37 +1,60 @@ -//package cn.qihangerp.api.order.controller; -// -// -//import cn.qihangerp.common.AjaxResult; -//import cn.qihangerp.common.PageQuery; -//import cn.qihangerp.common.TableDataInfo; -//import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -//import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; -//import cn.qihangerp.module.order.service.OShipStockUpService; -//import cn.qihangerp.module.order.service.OShipWaybillService; -//import cn.qihangerp.security.common.BaseController; -//import lombok.AllArgsConstructor; -//import org.springframework.web.bind.annotation.*; -// -//@AllArgsConstructor -//@RestController -//@RequestMapping("/ship") -//public class ShipStockupController extends BaseController { -// private final OShipStockUpService shipStockUpService; -// private final OShipWaybillService shipWaybillService; -// -// /** -// * 备货列表 -// * @param bo -// * @param pageQuery -// * @return -// */ -// @GetMapping("/stock_up_list") -// public TableDataInfo stock_up_list(ShipStockUpBo bo, PageQuery pageQuery) -// { -// var pageList = shipStockUpService.queryPageList(bo,pageQuery); -// return getDataTable(pageList); -// } -// +package cn.qihangerp.api.order.controller; + + +import cn.qihangerp.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.TableDataInfo; +import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; +import cn.qihangerp.module.order.service.OShipStockUpItemService; +import cn.qihangerp.module.order.service.OShipStockUpService; +import cn.qihangerp.module.order.service.OShipWaybillService; +import cn.qihangerp.security.common.BaseController; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@AllArgsConstructor +@RestController +@RequestMapping("/ship") +public class ShipStockupController extends BaseController { + private final OShipStockUpService shipStockUpService; + private final OShipStockUpItemService shipStockUpItemService; + + /** + * 备货列表(仓库发货) + * @param bo + * @param pageQuery + * @return + */ + @GetMapping("/stock_up_list_by_warehouse") + public TableDataInfo stock_up_list(ShipStockUpBo bo, PageQuery pageQuery) + { + var pageList = shipStockUpItemService.queryWarehousePageList(bo,pageQuery); + return getDataTable(pageList); + } + + /** + * 备货中-供应商代发 + * @param bo + * @param pageQuery + * @return + */ + @GetMapping("/stock_up_list_by_supplier") + public TableDataInfo supplierShipList(ShipStockUpBo bo, PageQuery pageQuery) + { +// bo.setShipper(1); +// bo.setStockStatus(0); +// bo.setTenantId(getUserId()); +// PageResult list = shippingItemService.queryPageList(bo, pageQuery); +// return getDataTable(list); +// bo.setShipper(1); +// bo.setTenantId(getUserId()); +// PageResult erpShipmentPageResult = shippingService.queryPageList(bo, pageQuery); +// return getDataTable(erpShipmentPageResult); + var pageList = shipStockUpService.querySupplierPageList(bo,pageQuery); + return getDataTable(pageList); + } + // @PostMapping("/stock_up_complete") // public AjaxResult stock_up_complete(@RequestBody ShipStockUpCompleteBo bo) // { @@ -55,4 +78,4 @@ // //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry) // return toAjax(1); // } -//} +} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java index 53d9e6cd..9e56755d 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java @@ -1,6 +1,9 @@ package cn.qihangerp.module.order.service; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.module.order.domain.OShipStockUpItem; +import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -9,5 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @createDate 2025-05-23 21:43:16 */ public interface OShipStockUpItemService extends IService { - + PageResult queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery); + PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery); } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java index 19a65e15..cbe9deb3 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java @@ -1,6 +1,10 @@ package cn.qihangerp.module.order.service; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.module.order.domain.OShipStockUp; +import cn.qihangerp.module.order.domain.OShipStockUpItem; +import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -9,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService; * @createDate 2025-05-23 21:43:16 */ public interface OShipStockUpService extends IService { - + PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery); } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java index c7a0dd0a..ed08ee82 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java @@ -1,10 +1,16 @@ package cn.qihangerp.module.order.service.impl; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.module.order.domain.OShipStockUpItem; import cn.qihangerp.module.order.service.OShipStockUpItemService; import cn.qihangerp.module.order.mapper.OShipStockUpItemMapper; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; /** * @author qilip @@ -15,6 +21,30 @@ import org.springframework.stereotype.Service; public class OShipStockUpItemServiceImpl extends ServiceImpl implements OShipStockUpItemService{ + @Override + public PageResult queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(OShipStockUpItem::getShipper,0) + .eq(bo.getShopId()!=null,OShipStockUpItem::getShopId,bo.getShopId()) + .eq(bo.getStatus()!=null,OShipStockUpItem::getStatus,bo.getStatus()) + .eq(StringUtils.hasText(bo.getOrderNum()),OShipStockUpItem::getOrderNum,bo.getOrderNum()) + ; + Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } + @Override + public PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(OShipStockUpItem::getShipper,1) + .eq(bo.getShopId()!=null,OShipStockUpItem::getShopId,bo.getShopId()) + .eq(bo.getStatus()!=null,OShipStockUpItem::getStatus,bo.getStatus()) + .eq(StringUtils.hasText(bo.getOrderNum()),OShipStockUpItem::getOrderNum,bo.getOrderNum()) + ; + Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java index 7f773e52..ddca885e 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java @@ -1,10 +1,17 @@ package cn.qihangerp.module.order.service.impl; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.order.domain.OShipStockUpItem; +import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.module.order.domain.OShipStockUp; import cn.qihangerp.module.order.service.OShipStockUpService; import cn.qihangerp.module.order.mapper.OShipStockUpMapper; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; /** * @author qilip @@ -15,6 +22,18 @@ import org.springframework.stereotype.Service; public class OShipStockUpServiceImpl extends ServiceImpl implements OShipStockUpService{ + @Override + public PageResult querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(OShipStockUp::getShipper,1) + .eq(bo.getShopId()!=null,OShipStockUp::getShopId,bo.getShopId()) + .eq(bo.getStatus()!=null,OShipStockUp::getStatus,bo.getStatus()) + .eq(StringUtils.hasText(bo.getOrderNum()),OShipStockUp::getOrderNum,bo.getOrderNum()) + ; + Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } } diff --git a/vue/src/api/shipping/shipping.js b/vue/src/api/shipping/shipping.js index 216f7adc..4d57a57a 100644 --- a/vue/src/api/shipping/shipping.js +++ b/vue/src/api/shipping/shipping.js @@ -1,13 +1,26 @@ import request from '@/utils/request' -// 备货清单 -export function listShipStockup(query) { +// 备货清单-仓库发货 +export function listShipStockupWarehouse(query) { return request({ - url: '/api/oms-api/ship/stock_up_list', + url: '/api/oms-api/ship/stock_up_list_by_warehouse', method: 'get', params: query }) } + + +// 备货清单-供应商发货 +export function listShipStockupSupplier(query) { + return request({ + url: '/api/oms-api/ship/stock_up_list_by_supplier', + method: 'get', + params: query + }) +} + + + // 备货完成 export function shipStockupComplete(data) { return request({ diff --git a/vue/src/views/shipping/stockup/supplier/index.vue b/vue/src/views/shipping/stockup/supplier/index.vue index 636d7efe..0c8f09cd 100644 --- a/vue/src/views/shipping/stockup/supplier/index.vue +++ b/vue/src/views/shipping/stockup/supplier/index.vue @@ -289,6 +289,9 @@ import { listSupplier} from "@/api/scm/supplier"; import { listShop } from "@/api/shop/shop"; import {listLogistics, listLogisticsStatus} from "@/api/api/logistics"; +import { + listShipStockupSupplier +} from "@/api/shipping/shipping"; // import {listShippingSupplier, getShippingDetail, supplierAgentShipment} from "@/api/wms/shipping"; export default { name: "supplierShipment", @@ -365,7 +368,7 @@ export default { /** 查询供应商代发货列表 */ getList() { this.loading = true; - listShippingSupplier(this.queryParams).then(response => { + listShipStockupSupplier(this.queryParams).then(response => { this.agentShippingList = response.rows; console.log('=======',this.agentShippingList) this.total = response.total; diff --git a/vue/src/views/shipping/stockup/warehouse/order_item_list.vue b/vue/src/views/shipping/stockup/warehouse/order_item_list.vue index fa8c26a2..3e669e7d 100644 --- a/vue/src/views/shipping/stockup/warehouse/order_item_list.vue +++ b/vue/src/views/shipping/stockup/warehouse/order_item_list.vue @@ -206,7 +206,7 @@