update 代码修改

ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/dto/WmsBomItemCount.java

@@ -0,0 +1,18 @@
+package com.ruoyi.wms.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class WmsBomItemCount implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 6374988072737712915L;
+
+    private Long SkuId;
+
+    private Integer count;
+
+}

ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/WmsTaskEditVo.java

@@ -1,9 +1,11 @@
 package com.ruoyi.wms.domain.vo;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.wms.domain.entity.WmsTask;
 import com.ruoyi.wms.domain.entity.WmsTaskDetailsEditVo;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,6 +13,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -22,10 +25,23 @@ public class WmsTaskEditVo implements Serializable {
     @Serial
     private static final long serialVersionUID = -7994775239835466989L;
 
+    private Long id;
+
     @Schema(description = "任务")
-    private WmsTask wmsTask;
+    private String taskCode;
+
+    @Schema(description = "生产开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDate;
+
+    @Schema(description = "生产结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDate;
+
+    @Schema(description = "备注")
+    private String remark;
 
     @Schema(description = "任务明细")
-    private List<WmsTaskDetailsEditVo> wmsTaskDetailsEditVo;
+    private List<WmsTaskDetailsEditVo> taskItemSkuDtoList;
 
 }

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

@@ -1,7 +1,9 @@
 package com.ruoyi.wms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.wms.domain.dto.WmsBomItemCount;
 import com.ruoyi.wms.domain.entity.WmsBomItem;
+import org.apache.ibatis.annotations.MapKey;
 
 import java.util.List;
 import java.util.Map;
@@ -19,8 +21,8 @@ public interface WmsBomItemMapper extends BaseMapper<WmsBomItem> {
      * @param list
      * @return
      */
-    Map<Long, Integer> getByIdCount(List<Long> list);
-    
+   List<WmsBomItemCount> getByIdCount(List<Long> list);
+
 }
 
 

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

@@ -14,8 +14,8 @@ import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.wms.domain.bo.ItemSkuBo;
 import com.ruoyi.wms.domain.bo.UnitAuxiliaryBo;
 import com.ruoyi.wms.domain.bo.UnitConfigBo;
+import com.ruoyi.wms.domain.dto.WmsBomItemCount;
 import com.ruoyi.wms.domain.entity.ItemSku;
-import com.ruoyi.wms.domain.entity.WmsBomItem;
 import com.ruoyi.wms.domain.entity.WmsUnitAuxiliary;
 import com.ruoyi.wms.domain.entity.WmsUnitConfig;
 import com.ruoyi.wms.domain.vo.BaseOrderDetailVo;
@@ -70,9 +70,11 @@ public class ItemSkuService extends ServiceImpl<ItemSkuMapper, ItemSku> {
         IPage<ItemSkuMapVo> result = itemSkuMapper.selectByBo(pageQuery.build(), bo);
 
         List<Long> list = result.getRecords().stream().map(ItemSkuMapVo::getSkuId).toList();
-        Map<Long, Integer> count = wmsBomItemService.getByIdCount(list);
-        result.getRecords().stream().forEach(itemSku -> {
-            Integer i = count.get(itemSku.getSkuId()) == null ? 0 : count.get(itemSku.getSkuId());
+        Map<Long, WmsBomItemCount> count = wmsBomItemService.getByIdCount(list);
+        result.getRecords().forEach(itemSku -> {
+            Integer i = Optional.ofNullable(count.get(itemSku.getSkuId()))
+                .map(WmsBomItemCount::getCount)
+                .orElse(0);
             itemSku.getItemSku().setQuantity(i);
         });
         return TableDataInfo.build(result);
@@ -81,7 +83,6 @@ public class ItemSkuService extends ServiceImpl<ItemSkuMapper, ItemSku> {
     /**
      * 查询sku信息列表
      */
-
     public List<ItemSkuVo> queryList(ItemSkuBo bo) {
         LambdaQueryWrapper<ItemSku> lqw = buildQueryWrapper(bo);
         List<ItemSkuVo> itemSkuVos = itemSkuMapper.selectVoList(lqw);

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

@@ -1,6 +1,7 @@
 package com.ruoyi.wms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.wms.domain.dto.WmsBomItemCount;
 import com.ruoyi.wms.domain.entity.WmsBomItem;
 
 import java.util.List;
@@ -19,5 +20,5 @@ public interface WmsBomItemService extends IService<WmsBomItem> {
      * @param list sku id 列表
      * @return sku id 映射 数量
      */
-    Map<Long, Integer> getByIdCount(List<Long> list);
+    Map<Long, WmsBomItemCount> getByIdCount(List<Long> list);
 }

ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/impl/WmsBomItemServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.wms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.wms.domain.dto.WmsBomItemCount;
 import com.ruoyi.wms.domain.entity.WmsBomItem;
 import com.ruoyi.wms.mapper.WmsBomItemMapper;
 import com.ruoyi.wms.service.WmsBomItemService;
@@ -8,6 +9,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author Administrator
@@ -19,8 +21,11 @@ public class WmsBomItemServiceImpl extends ServiceImpl<WmsBomItemMapper, WmsBomI
     implements WmsBomItemService {
 
     @Override
-    public Map<Long, Integer> getByIdCount(List<Long> list) {
-        return this.baseMapper.getByIdCount(list);
+    public Map<Long, WmsBomItemCount> getByIdCount(List<Long> list) {
+        if (list == null || list.isEmpty()) {
+            return Map.of();
+        }
+        return this.baseMapper.getByIdCount(list).stream().collect(Collectors.toMap(WmsBomItemCount::getSkuId, wmsBomItemCount -> wmsBomItemCount));
     }
 }
 

ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/impl/WmsTaskServiceImpl.java

@@ -227,8 +227,11 @@ public class WmsTaskServiceImpl extends ServiceImpl<WmsTaskMapper, WmsTask>
         WmsTask wmsTask = this.getById(id);
         List<WmsTaskDetailsEditVo> wmsTaskDetailsEditVos = wmsTaskDetailsService.getByTaskId(wmsTask.getId());
         return WmsTaskEditVo.builder()
-            .wmsTask(wmsTask)
-            .wmsTaskDetailsEditVo(wmsTaskDetailsEditVos)
+            .taskCode(wmsTask.getTaskCode())
+            .startDate(wmsTask.getStartDate())
+            .endDate(wmsTask.getEndDate())
+            .remark(wmsTask.getRemark())
+            .taskItemSkuDtoList(wmsTaskDetailsEditVos)
             .build();
     }
 

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

@@ -14,12 +14,14 @@
         id,version_id,item_id
     </sql>
 
-    <select id="getByIdCount" resultType="java.util.Map">
-        select * from wms_bom_item
+    <select id="getByIdCount" resultType="com.ruoyi.wms.domain.dto.WmsBomItemCount">
+        select item_sku_id as sku_id, count(*) as count from wms_bom_item
         where item_sku_id in
         <foreach collection="list" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
+        group by item_sku_id
     </select>
-    
+
+
 </mapper>

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

@@ -72,7 +72,7 @@
         from wms_task_details wtd
                  left join wms_item_sku wis on wis.id = wtd.item_sku_id
                  left join wms_item wi on wi.id = wis.item_id
-        where wtd.id = #{id}
+        where wtd.task_id = #{id}
     </select>
 
 </mapper>