From ca407c5f07e8692f670da1f520843cafa18cc6bf Mon Sep 17 00:00:00 2001 From: ljw Date: Mon, 29 Dec 2025 16:04:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dispose/wh/pojo/entity/InOrderEntity.java | 6 +----- .../wh/pojo/entity/OutOrderEntity.java | 6 +----- .../wh/pojo/entity/PurchaseOrderEntity.java | 10 +++++++++ .../wh/pojo/entity/SalesOrderEntity.java | 10 +++++++++ .../wh/pojo/param/AddInOrderParam.java | 17 --------------- .../wh/pojo/param/AddOutOrderParam.java | 6 +----- .../wh/pojo/param/AddSalesOrderParam.java | 10 +++++++++ .../wh/pojo/param/SearchInOrderParam.java | 6 +----- .../wh/pojo/param/SearchOutOrderParam.java | 5 ----- .../wh/pojo/result/SearchInOrderResult.java | 6 +----- .../wh/pojo/result/SearchOutOrderResult.java | 6 +----- .../dispose/wh/service/InOrderService.java | 21 +++++++++++++++++-- .../dispose/wh/service/OutOrderService.java | 2 -- .../wh/service/PurchaseOrderService.java | 1 + .../dispose/wh/service/SalesOrderService.java | 1 + .../resources/mapper/wh/InOrderMapper.xml | 1 - .../resources/mapper/wh/OutOrderMapper.xml | 1 - 17 files changed, 57 insertions(+), 58 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/InOrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/InOrderEntity.java index 9c0207e..2c4e537 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/InOrderEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/InOrderEntity.java @@ -10,6 +10,7 @@ import java.time.LocalDateTime; /** * 入库单 + * @author ljw */ @Getter @Setter @@ -49,11 +50,6 @@ public class InOrderEntity { */ private LocalDateTime inTime; - /** - * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 - */ - private String orderCategory; - /** * 采购单 Id；wh_purchase_order.id */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/OutOrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/OutOrderEntity.java index 88b4129..5a9b7a3 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/OutOrderEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/OutOrderEntity.java @@ -10,6 +10,7 @@ import java.time.LocalDateTime; /** * 出库单 + * @author ljw */ @Getter @Setter @@ -49,11 +50,6 @@ public class OutOrderEntity { */ private LocalDateTime outTime; - /** - * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 - */ - private String orderCategory; - /** * 销售单 Id；wh_sales_order.id */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/PurchaseOrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/PurchaseOrderEntity.java index 21b9d7b..55c9d8f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/PurchaseOrderEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/PurchaseOrderEntity.java @@ -28,6 +28,16 @@ public class PurchaseOrderEntity { @TableId(type = IdType.ASSIGN_ID) private Long id; + /** + * 预约单id + */ + private Long orderId; + + /** + * 运输信息id + */ + private Long orderTransId; + /** * 编号 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/SalesOrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/SalesOrderEntity.java index 450efa4..6206875 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/SalesOrderEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/SalesOrderEntity.java @@ -28,6 +28,16 @@ public class SalesOrderEntity { @TableId(type = IdType.ASSIGN_ID) private Long id; + /** + * 预约单id + */ + private Long orderId; + + /** + * 运输信息id + */ + private Long orderTransId; + /** * 编号 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddInOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddInOrderParam.java index 2644932..f345d40 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddInOrderParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddInOrderParam.java @@ -5,8 +5,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -import java.time.LocalDateTime; - /** * 入库单 * @@ -18,11 +16,6 @@ import java.time.LocalDateTime; @Accessors(chain = true) public class AddInOrderParam { - /** - * 编号 - */ - private String sn; - /** * 责任人 Id；sys_user.id */ @@ -38,16 +31,6 @@ public class AddInOrderParam { */ private String location; - /** - * 入库时间 - */ - private LocalDateTime inTime; - - /** - * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 - */ - private String orderCategory; - /** * 采购单 Id；wh_purchase_order.id */ 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 db081b3..be67610 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 @@ -9,6 +9,7 @@ import java.time.LocalDateTime; /** * 出库单 + * @author ljw */ @Getter @Setter @@ -40,11 +41,6 @@ public class AddOutOrderParam { */ private LocalDateTime outTime; - /** - * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 - */ - private String orderCategory; - /** * 销售单 Id；wh_sales_order.id */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddSalesOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddSalesOrderParam.java index 50053c9..df90f79 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddSalesOrderParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddSalesOrderParam.java @@ -24,6 +24,16 @@ public class AddSalesOrderParam { */ private String sn; + /** + * 预约单id + */ + private Long orderId; + + /** + * 运输信息id + */ + private Long orderTransId; + /** * 状态，JinXingZhong-->进行中、YiFaHuo-->已发货、YiChuKu-->已出库、YiQuXiao-->已取消 */ 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 e294343..dddaaf8 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 @Setter @@ -28,10 +29,5 @@ public class SearchInOrderParam { */ private Long goodsId; - /** - * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 - */ - private String orderCategory; - 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 e67b5b6..8d85871 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 @@ -29,10 +29,5 @@ public class SearchOutOrderParam { */ private Long goodsId; - /** - * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 - */ - private String orderCategory; - 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 0305e58..962186a 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 @Setter @@ -49,11 +50,6 @@ public class SearchInOrderResult { */ private LocalDateTime inTime; - /** - * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 - */ - private String orderCategory; - /** * 采购单 Id；wh_purchase_order.id */ 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 8d78e0c..aeaed4c 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 @@ -11,6 +11,7 @@ import java.time.LocalDateTime; /** * 出库单 + * @author ljw */ @Getter @Setter @@ -49,11 +50,6 @@ public class SearchOutOrderResult { */ private LocalDateTime outTime; - /** - * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 - */ - private String orderCategory; - /** * 销售单 Id；wh_sales_order.id */ 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 3afb0b5..95a7df4 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 @@ -6,6 +6,7 @@ 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.InOrderMapper; import com.njzscloud.dispose.wh.pojo.entity.InOrderEntity; import com.njzscloud.dispose.wh.pojo.param.AddInOrderParam; @@ -16,10 +17,12 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.List; /** * 入库单 + * * @author ljw */ @Slf4j @@ -33,6 +36,8 @@ public class InOrderService extends ServiceImpl { @Transactional(rollbackFor = Exception.class) public void add(AddInOrderParam addInOrderParam) { InOrderEntity entity = BeanUtil.copyProperties(addInOrderParam, InOrderEntity.class); + entity.setSn(this.generateSn()); + entity.setInTime(LocalDateTime.now()); this.save(entity); } @@ -65,14 +70,12 @@ public class InOrderService extends ServiceImpl { String sn = searchInOrderParam.getSn(); Long warehouseId = searchInOrderParam.getWarehouseId(); Long goodsId = searchInOrderParam.getGoodsId(); - String orderCategory = searchInOrderParam.getOrderCategory(); String keywords = searchInOrderParam.getKeywords(); 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) - .eq(StrUtil.isNotBlank(orderCategory), "a.order_category", orderCategory) .and(StrUtil.isNotBlank(keywords), it -> it .like("a.location", keywords) .or().like("a.order_sn", keywords) @@ -82,4 +85,18 @@ public class InOrderService extends ServiceImpl { ) )); } + + /** + * 生成入库单号 + * + * @return sn 入库单号 + */ + public String generateSn() { + String sn = SnUtil.next("In-Order-SN"); + if (this.exists(Wrappers.lambdaQuery().eq(InOrderEntity::getSn, sn) + .eq(InOrderEntity::getDeleted, Boolean.FALSE))) { + this.generateSn(); + } + return sn; + } } 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 29a51a3..b7ca497 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 @@ -66,14 +66,12 @@ public class OutOrderService extends ServiceImpl String sn = searchOutOrderParam.getSn(); Long warehouseId = searchOutOrderParam.getWarehouseId(); Long goodsId = searchOutOrderParam.getGoodsId(); - String orderCategory = searchOutOrderParam.getOrderCategory(); String keywords = searchOutOrderParam.getKeywords(); 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) - .eq(StrUtil.isNotBlank(orderCategory), "a.order_category", orderCategory) .and(StrUtil.isNotBlank(keywords), it -> it .like("a.location", keywords) .or().like("a.order_sn", keywords) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/PurchaseOrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/PurchaseOrderService.java index 88105a6..ddb5570 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/PurchaseOrderService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/PurchaseOrderService.java @@ -45,6 +45,7 @@ public class PurchaseOrderService extends ServiceImpl