huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重构备货功能

This commit is contained in:
Richie 2025-05-23 22:16:31 +08:00
parent 31f3bd03ca
commit 248755fa84
9 changed files with 141 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java
View File

@ -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<ErpShipmentItem> list = shippingItemService.queryPageList(bo, pageQuery);
// return getDataTable(list);
// bo.setShipper(1);
// bo.setTenantId(getUserId());
// PageResult<ErpShipment> 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);
// }
//}
}

6
module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java
View File

@ -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<OShipStockUpItem> {
PageResult<OShipStockUpItem> queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery);
PageResult<OShipStockUpItem> querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery);
}

6
module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java
View File

@ -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<OShipStockUp> {
PageResult<OShipStockUp> querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery);
}

30
module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java
View File

@ -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<OShipStockUpItemMapper, OShipStockUpItem>
implements OShipStockUpItemService{
@Override
public PageResult<OShipStockUpItem> queryWarehousePageList(ShipStockUpBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OShipStockUpItem> queryWrapper = new LambdaQueryWrapper<OShipStockUpItem>()
.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<OShipStockUpItem> pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper);
return PageResult.build(pages);
}
@Override
public PageResult<OShipStockUpItem> querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OShipStockUpItem> queryWrapper = new LambdaQueryWrapper<OShipStockUpItem>()
.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<OShipStockUpItem> pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper);
return PageResult.build(pages);
}
}

19
module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java
View File

@ -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<OShipStockUpMapper, OShipStockUp>
implements OShipStockUpService{
@Override
public PageResult<OShipStockUp> querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OShipStockUp> queryWrapper = new LambdaQueryWrapper<OShipStockUp>()
.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<OShipStockUp> pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper);
return PageResult.build(pages);
}
}

19
vue/src/api/shipping/shipping.js
View File

@ -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({

5
vue/src/views/shipping/stockup/supplier/index.vue
View File

@ -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;

4
vue/src/views/shipping/stockup/warehouse/order_item_list.vue
View File

@ -206,7 +206,7 @@
</template>
<script>
import {listShipStockup, orderItemSpecIdUpdate,shipStockupComplete} from "@/api/shipping/shipping";
import {listShipStockupWarehouse, orderItemSpecIdUpdate,shipStockupComplete} from "@/api/shipping/shipping";
import { listShop } from "@/api/shop/shop";
export default {
name: "ShipStockupOrderItem",
@ -312,7 +312,7 @@ export default {
/** 查询仓库订单发货列表 */
getList() {
this.loading = true;
listShipStockup(this.queryParams).then(response => {
listShipStockupWarehouse(this.queryParams).then(response => {
this.shippingList = response.rows;
this.total = response.total;
this.loading = false;

4
vue/src/views/shipping/stockup/warehouse/order_list.vue
View File

@ -271,7 +271,7 @@
<script>
import {
listShipStockup,
listShipStockupWarehouse,
orderItemSpecIdUpdate,
shipStockupCompleteByOrder
} from "@/api/shipping/shipping";
@ -382,7 +382,7 @@ export default {
/** 查询仓库订单发货列表 */
getList() {
this.loading = true;
listShipStockup(this.queryParams).then(response => {
listShipStockupWarehouse(this.queryParams).then(response => {
this.shippingListOrigin = response.rows;
// this.shippingList = response.rows;
// this.total = response.total;