From c6a8939de5c7b49d211bea05f31d43ea29e31d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com> Date: Fri, 10 Oct 2025 07:37:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=EF=BC=9B=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8A=9F=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/controller/StockOutController.java | 13 +- .../model/entity/ErpStockOutItem.java | 9 +- .../service/OGoodsInventoryBatchService.java | 4 +- .../impl/OGoodsInventoryBatchServiceImpl.java | 9 ++ .../service/impl/ErpStockOutServiceImpl.java | 4 +- vue/src/api/wms/stockOut.js | 19 +-- vue/src/api/wms/stockOutEntryItemDetail.js | 88 ++++++------- .../shipping/stockup/warehouse/index.vue | 22 ++-- vue/src/views/stock/stockOut/index.vue | 124 +++++++++++++----- 9 files changed, 187 insertions(+), 105 deletions(-) diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java index 94253424..b8b34eac 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java @@ -12,6 +12,8 @@ import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.Date; + @AllArgsConstructor @RestController @RequestMapping("/stockOut") @@ -39,10 +41,19 @@ public class StockOutController extends BaseController { @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - ErpStockOut entry = stockOutService.getDetailAndItemById(id); return success(entry); } + @GetMapping(value = "/print/{id}") + public AjaxResult print(@PathVariable("id") Long id) + { + ErpStockOut out = new ErpStockOut(); + out.setId(id); + out.setPrintStatus(1); + out.setPrintTime(new Date()); + stockOutService.updateById(out); + return AjaxResult.success(); + } @PostMapping("/out") public AjaxResult out(@RequestBody StockOutItemRequest request) { diff --git a/core/model/src/main/java/cn/qihangerp/model/entity/ErpStockOutItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/ErpStockOutItem.java index ec00deda..04267a04 100644 --- a/core/model/src/main/java/cn/qihangerp/model/entity/ErpStockOutItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/ErpStockOutItem.java @@ -2,8 +2,10 @@ package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; +import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; @@ -94,7 +96,10 @@ public class ErpStockOutItem implements Serializable { */ private Date updateTime; - - + /** + * 库存详情 + */ + @TableField(exist = false) + List inventoryBatchList; private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java index c81b041a..afe3a116 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java @@ -3,11 +3,13 @@ package cn.qihangerp.module.goods.service; import cn.qihangerp.model.entity.OGoodsInventoryBatch; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @author qilip * @description 针对表【o_goods_inventory_batch(商品库存批次)】的数据库操作Service * @createDate 2024-09-23 22:39:50 */ public interface OGoodsInventoryBatchService extends IService { - + List selectGoodsInventoryBatchBySpecId(Long specId); } diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java index f2d672a0..766cbd16 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java @@ -1,20 +1,29 @@ package cn.qihangerp.module.goods.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.model.entity.OGoodsInventoryBatch; import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author qilip * @description 针对表【o_goods_inventory_batch(商品库存批次)】的数据库操作Service实现 * @createDate 2024-09-23 22:39:50 */ +@AllArgsConstructor @Service public class OGoodsInventoryBatchServiceImpl extends ServiceImpl implements OGoodsInventoryBatchService{ + @Override + public List selectGoodsInventoryBatchBySpecId(Long specId) { + return this.baseMapper.selectList(new LambdaQueryWrapper().eq(OGoodsInventoryBatch::getSkuId, specId)); + } } diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java index 935cea4a..6b61c983 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java @@ -141,8 +141,8 @@ public class ErpStockOutServiceImpl extends ServiceImpl erpGoodsInventoryBatches = goodsInventoryBatchService.querySkuBatchList(item.getSkuId()); -// item.setInventoryBatchList(erpGoodsInventoryBatches); + List erpGoodsInventoryBatches = goodsInventoryBatchService.selectGoodsInventoryBatchBySpecId(item.getSpecId()); + item.setInventoryBatchList(erpGoodsInventoryBatches); } } diff --git a/vue/src/api/wms/stockOut.js b/vue/src/api/wms/stockOut.js index 0fc6a8b1..fadd79ed 100644 --- a/vue/src/api/wms/stockOut.js +++ b/vue/src/api/wms/stockOut.js @@ -12,24 +12,27 @@ export function listStockOut(query) { // 查询出库单详细 export function getStockOutEntry(id) { return request({ - url: '/wms/stockOutEntry/' + id, + url: '/api/oms-api/stockOut/' + id, method: 'get' }) } -export function getStockOutEntryItem(id) { - return request({ - url: '/wms/stockOutEntry/item/' + id, - method: 'get' - }) -} + // 出库 export function stockOut(data) { return request({ - url: '/wms/stockOutEntry/stockOut', + url: '/api/oms-api/stockOut/out', method: 'post', data: data }) } +// 打印 +export function stockOutPrint(id) { + return request({ + url: '/api/oms-api/stockOut/print/'+id, + method: 'get' + }) +} + diff --git a/vue/src/api/wms/stockOutEntryItemDetail.js b/vue/src/api/wms/stockOutEntryItemDetail.js index b36782c3..8ce7153b 100644 --- a/vue/src/api/wms/stockOutEntryItemDetail.js +++ b/vue/src/api/wms/stockOutEntryItemDetail.js @@ -1,44 +1,44 @@ -import request from '@/utils/request' - -// 查询出库明细详情列表 -export function listStockOutEntryItemDetail(query) { - return request({ - url: '/wms/stockOutEntryItemDetail/list', - method: 'get', - params: query - }) -} - -// 查询出库明细详情详细 -export function getStockOutEntryItemDetail(id) { - return request({ - url: '/wms/stockOutEntryItemDetail/' + id, - method: 'get' - }) -} - -// 新增出库明细详情 -export function addStockOutEntryItemDetail(data) { - return request({ - url: '/wms/stockOutEntryItemDetail', - method: 'post', - data: data - }) -} - -// 修改出库明细详情 -export function updateStockOutEntryItemDetail(data) { - return request({ - url: '/wms/stockOutEntryItemDetail', - method: 'put', - data: data - }) -} - -// 删除出库明细详情 -export function delStockOutEntryItemDetail(id) { - return request({ - url: '/wms/stockOutEntryItemDetail/' + id, - method: 'delete' - }) -} +// import request from '@/utils/request' +// +// // 查询出库明细详情列表 +// export function listStockOutEntryItemDetail(query) { +// return request({ +// url: '/wms/stockOutEntryItemDetail/list', +// method: 'get', +// params: query +// }) +// } +// +// // 查询出库明细详情详细 +// export function getStockOutEntryItemDetail(id) { +// return request({ +// url: '/wms/stockOutEntryItemDetail/' + id, +// method: 'get' +// }) +// } +// +// // 新增出库明细详情 +// export function addStockOutEntryItemDetail(data) { +// return request({ +// url: '/wms/stockOutEntryItemDetail', +// method: 'post', +// data: data +// }) +// } +// +// // 修改出库明细详情 +// export function updateStockOutEntryItemDetail(data) { +// return request({ +// url: '/wms/stockOutEntryItemDetail', +// method: 'put', +// data: data +// }) +// } +// +// // 删除出库明细详情 +// export function delStockOutEntryItemDetail(id) { +// return request({ +// url: '/wms/stockOutEntryItemDetail/' + id, +// method: 'delete' +// }) +// } diff --git a/vue/src/views/shipping/stockup/warehouse/index.vue b/vue/src/views/shipping/stockup/warehouse/index.vue index 6a0b5061..a5684171 100644 --- a/vue/src/views/shipping/stockup/warehouse/index.vue +++ b/vue/src/views/shipping/stockup/warehouse/index.vue @@ -82,21 +82,21 @@ - - 打印备货单 + + + + + + + + + - + - +