fix erp

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

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

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

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<ErpSaleOrderDO> {
         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<ErpSaleOrderDO> {
         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);
     }
 

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<ErpStockRecordDO> {
                 .eqIfPresent(ErpStockRecordDO::getBizType, reqVO.getBizType())
                 .likeIfPresent(ErpStockRecordDO::getBizNo, reqVO.getBizNo())
                 .betweenIfPresent(ErpStockRecordDO::getCreateTime, reqVO.getCreateTime())
+                .betweenIfPresent(ErpStockRecordDO::getRecordTime, reqVO.getRecordTime())
                 .orderByDesc(ErpStockRecordDO::getId));
     }
 

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()));
         });
     }
 

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));
+        if(purchaseOrder.getInCount()==null) purchaseOrder.setInCount(BigDecimal.ZERO);
-        purchaseOrder.setReturnCount(new BigDecimal(0));
+        if(purchaseOrder.getReturnCount()==null)  purchaseOrder.setReturnCount(BigDecimal.ZERO);
         calculateTotalPrice(purchaseOrder, purchaseOrderItems);
         purchaseOrderMapper.insert(purchaseOrder);
         // 2.2 插入订单项

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()));
         });
     }
 

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

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()));
         });
     }
 

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()));
         });
     }
 

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()));
         });
     }
 

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()));
         });
     }
 

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()));
         });
     }
 

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()));
         });
     }
 

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

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<Integer> statusList = new ArrayList<>();
         statusList.add(PlanStatusEnum.开工.getValue());

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()));
         });
 
         //保存分配明细

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()));
 
         });
         //变更车间仓库存

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