From ad8281da8703b00350fdb0ac5f79e34f219ab640 Mon Sep 17 00:00:00 2001 From: ljw Date: Mon, 29 Dec 2025 17:04:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wh/pojo/param/AddOutOrderParam.java | 11 ---- .../wh/pojo/param/SearchInOrderParam.java | 18 ++++-- .../wh/pojo/param/SearchOutOrderParam.java | 17 ++++-- .../wh/pojo/result/SearchInOrderResult.java | 11 ++++ .../wh/pojo/result/SearchOutOrderResult.java | 10 ++++ .../dispose/wh/service/InOrderService.java | 43 ++++++++----- .../dispose/wh/service/OutOrderService.java | 60 ++++++++++++++----- .../resources/mapper/wh/InOrderMapper.xml | 11 +++- .../resources/mapper/wh/OutOrderMapper.xml | 58 +++++++++--------- 9 files changed, 153 insertions(+), 86 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddOutOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddOutOrderParam.java index be67610..aea947a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddOutOrderParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddOutOrderParam.java @@ -5,8 +5,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -import java.time.LocalDateTime; - /** * 出库单 * @author ljw @@ -16,10 +14,6 @@ import java.time.LocalDateTime; @ToString @Accessors(chain = true) public class AddOutOrderParam { - /** - * 编号 - */ - private String sn; /** * 责任人 Id；sys_user.id @@ -36,11 +30,6 @@ public class AddOutOrderParam { */ private String location; - /** - * 出库时间 - */ - private LocalDateTime outTime; - /** * 销售单 Id；wh_sales_order.id */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchInOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchInOrderParam.java index dddaaf8..3183efd 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchInOrderParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchInOrderParam.java @@ -7,6 +7,7 @@ import lombok.experimental.Accessors; /** * 入库单 + * * @author ljw */ @Getter @@ -14,20 +15,25 @@ import lombok.experimental.Accessors; @ToString @Accessors(chain = true) public class SearchInOrderParam { + /** - * 编号 + * 采购单号 + */ + private String orderSn; + + /** + * 入库编号 */ private String sn; /** - * 仓库 Id；wh_warehouse.id + * 仓库名称 */ - private Long warehouseId; + private String warehouseName; /** - * 产品 Id + * 产品名称 */ - private Long goodsId; + private String goodsName; - private String keywords; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchOutOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchOutOrderParam.java index 8d85871..712e87b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchOutOrderParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchOutOrderParam.java @@ -14,20 +14,25 @@ import lombok.experimental.Accessors; @ToString @Accessors(chain = true) public class SearchOutOrderParam { + /** - * 编号 + * 出库单号 + */ + private String orderSn; + + /** + * 出库编号 */ private String sn; /** - * 仓库 Id；wh_warehouse.id + * 仓库名称 */ - private Long warehouseId; + private String warehouseName; /** - * 产品 Id + * 产品名称 */ - private Long goodsId; + private String goodsName; - private String keywords; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchInOrderResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchInOrderResult.java index 962186a..f467557 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchInOrderResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchInOrderResult.java @@ -11,6 +11,7 @@ import java.time.LocalDateTime; /** * 入库单 + * * @author ljw */ @Getter @@ -35,11 +36,21 @@ public class SearchInOrderResult { */ private Long responsibleId; + /** + * 责任人名称 + */ + private String nickname; + /** * 仓库 Id；wh_warehouse.id */ private Long warehouseId; + /** + * 仓库名称 + */ + private String warehouseName; + /** * 存放位置 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchOutOrderResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchOutOrderResult.java index aeaed4c..c3294a7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchOutOrderResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchOutOrderResult.java @@ -35,11 +35,21 @@ public class SearchOutOrderResult { */ private Long responsibleId; + /** + * 责任人名称 + */ + private String nickname; + /** * 仓库 Id；wh_warehouse.id */ private Long warehouseId; + /** + * 仓库名称 + */ + private String warehouseName; + /** * 存放位置 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/InOrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/InOrderService.java index 95a7df4..43ec150 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/InOrderService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/InOrderService.java @@ -8,7 +8,9 @@ import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.common.sn.support.SnUtil; import com.njzscloud.dispose.wh.mapper.InOrderMapper; +import com.njzscloud.dispose.wh.mapper.InventoryMapper; import com.njzscloud.dispose.wh.pojo.entity.InOrderEntity; +import com.njzscloud.dispose.wh.pojo.entity.InventoryEntity; import com.njzscloud.dispose.wh.pojo.param.AddInOrderParam; import com.njzscloud.dispose.wh.pojo.param.SearchInOrderParam; import com.njzscloud.dispose.wh.pojo.result.SearchInOrderResult; @@ -30,6 +32,8 @@ import java.util.List; @RequiredArgsConstructor public class InOrderService extends ServiceImpl { + private final InventoryMapper inventoryMapper; + /** * 新增 */ @@ -39,6 +43,23 @@ public class InOrderService extends ServiceImpl { entity.setSn(this.generateSn()); entity.setInTime(LocalDateTime.now()); this.save(entity); + + // 更新库存信息 + InventoryEntity inventory = inventoryMapper.selectOne(Wrappers.lambdaQuery() + .eq(InventoryEntity::getGoodsId, entity.getGoodsId()) + .eq(InventoryEntity::getWarehouseId, entity.getWarehouseId()) + .eq(InventoryEntity::getDeleted, Boolean.FALSE)); + + if (inventory != null) { + // 更新当前库存数量 + inventory.setStockQuantity(inventory.getStockQuantity() + entity.getQuantity()); + // 计算剩余量 = 总量 - 当前库存数量 + inventory.setRemainingQuantity(inventory.getTotalQuantity() - inventory.getStockQuantity()); + inventoryMapper.updateById(inventory); + } else { + log.info("通过仓库id: {}和产品id: {}未查询到库存信息，无法处理库存", entity.getWarehouseId(), entity.getGoodsId()); + } + } /** @@ -66,23 +87,13 @@ public class InOrderService extends ServiceImpl { /** * 分页查询 */ - public PageResult paging(PageParam pageParam, SearchInOrderParam searchInOrderParam) { - String sn = searchInOrderParam.getSn(); - Long warehouseId = searchInOrderParam.getWarehouseId(); - Long goodsId = searchInOrderParam.getGoodsId(); - String keywords = searchInOrderParam.getKeywords(); + public PageResult paging(PageParam pageParam, SearchInOrderParam param) { return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query() - .eq("a.deleted", 0) - .eq(StrUtil.isNotBlank(sn), "a.sn", sn) - .eq(warehouseId != null, "a.warehouse_id", warehouseId) - .eq(goodsId != null, "a.goods_id", goodsId) - .and(StrUtil.isNotBlank(keywords), it -> it - .like("a.location", keywords) - .or().like("a.order_sn", keywords) - .or().like("a.goods_name", keywords) - .or().like("a.good_sn", keywords) - .or().like("a.memo", keywords) - ) + .eq("wio.deleted", 0) + .eq(StrUtil.isNotBlank(param.getSn()), "wio.sn", param.getSn()) + .eq(StrUtil.isNotBlank(param.getOrderSn()), "wio.order_sn", param.getOrderSn()) + .eq(StrUtil.isNotBlank(param.getWarehouseName()), "ww.warehouse_name", param.getWarehouseName()) + .eq(StrUtil.isNotBlank(param.getGoodsName()), "wio.goods_name", param.getGoodsName()) )); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/OutOrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/OutOrderService.java index b7ca497..d175a69 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/OutOrderService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/OutOrderService.java @@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.common.sn.support.SnUtil; +import com.njzscloud.dispose.wh.mapper.InventoryMapper; import com.njzscloud.dispose.wh.mapper.OutOrderMapper; +import com.njzscloud.dispose.wh.pojo.entity.InventoryEntity; import com.njzscloud.dispose.wh.pojo.entity.OutOrderEntity; import com.njzscloud.dispose.wh.pojo.param.AddOutOrderParam; import com.njzscloud.dispose.wh.pojo.param.SearchOutOrderParam; @@ -16,6 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.List; /** @@ -28,13 +32,33 @@ import java.util.List; @RequiredArgsConstructor public class OutOrderService extends ServiceImpl { + private final InventoryMapper inventoryMapper; + /** * 新增 */ @Transactional(rollbackFor = Exception.class) public void add(AddOutOrderParam addOutOrderParam) { OutOrderEntity entity = BeanUtil.copyProperties(addOutOrderParam, OutOrderEntity.class); + entity.setSn(this.generateSn()); + entity.setOutTime(LocalDateTime.now()); this.save(entity); + + // 更新库存信息 + InventoryEntity inventory = inventoryMapper.selectOne(Wrappers.lambdaQuery() + .eq(InventoryEntity::getGoodsId, entity.getGoodsId()) + .eq(InventoryEntity::getWarehouseId, entity.getWarehouseId()) + .eq(InventoryEntity::getDeleted, Boolean.FALSE)); + + if (inventory != null) { + // 更新当前库存数量 + inventory.setStockQuantity(inventory.getStockQuantity() - entity.getQuantity()); + // 计算剩余量 = 总量 - 当前库存数量 + inventory.setRemainingQuantity(inventory.getTotalQuantity() - inventory.getStockQuantity()); + inventoryMapper.updateById(inventory); + } else { + log.info("通过仓库id: {}和产品id: {}未查询到库存信息，无法处理库存", entity.getWarehouseId(), entity.getGoodsId()); + } } /** @@ -62,24 +86,28 @@ public class OutOrderService extends ServiceImpl /** * 分页查询 */ - public PageResult paging(PageParam pageParam, SearchOutOrderParam searchOutOrderParam) { - String sn = searchOutOrderParam.getSn(); - Long warehouseId = searchOutOrderParam.getWarehouseId(); - Long goodsId = searchOutOrderParam.getGoodsId(); - String keywords = searchOutOrderParam.getKeywords(); + public PageResult paging(PageParam pageParam, SearchOutOrderParam param) { return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query() - .eq("a.deleted", 0) - .eq(StrUtil.isNotBlank(sn), "a.sn", sn) - .eq(warehouseId != null, "a.warehouse_id", warehouseId) - .eq(goodsId != null, "a.goods_id", goodsId) - .and(StrUtil.isNotBlank(keywords), it -> it - .like("a.location", keywords) - .or().like("a.order_sn", keywords) - .or().like("a.goods_name", keywords) - .or().like("a.good_sn", keywords) - .or().like("a.memo", keywords) - ) + .eq("woo.deleted", 0) + .eq(StrUtil.isNotBlank(param.getSn()), "woo.sn", param.getSn()) + .eq(StrUtil.isNotBlank(param.getOrderSn()), "woo.order_sn", param.getOrderSn()) + .eq(StrUtil.isNotBlank(param.getWarehouseName()), "ww.warehouse_name", param.getWarehouseName()) + .eq(StrUtil.isNotBlank(param.getGoodsName()), "woo.goods_name", param.getGoodsName()) )); } + /** + * 生成入库单号 + * + * @return sn 入库单号 + */ + public String generateSn() { + String sn = SnUtil.next("In-Order-SN"); + if (this.exists(Wrappers.lambdaQuery().eq(OutOrderEntity::getSn, sn) + .eq(OutOrderEntity::getDeleted, Boolean.FALSE))) { + this.generateSn(); + } + return sn; + } + } diff --git a/njzscloud-svr/src/main/resources/mapper/wh/InOrderMapper.xml b/njzscloud-svr/src/main/resources/mapper/wh/InOrderMapper.xml index 30e018b..1ddba77 100644 --- a/njzscloud-svr/src/main/resources/mapper/wh/InOrderMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/wh/InOrderMapper.xml @@ -5,10 +5,11 @@ + + - @@ -30,7 +31,9 @@ wio.id AS id, wio.sn AS sn, wio.responsible_id AS responsible_id, + su.nickname, wio.warehouse_id AS warehouse_id, + ww.warehouse_name, wio.location AS location, wio.in_time AS in_time, wio.order_id AS order_id, @@ -54,13 +57,17 @@ SELECT FROM wh_in_order wio + LEFT JOIN sys_user su ON su.id = wio.responsible_id + LEFT JOIN wh_warehouse ww ON ww.id = wio.warehouse_id WHERE wio.id = #{id} - - - ${ew.customSqlSegment} - - + + ${ew.customSqlSegment} +