update

1.删除无用代码

ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/SystemController.java

@@ -1,28 +0,0 @@
-package com.ruoyi.wms.controller;
-
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.wms.domain.constant.WmsConstant;
-import com.ruoyi.wms.domain.vo.MeasurementUnitVo;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/wms/system")
-@Tag(name = "v2-系统配置")
-public class SystemController {
-
-    @Operation(summary = "查询单位信息")
-    @GetMapping("/measurement/unit")
-    public R<List<MeasurementUnitVo>> measurementUnit() {
-        return R.ok(WmsConstant.MEASUREMENT_UNIT_LIST);
-    }
-
-}

ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/InventoryBo.java

@@ -9,6 +9,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serial;
 import java.math.BigDecimal;
 
 /**
@@ -23,6 +24,9 @@ import java.math.BigDecimal;
 @AutoMapper(target = Inventory.class, reverseConvertGenerate = false)
 public class InventoryBo extends BaseEntity {
 
+    @Serial
+    private static final long serialVersionUID = 8292508514589497736L;
+
     /**
      *
      */

ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/dto/ReceiptOrderDetailSummary.java → ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/dto/ReceiptOrderDetailSummaryDto.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 @Data
-public class ReceiptOrderDetailSummary {
+public class ReceiptOrderDetailSummaryDto {
 
     /**
      * 物料 sku id

ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderDetailMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.wms.mapper;
 
 import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
-import com.ruoyi.wms.domain.dto.ReceiptOrderDetailSummary;
+import com.ruoyi.wms.domain.dto.ReceiptOrderDetailSummaryDto;
 import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
 import com.ruoyi.wms.domain.vo.ReceiptOrderDetailVo;
 
@@ -21,5 +21,5 @@ public interface ReceiptOrderDetailMapper extends BaseMapperPlus<ReceiptOrderDet
      * @param skuId sku Id
      * @return 汇总数量 和 汇总金额
      */
-    List<ReceiptOrderDetailSummary> getQuantityAndAmount(List<Long> skuId);
+    List<ReceiptOrderDetailSummaryDto> getQuantityAndAmount(List<Long> skuId);
 }

ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ReceiptOrderDetailService.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.utils.MapstructUtils;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.wms.domain.bo.ReceiptOrderDetailBo;
-import com.ruoyi.wms.domain.dto.ReceiptOrderDetailSummary;
+import com.ruoyi.wms.domain.dto.ReceiptOrderDetailSummaryDto;
 import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
 import com.ruoyi.wms.domain.vo.ReceiptOrderDetailVo;
 import com.ruoyi.wms.mapper.ReceiptOrderDetailMapper;
@@ -123,7 +123,7 @@ public class ReceiptOrderDetailService extends ServiceImpl<ReceiptOrderDetailMap
         return details;
     }
 
-    public List<ReceiptOrderDetailSummary> getQuantityAndAmount(List<Long> skuId) {
+    public List<ReceiptOrderDetailSummaryDto> getQuantityAndAmount(List<Long> skuId) {
         return this.baseMapper.getQuantityAndAmount(skuId);
     }
 }

ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ReceiptOrderService.java

@@ -20,7 +20,7 @@ import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.wms.domain.bo.BaseOrderDetailBo;
 import com.ruoyi.wms.domain.bo.ReceiptOrderBo;
 import com.ruoyi.wms.domain.bo.ReceiptOrderDetailBo;
-import com.ruoyi.wms.domain.dto.ReceiptOrderDetailSummary;
+import com.ruoyi.wms.domain.dto.ReceiptOrderDetailSummaryDto;
 import com.ruoyi.wms.domain.entity.ItemSku;
 import com.ruoyi.wms.domain.entity.ReceiptOrder;
 import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
@@ -150,12 +150,12 @@ public class ReceiptOrderService {
         if (bo.getOptType() == 2) {
             List<Long> skuId = bo.getDetails().stream().map(BaseOrderDetailBo::getSkuId).toList();
             Map<Long, ItemSku> itemSkus = itemSkuService.listByIds(skuId).stream().collect(Collectors.toMap(ItemSku::getId, itemSku -> itemSku));
-            Map<Long, ReceiptOrderDetailSummary> summaryMap = receiptOrderDetailService.getQuantityAndAmount(skuId).stream()
-                .collect(Collectors.toMap(ReceiptOrderDetailSummary::getSkuId, s -> s));
+            Map<Long, ReceiptOrderDetailSummaryDto> summaryMap = receiptOrderDetailService.getQuantityAndAmount(skuId).stream()
+                .collect(Collectors.toMap(ReceiptOrderDetailSummaryDto::getSkuId, s -> s));
             bo.getDetails().forEach(receiptOrderDetailBo -> {
                 BigDecimal unitCost;
                 ItemSku itemSku = itemSkus.get(receiptOrderDetailBo.getSkuId());
-                ReceiptOrderDetailSummary receiptOrderDetailSummary = summaryMap.get(receiptOrderDetailBo.getSkuId());
+                ReceiptOrderDetailSummaryDto receiptOrderDetailSummary = summaryMap.get(receiptOrderDetailBo.getSkuId());
                 if (Objects.isNull(receiptOrderDetailSummary)) {
                     unitCost = receiptOrderDetailBo.getAmount().subtract(receiptOrderDetailBo.getBaseQuantity());
                     itemSku.setBaseUnitCost(unitCost);

ruoyi-admin-wms/src/main/resources/mapper/wms/ReceiptOrderDetailMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.wms.mapper.ReceiptOrderDetailMapper">
 
 
-    <select id="getQuantityAndAmount" resultType="com.ruoyi.wms.domain.dto.ReceiptOrderDetailSummary">
+    <select id="getQuantityAndAmount" resultType="com.ruoyi.wms.domain.dto.ReceiptOrderDetailSummaryDto">
         select sku_id,
         sum(amount) as amount,
         sum(base_quantity) as base_quantity