From 34713bc663a74be3870056253acae0152012be32 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Wed, 17 Jul 2024 17:26:12 +0800 Subject: [PATCH] fix erp --- .../stock/vo/record/ErpStockRecordPageReqVO.java | 3 +++ .../admin/stock/vo/record/ErpStockRecordRespVO.java | 7 ++++++- .../erp/dal/dataobject/stock/ErpStockRecordDO.java | 6 +++++- .../module/erp/dal/mysql/sale/ErpSaleOrderMapper.java | 11 +++++++---- .../erp/dal/mysql/stock/ErpStockRecordMapper.java | 1 + .../service/purchase/ErpPurchaseInServiceImpl.java | 4 +++- .../service/purchase/ErpPurchaseOrderServiceImpl.java | 4 ++-- .../purchase/ErpPurchaseReturnServiceImpl.java | 3 ++- .../erp/service/sale/ErpSaleOrderServiceImpl.java | 8 +++++--- .../erp/service/sale/ErpSaleOutServiceImpl.java | 2 +- .../erp/service/sale/ErpSaleReturnServiceImpl.java | 2 +- .../erp/service/stock/ErpStockCheckServiceImpl.java | 2 +- .../erp/service/stock/ErpStockInServiceImpl.java | 2 +- .../erp/service/stock/ErpStockMoveServiceImpl.java | 4 ++-- .../erp/service/stock/ErpStockOutServiceImpl.java | 2 +- .../service/stock/bo/ErpStockRecordCreateReqBO.java | 5 ++++- .../stockindetail/StockInDetailServiceImpl.java | 2 +- .../service/stockworkshop/MesStockInServiceImpl.java | 2 +- .../service/stockworkshop/MesStockOutServiceImpl.java | 2 +- .../src/main/resources/application-local.yaml | 2 +- 20 files changed, 49 insertions(+), 25 deletions(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordPageReqVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordPageReqVO.java index 0a00356978..1104c31b71 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordPageReqVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordPageReqVO.java @@ -34,4 +34,7 @@ public class ErpStockRecordPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "出入库时间", requiredMode = Schema.RequiredMode.REQUIRED) + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] recordTime; } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordRespVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordRespVO.java index ff4b3e12a1..5e466bb9eb 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordRespVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordRespVO.java @@ -83,5 +83,10 @@ public class ErpStockRecordRespVO { @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @ExcelProperty("创建人") private String creatorName; - + /** + * 出入库时间 + */ + @Schema(description = "出入库时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("出入库时间") + private LocalDateTime recordTime; } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockRecordDO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockRecordDO.java index 6e7351286e..6d7c4aa928 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockRecordDO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockRecordDO.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * ERP 产品库存明细 DO @@ -84,5 +85,8 @@ public class ErpStockRecordDO extends BaseDO { * 例如说：{@link ErpStockInDO#getNo()} */ private String bizNo; - + /** + * 出入库时间 + */ + private LocalDateTime recordTime; } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java index 8ed3b6fcd5..4a5609a7ca 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java @@ -34,7 +34,7 @@ public interface ErpSaleOrderMapper extends BaseMapperX { if (Objects.equals(reqVO.getOutStatus(), ErpSaleOrderPageReqVO.OUT_STATUS_NONE)) { query.eq(ErpSaleOrderDO::getOutCount, 0); } else if (Objects.equals(reqVO.getOutStatus(), ErpSaleOrderPageReqVO.OUT_STATUS_PART)) { - query.gt(ErpSaleOrderDO::getOutCount, 0).apply("t.out_count < t.total_count"); + query.gt(ErpSaleOrderDO::getOutCount, 0).apply("t.out_count <= t.total_count"); } else if (Objects.equals(reqVO.getOutStatus(), ErpSaleOrderPageReqVO.OUT_STATUS_ALL)) { query.apply("t.out_count = t.total_count"); } @@ -42,25 +42,28 @@ public interface ErpSaleOrderMapper extends BaseMapperX { if (Objects.equals(reqVO.getReturnStatus(), ErpSaleOrderPageReqVO.RETURN_STATUS_NONE)) { query.eq(ErpSaleOrderDO::getReturnCount, 0); } else if (Objects.equals(reqVO.getReturnStatus(), ErpSaleOrderPageReqVO.RETURN_STATUS_PART)) { - query.gt(ErpSaleOrderDO::getReturnCount, 0).apply("t.return_count < t.total_count"); + query.gt(ErpSaleOrderDO::getReturnCount, 0).apply("t.return_count <= t.total_count"); } else if (Objects.equals(reqVO.getReturnStatus(), ErpSaleOrderPageReqVO.RETURN_STATUS_ALL)) { query.apply("t.return_count = t.total_count"); } // 可销售出库 if (Boolean.TRUE.equals(reqVO.getOutEnable())) { query.eq(ErpSaleOrderDO::getStatus, ErpAuditStatus.APPROVE.getStatus()) - .apply("t.out_count < t.total_count"); + .apply("t.out_count <= t.total_count"); } // 可销售退货 if (Boolean.TRUE.equals(reqVO.getReturnEnable())) { query.eq(ErpSaleOrderDO::getStatus, ErpAuditStatus.APPROVE.getStatus()) - .apply("t.return_count < t.out_count"); + .apply("t.return_count <= t.out_count"); } if (reqVO.getProductId() != null) { query.leftJoin(ErpSaleOrderItemDO.class, ErpSaleOrderItemDO::getOrderId, ErpSaleOrderDO::getId) .eq(reqVO.getProductId() != null, ErpSaleOrderItemDO::getProductId, reqVO.getProductId()) .groupBy(ErpSaleOrderDO::getId); // 避免 1 对多查询，产生相同的 1 } + + System.out.println("query.getTargetSql():"+query.getTargetSql()); + System.out.println("query.getTargetSql():"+query.getSqlComment()); return selectJoinPage(reqVO, ErpSaleOrderDO.class, query); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockRecordMapper.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockRecordMapper.java index e3cf6ecef3..23470fbe46 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockRecordMapper.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockRecordMapper.java @@ -23,6 +23,7 @@ public interface ErpStockRecordMapper extends BaseMapperX { .eqIfPresent(ErpStockRecordDO::getBizType, reqVO.getBizType()) .likeIfPresent(ErpStockRecordDO::getBizNo, reqVO.getBizNo()) .betweenIfPresent(ErpStockRecordDO::getCreateTime, reqVO.getCreateTime()) + .betweenIfPresent(ErpStockRecordDO::getRecordTime, reqVO.getRecordTime()) .orderByDesc(ErpStockRecordDO::getId)); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java index cde332a4e6..243dda53a8 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java @@ -98,6 +98,8 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService { ErpPurchaseInDO purchaseIn = BeanUtils.toBean(createReqVO, ErpPurchaseInDO.class, in -> in .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())) .setOrderNo(purchaseOrder.getNo()).setSupplierId(purchaseOrder.getSupplierId()); + + calculateTotalPrice(purchaseIn, purchaseInItems); purchaseIn.setPaymentPrice(new BigDecimal(0)); purchaseInMapper.insert(purchaseIn); @@ -196,7 +198,7 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService { stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( purchaseInItem.getProductId(),productDO.getCategoryId(), purchaseInItem.getWarehouseId(), count, - bizType, purchaseInItem.getInId(), purchaseInItem.getId(), purchaseIn.getNo())); + bizType, purchaseInItem.getInId(), purchaseInItem.getId(), purchaseIn.getNo(), purchaseIn.getInTime())); }); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java index 5b9030e498..6e7eb1e4c4 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java @@ -85,8 +85,8 @@ public class ErpPurchaseOrderServiceImpl implements ErpPurchaseOrderService { // 2.1 插入订单 ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())); - purchaseOrder.setInCount(new BigDecimal(0)); - purchaseOrder.setReturnCount(new BigDecimal(0)); + if(purchaseOrder.getInCount()==null) purchaseOrder.setInCount(BigDecimal.ZERO); + if(purchaseOrder.getReturnCount()==null) purchaseOrder.setReturnCount(BigDecimal.ZERO); calculateTotalPrice(purchaseOrder, purchaseOrderItems); purchaseOrderMapper.insert(purchaseOrder); // 2.2 插入订单项 diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java index 2f4ef77dd9..94a64475ab 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java @@ -192,7 +192,8 @@ public class ErpPurchaseReturnServiceImpl implements ErpPurchaseReturnService { ErpProductDO productDO = productService.getProduct(purchaseReturnItem.getProductId()); stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( purchaseReturnItem.getProductId(),productDO.getCategoryId(), purchaseReturnItem.getWarehouseId(), count, - bizType, purchaseReturnItem.getReturnId(), purchaseReturnItem.getId(), purchaseReturn.getNo())); + bizType, purchaseReturnItem.getReturnId(), purchaseReturnItem.getId(), + purchaseReturn.getNo(),purchaseReturn.getReturnTime())); }); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java index bfb4f5e3b7..b5b8fb3429 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java @@ -84,19 +84,21 @@ public class ErpSaleOrderServiceImpl implements ErpSaleOrderService { //检查数据是否有空值 if(createReqVO.getDepositPrice() ==null)createReqVO.setDepositPrice(BigDecimal.ZERO); if(createReqVO.getDiscountPercent() ==null)createReqVO.setDiscountPercent(BigDecimal.ZERO); + saleOrderItems.forEach(o -> o .setTaxPrice(o.getTaxPrice()==null?BigDecimal.ZERO:o.getTaxPrice()) .setTaxPercent(o.getTaxPercent()==null?BigDecimal.ZERO:o.getTaxPercent()) .setProductPrice(o.getProductPrice()==null?BigDecimal.ZERO:o.getProductPrice()) .setOutCount(o.getOutCount()==null?BigDecimal.ZERO:o.getOutCount()) .setCount(o.getCount()==null?BigDecimal.ZERO:o.getCount()) - .setCount(o.getReturnCount()==null?BigDecimal.ZERO:o.getReturnCount()) + .setReturnCount(o.getReturnCount()==null?BigDecimal.ZERO:o.getReturnCount()) ); // 2.1 插入订单 ErpSaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, ErpSaleOrderDO.class, in -> in .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())); - + if(saleOrder.getOutCount() ==null)saleOrder.setOutCount(BigDecimal.ZERO); + if(saleOrder.getReturnCount()==null)saleOrder.setReturnCount(BigDecimal.ZERO); calculateTotalPrice(saleOrder, saleOrderItems); saleOrderMapper.insert(saleOrder); // 2.2 插入订单项 @@ -134,7 +136,7 @@ public class ErpSaleOrderServiceImpl implements ErpSaleOrderService { .setProductPrice(o.getProductPrice()==null?BigDecimal.ZERO:o.getProductPrice()) .setOutCount(o.getOutCount()==null?BigDecimal.ZERO:o.getOutCount()) .setCount(o.getCount()==null?BigDecimal.ZERO:o.getCount()) - .setCount(o.getReturnCount()==null?BigDecimal.ZERO:o.getReturnCount()) + .setReturnCount(o.getReturnCount()==null?BigDecimal.ZERO:o.getReturnCount()) ); // 2.1 更新订单 ErpSaleOrderDO updateObj = BeanUtils.toBean(updateReqVO, ErpSaleOrderDO.class); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java index 37f8fd0d6e..6a33be0f8b 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java @@ -213,7 +213,7 @@ public class ErpSaleOutServiceImpl implements ErpSaleOutService { ErpProductDO productDO = productService.getProduct(saleOutItem.getProductId()); stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( saleOutItem.getProductId(),productDO.getCategoryId(), saleOutItem.getWarehouseId(), count, - bizType, saleOutItem.getOutId(), saleOutItem.getId(), saleOut.getNo())); + bizType, saleOutItem.getOutId(), saleOutItem.getId(), saleOut.getNo(),saleOut.getOutTime())); }); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleReturnServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleReturnServiceImpl.java index b06a6cc307..7f15468c81 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleReturnServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleReturnServiceImpl.java @@ -212,7 +212,7 @@ public class ErpSaleReturnServiceImpl implements ErpSaleReturnService { ErpProductDO productDO = productService.getProduct(saleReturnItem.getProductId()); stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( saleReturnItem.getProductId(),productDO.getCategoryId(), saleReturnItem.getWarehouseId(), count, - bizType, saleReturnItem.getReturnId(), saleReturnItem.getId(), saleReturn.getNo())); + bizType, saleReturnItem.getReturnId(), saleReturnItem.getId(), saleReturn.getNo(),saleReturn.getReturnTime())); }); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java index 16d2083c16..3739bf5cb2 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java @@ -138,7 +138,7 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService { ErpProductDO productDO = productService.getProduct(stockCheckItem.getProductId()); stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( stockCheckItem.getProductId(),productDO.getCategoryId(), stockCheckItem.getWarehouseId(), count, - bizType, stockCheckItem.getCheckId(), stockCheckItem.getId(), stockCheck.getNo())); + bizType, stockCheckItem.getCheckId(), stockCheckItem.getId(), stockCheck.getNo(),stockCheck.getCheckTime())); }); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java index 15163b1b88..2b02bd83f1 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java @@ -133,7 +133,7 @@ public class ErpStockInServiceImpl implements ErpStockInService { ErpProductDO productDO = productService.getProduct(stockInItem.getProductId()); stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( stockInItem.getProductId(),productDO.getCategoryId(), stockInItem.getWarehouseId(), count, - bizType, stockInItem.getInId(), stockInItem.getId(), stockIn.getNo())); + bizType, stockInItem.getInId(), stockInItem.getId(), stockIn.getNo(), stockIn.getInTime())); }); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockMoveServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockMoveServiceImpl.java index 346f8300d6..034741fb8a 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockMoveServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockMoveServiceImpl.java @@ -132,10 +132,10 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService { stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( stockMoveItem.getProductId(),productDO.getCategoryId(), stockMoveItem.getFromWarehouseId(), fromCount, - fromBizType, stockMoveItem.getMoveId(), stockMoveItem.getId(), stockMove.getNo())); + fromBizType, stockMoveItem.getMoveId(), stockMoveItem.getId(), stockMove.getNo(),stockMove.getMoveTime())); stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( stockMoveItem.getProductId(),productDO.getCategoryId(), stockMoveItem.getToWarehouseId(), toCount, - toBizType, stockMoveItem.getMoveId(), stockMoveItem.getId(), stockMove.getNo())); + toBizType, stockMoveItem.getMoveId(), stockMoveItem.getId(), stockMove.getNo(),stockMove.getMoveTime())); }); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java index 06faf7463f..9638e6f0ba 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java @@ -134,7 +134,7 @@ public class ErpStockOutServiceImpl implements ErpStockOutService { ErpProductDO productDO = productService.getProduct(stockOutItem.getProductId()); stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( stockOutItem.getProductId(),productDO.getCategoryId(), stockOutItem.getWarehouseId(), count, - bizType, stockOutItem.getOutId(), stockOutItem.getId(), stockOut.getNo())); + bizType, stockOutItem.getOutId(), stockOutItem.getId(), stockOut.getNo(),stockOut.getOutTime())); }); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/bo/ErpStockRecordCreateReqBO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/bo/ErpStockRecordCreateReqBO.java index 4c912f78d7..0c55c9ad9c 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/bo/ErpStockRecordCreateReqBO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/bo/ErpStockRecordCreateReqBO.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.erp.service.stock.bo; -import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * 库存明细的创建 Request BO @@ -61,4 +62,6 @@ public class ErpStockRecordCreateReqBO { @NotNull(message = "业务单号不能为空") private String bizNo; + @NotNull(message = "出入库时间不能为空") + private LocalDateTime recordTime; } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockindetail/StockInDetailServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockindetail/StockInDetailServiceImpl.java index 55fc920d3b..d646f9febe 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockindetail/StockInDetailServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockindetail/StockInDetailServiceImpl.java @@ -134,7 +134,7 @@ public class StockInDetailServiceImpl implements StockInDetailService { ErpProductDO productDO = productService.getProduct(stockInItem.getProductId()); stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( stockInItem.getProductId(),productDO.getCategoryId(), stockInItem.getWarehouseId(), count, - bizType, stockInItem.getInId(), stockInItem.getId(), stockIn.getNo())); + bizType, stockInItem.getInId(), stockInItem.getId(), stockIn.getNo(),stockIn.getInTime())); }); List statusList = new ArrayList<>(); statusList.add(PlanStatusEnum.开工.getValue()); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockworkshop/MesStockInServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockworkshop/MesStockInServiceImpl.java index 0c09f80bd9..0ab18834ab 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockworkshop/MesStockInServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockworkshop/MesStockInServiceImpl.java @@ -119,7 +119,7 @@ public class MesStockInServiceImpl implements MesStockInService { ErpProductDO productDO = productService.getProduct(stockInItem.getProductId()); stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( stockInItem.getProductId(),productDO.getCategoryId(), stockInItem.getWarehouseId(), count, - bizType, stockInItem.getInId(), stockInItem.getId(), stockIn.getNo())); + bizType, stockInItem.getInId(), stockInItem.getId(), stockIn.getNo(),stockIn.getInTime())); }); //保存分配明细 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockworkshop/MesStockOutServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockworkshop/MesStockOutServiceImpl.java index 485d5a1ed2..207e73cbec 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockworkshop/MesStockOutServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/stockworkshop/MesStockOutServiceImpl.java @@ -90,7 +90,7 @@ public class MesStockOutServiceImpl implements MesStockOutService { ErpProductDO productDO = productService.getProduct(stockOutItem.getProductId()); stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO( stockOutItem.getProductId(), productDO.getCategoryId(), stockOutItem.getWarehouseId(), count, - bizType, stockOutItem.getOutId(), stockOutItem.getId(), stockOut.getNo())); + bizType, stockOutItem.getOutId(), stockOutItem.getId(), stockOut.getNo(),stockOut.getOutTime())); }); //变更车间仓库存 diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index b0a22a82f9..bb8517fe0c 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -47,7 +47,7 @@ spring: primary: master datasource: master: - name: besure_neimeng + name: besure_cloud url: jdbc:mysql://47.106.185.127:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 username: besure_user1