待入库添加清点功能

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/WmsServiceImpl.java

@@ -31,6 +31,7 @@ import com.fjhx.victoriatourist.service.order.OrderInfoService;
 import com.fjhx.victoriatourist.service.purchase.PurchaseBackService;
 import com.fjhx.victoriatourist.service.quality.QualityDetailsService;
 import com.fjhx.wms.entity.QualityDetailsPo;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
@@ -195,7 +196,7 @@ public class WmsServiceImpl implements WmsService {
     @Override
     public void createJdLogisticsInfo(StockWaitDto dto) {
         StockWait stockWait = stockWaitService.getById(dto.getId());
-        List<StockWaitDetails> stockWaitDetailsList = dto.getStockWaitDetailsList();
+        List<StockWaitDetailsDto> stockWaitDetailsList = dto.getStockWaitDetailsList();
 
         //创建物流数据
         LogisticsInfos logisticsInfos = new LogisticsInfos();
@@ -242,7 +243,7 @@ public class WmsServiceImpl implements WmsService {
         if(ObjectUtil.isEmpty(jdOrder)){
             throw new ServiceException("查询不到京东订单信息");
         }
-        List<StockWaitDetails> stockWaitDetailsList = dto.getStockWaitDetailsList();
+        List<StockWaitDetailsDto> stockWaitDetailsList = dto.getStockWaitDetailsList();
         List<Long> jdODIds = stockWaitDetailsList.stream().map(StockWaitDetails::getBusinessDetailsId).collect(Collectors.toList());
         Map<Long, JdOrderDetails> jdOrderDetailsMap = jdOrderDetailsService.mapKEntity(JdOrderDetails::getId, q -> q.in(JdOrderDetails::getId, jdODIds));
 

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -46,6 +46,7 @@ import com.fjhx.victoriatourist.service.jd.JdOrderService;
 import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
 import com.fjhx.victoriatourist.service.stock.StockTransferDetailsService;
 import com.fjhx.victoriatourist.service.stock.StockTransferService;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.emums.StockWaitType;
@@ -933,7 +934,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
                 .in(StockWaitDetails::getBusinessId, businessIds)
                 .in(StockWaitDetails::getProductId, productIds)
         );
-        ArrayList<StockWaitDetails> outStockWaitDetailsList = new ArrayList<>();
+        ArrayList<StockWaitDetailsDto> outStockWaitDetailsList = new ArrayList<>();
         for (JdBatchOutStockBo teaBo : outList) {
             StockWaitDetails dataBaseInfo = list1.stream().filter(item ->
                     item.getBusinessId().equals(teaBo.getOrderInfoId()) &&
@@ -955,7 +956,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
             }
 
             //生成信息
-            StockWaitDetails stockWaitDetails = new StockWaitDetails();
+            StockWaitDetailsDto stockWaitDetails = new StockWaitDetailsDto();
             stockWaitDetails.setStockWaitId(dataBaseInfo.getStockWaitId());
             stockWaitDetails.setId(dataBaseInfo.getId());
             stockWaitDetails.setQuantity(teaBo.getQuantity());
@@ -966,8 +967,8 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         }
 
         //操作待出库
-        Map<Long, List<StockWaitDetails>> outMap = outStockWaitDetailsList.stream().collect(Collectors.groupingBy(StockWaitDetails::getStockWaitId));
-        for (Map.Entry<Long, List<StockWaitDetails>> entry : outMap.entrySet()) {
+        Map<Long, List<StockWaitDetailsDto>> outMap = outStockWaitDetailsList.stream().collect(Collectors.groupingBy(StockWaitDetails::getStockWaitId));
+        for (Map.Entry<Long, List<StockWaitDetailsDto>> entry : outMap.entrySet()) {
             StockWait dataBaseInfo = stockWaitService.getById(entry.getKey());
 
             StockWaitDto stockWaitDto = outInfo.getObject(entry.getValue().get(0).getJdOrderId().toString(), StockWaitDto.class);

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/order/impl/OrderInfoServiceImpl.java

@@ -315,7 +315,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
         logisticsInfosService.save(logisticsInfos);
 
-        List<StockWaitDetails> stockWaitDetailsList = stockWaitDto.getStockWaitDetailsList();
+        List<StockWaitDetailsDto> stockWaitDetailsList = stockWaitDto.getStockWaitDetailsList();
 
 
         List<LogisticsDetails> logisticsDetailsList = new ArrayList<>();

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/purchase/impl/PurchaseBackServiceImpl.java

@@ -191,7 +191,7 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
         Assert.notEmpty(stockWaitDetails, "查询不到待出库明细信息");
         StockWaitDto stockWaitDto = BeanUtil.copyProperties(stockWaitDetailsDto, StockWaitDto.class);
         stockWaitDto.setId(stockWaitDetails.getStockWaitId());
-        stockWaitDto.setStockWaitDetailsList(Collections.singletonList(BeanUtil.copyProperties(stockWaitDetailsDto, StockWaitDetails.class)));
+        stockWaitDto.setStockWaitDetailsList(Collections.singletonList(stockWaitDetailsDto));
         backOuts(stockWaitDto);
     }
 
@@ -230,7 +230,7 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
 
         logisticsInfosService.save(logisticsInfos);
 
-        List<StockWaitDetails> stockWaitDetailsList = stockWaitDto.getStockWaitDetailsList();
+        List<StockWaitDetailsDto> stockWaitDetailsList = stockWaitDto.getStockWaitDetailsList();
 
         List<Stock> stockList = new ArrayList<>();
 

hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockWaitDetailsCheckController.java

@@ -0,0 +1,80 @@
+package com.fjhx.wms.controller.stock;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsCheckDto;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsCheckSelectDto;
+import com.fjhx.wms.entity.stock.vo.StockWaitDetailsCheckVo;
+import com.fjhx.wms.service.stock.StockWaitDetailsCheckService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 待入库清点 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-25
+ */
+@RestController
+@RequestMapping("/stockWaitDetailsCheck")
+public class StockWaitDetailsCheckController {
+
+    @Autowired
+    private StockWaitDetailsCheckService stockWaitDetailsCheckService;
+
+    /**
+     * 待入库清点列表
+     */
+    @PostMapping("/list")
+    public List<StockWaitDetailsCheckVo> list(@RequestBody StockWaitDetailsCheckSelectDto dto) {
+        return stockWaitDetailsCheckService.getList(dto);
+    }
+
+    /**
+     * 待入库清点分页
+     */
+    @PostMapping("/page")
+    public Page<StockWaitDetailsCheckVo> page(@RequestBody StockWaitDetailsCheckSelectDto dto) {
+        return stockWaitDetailsCheckService.getPage(dto);
+    }
+
+    /**
+     * 待入库清点明细
+     */
+    @PostMapping("/detail")
+    public StockWaitDetailsCheckVo detail(@RequestBody BaseSelectDto dto) {
+        return stockWaitDetailsCheckService.detail(dto.getId());
+    }
+
+    /**
+     * 待入库清点新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody StockWaitDetailsCheckDto stockWaitDetailsCheckDto) {
+        stockWaitDetailsCheckService.add(stockWaitDetailsCheckDto);
+    }
+
+    /**
+     * 待入库清点编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody StockWaitDetailsCheckDto stockWaitDetailsCheckDto) {
+        stockWaitDetailsCheckService.edit(stockWaitDetailsCheckDto);
+    }
+
+    /**
+     * 待入库清点删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        stockWaitDetailsCheckService.delete(dto.getId());
+    }
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDetailsCheckDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.wms.entity.stock.dto;
+
+import com.fjhx.wms.entity.stock.po.StockWaitDetailsCheck;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 待入库清点新增编辑入参实体
+ *
+ * @author 
+ * @since 2024-03-25
+ */
+@Getter
+@Setter
+public class StockWaitDetailsCheckDto extends StockWaitDetailsCheck {
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDetailsCheckSelectDto.java

@@ -0,0 +1,28 @@
+package com.fjhx.wms.entity.stock.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 待入库清点列表查询入参实体
+ *
+ * @author 
+ * @since 2024-03-25
+ */
+@Getter
+@Setter
+public class StockWaitDetailsCheckSelectDto extends BaseSelectDto {
+
+
+    /**
+     * 待入库明细id
+     */
+    private Long stockWaitDetailsId;
+
+    /**
+     * 待入库id
+     */
+    private Long stockWaitId;
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDetailsDto.java

@@ -1,9 +1,12 @@
 package com.fjhx.wms.entity.stock.dto;
 
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
+import com.fjhx.wms.entity.stock.po.StockWaitDetailsCheck;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 待出入库明细新增编辑入参实体
  *
@@ -32,4 +35,9 @@ public class StockWaitDetailsDto extends StockWaitDetails {
      * 物流编号
      */
     private String logisticsCode;
+
+    /**
+     * 清点记录
+     */
+    private List<StockWaitDetailsCheck> stockWaitDetailsCheckList;
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDto.java

@@ -1,7 +1,6 @@
 package com.fjhx.wms.entity.stock.dto;
 
 import com.fjhx.wms.entity.stock.po.StockWait;
-import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -26,7 +25,7 @@ public class StockWaitDto extends StockWait {
     /**
      * 待入库明细列表
      */
-    private List<StockWaitDetails> stockWaitDetailsList;
+    private List<StockWaitDetailsDto> stockWaitDetailsList;
 
 
     /**

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWaitDetailsCheck.java

@@ -0,0 +1,41 @@
+package com.fjhx.wms.entity.stock.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 待入库清点
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-25
+ */
+@Getter
+@Setter
+@TableName("stock_wait_details_check")
+public class StockWaitDetailsCheck extends BasePo {
+
+    /**
+     * 待入库明细id
+     */
+    private Long stockWaitDetailsId;
+
+    /**
+     * 待入库id
+     */
+    private Long stockWaitId;
+
+    /**
+     * 数量
+     */
+    private Long quantity;
+
+    /**
+     * 提交状态2已提交
+     */
+    private Integer status;
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitDetailsCheckVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.wms.entity.stock.vo;
+
+import com.fjhx.wms.entity.stock.po.StockWaitDetailsCheck;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 待入库清点列表查询返回值实体
+ *
+ * @author 
+ * @since 2024-03-25
+ */
+@Getter
+@Setter
+public class StockWaitDetailsCheckVo extends StockWaitDetailsCheck {
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitDetailsVo.java

@@ -1,10 +1,12 @@
 package com.fjhx.wms.entity.stock.vo;
 
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
+import com.fjhx.wms.entity.stock.po.StockWaitDetailsCheck;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 待出入库明细列表查询返回值实体
@@ -76,4 +78,6 @@ public class StockWaitDetailsVo extends StockWaitDetails {
      */
     private String productCustomCode;
 
+    private List<StockWaitDetailsCheck> stockWaitDetailsCheckList;
+
 }

hx-wms/src/main/java/com/fjhx/wms/mapper/stock/StockWaitDetailsCheckMapper.java

@@ -0,0 +1,32 @@
+package com.fjhx.wms.mapper.stock;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.wms.entity.stock.po.StockWaitDetailsCheck;
+import com.fjhx.wms.entity.stock.vo.StockWaitDetailsCheckVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 待入库清点 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-25
+ */
+public interface StockWaitDetailsCheckMapper extends BaseMapper<StockWaitDetailsCheck> {
+
+    /**
+     * 待入库清点列表
+     */
+    List<StockWaitDetailsCheckVo> getList(@Param("ew") IWrapper<StockWaitDetailsCheck> wrapper);
+
+    /**
+     * 待入库清点分页
+     */
+    Page<StockWaitDetailsCheckVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<StockWaitDetailsCheck> wrapper);
+
+}

hx-wms/src/main/java/com/fjhx/wms/service/stock/StockWaitDetailsCheckService.java

@@ -0,0 +1,55 @@
+package com.fjhx.wms.service.stock;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsCheckDto;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsCheckSelectDto;
+import com.fjhx.wms.entity.stock.po.StockWaitDetailsCheck;
+import com.fjhx.wms.entity.stock.vo.StockWaitDetailsCheckVo;
+import com.ruoyi.common.core.service.BaseService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 待入库清点 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-25
+ */
+public interface StockWaitDetailsCheckService extends BaseService<StockWaitDetailsCheck> {
+
+    /**
+     * 待入库清点列表
+     */
+    List<StockWaitDetailsCheckVo> getList(StockWaitDetailsCheckSelectDto dto);
+
+    List<StockWaitDetailsCheckVo> getList(IWrapper<StockWaitDetailsCheck> wrapper);
+
+    /**
+     * 待入库清点分页
+     */
+    Page<StockWaitDetailsCheckVo> getPage(StockWaitDetailsCheckSelectDto dto);
+
+    /**
+     * 待入库清点明细
+     */
+    StockWaitDetailsCheckVo detail(Long id);
+
+    /**
+     * 待入库清点新增
+     */
+    void add(StockWaitDetailsCheckDto stockWaitDetailsCheckDto);
+
+    /**
+     * 待入库清点编辑
+     */
+    void edit(StockWaitDetailsCheckDto stockWaitDetailsCheckDto);
+
+    /**
+     * 待入库清点删除
+     */
+    void delete(Long id);
+
+}

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitDetailsCheckServiceImpl.java

@@ -0,0 +1,97 @@
+package com.fjhx.wms.service.stock.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.utils.Assert;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsCheckDto;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsCheckSelectDto;
+import com.fjhx.wms.entity.stock.po.StockWaitDetails;
+import com.fjhx.wms.entity.stock.po.StockWaitDetailsCheck;
+import com.fjhx.wms.entity.stock.vo.StockWaitDetailsCheckVo;
+import com.fjhx.wms.mapper.stock.StockWaitDetailsCheckMapper;
+import com.fjhx.wms.service.stock.StockWaitDetailsCheckService;
+import com.fjhx.wms.service.stock.StockWaitDetailsService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 待入库清点 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-25
+ */
+@Service
+public class StockWaitDetailsCheckServiceImpl extends ServiceImpl<StockWaitDetailsCheckMapper, StockWaitDetailsCheck> implements StockWaitDetailsCheckService {
+
+    private final StockWaitDetailsService stockWaitDetailsService;
+
+    @Autowired
+    public StockWaitDetailsCheckServiceImpl(StockWaitDetailsService stockWaitDetailsService) {
+        this.stockWaitDetailsService = stockWaitDetailsService;
+    }
+
+    @Override
+    public List<StockWaitDetailsCheckVo> getList(StockWaitDetailsCheckSelectDto dto) {
+
+        IWrapper<StockWaitDetailsCheck> wrapper = getCommWrapper(dto);
+        ;
+        List<StockWaitDetailsCheckVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public List<StockWaitDetailsCheckVo> getList(IWrapper<StockWaitDetailsCheck> wrapper) {
+        List<StockWaitDetailsCheckVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    private IWrapper<StockWaitDetailsCheck> getCommWrapper(StockWaitDetailsCheckSelectDto dto) {
+        IWrapper<StockWaitDetailsCheck> wrapper = getWrapper();
+
+        wrapper.eq("swdc", StockWaitDetailsCheck::getStockWaitId, dto.getStockWaitId());
+        wrapper.eq("swdc", StockWaitDetailsCheck::getStockWaitDetailsId, dto.getStockWaitDetailsId());
+
+        wrapper.orderByDesc("swdc", StockWaitDetailsCheck::getCreateTime);
+        wrapper.orderByDesc("swdc", StockWaitDetailsCheck::getId);
+        return wrapper;
+    }
+
+    @Override
+    public Page<StockWaitDetailsCheckVo> getPage(StockWaitDetailsCheckSelectDto dto) {
+        IWrapper<StockWaitDetailsCheck> wrapper = getCommWrapper(dto);
+        Page<StockWaitDetailsCheckVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public StockWaitDetailsCheckVo detail(Long id) {
+        StockWaitDetailsCheck StockWaitDetailsCheck = this.getById(id);
+        StockWaitDetailsCheckVo result = BeanUtil.toBean(StockWaitDetailsCheck, StockWaitDetailsCheckVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(StockWaitDetailsCheckDto dto) {
+        StockWaitDetails stockWaitDetails = stockWaitDetailsService.getById(dto.getStockWaitDetailsId());
+        Assert.notEmpty(stockWaitDetails, "查询不到待入库明细信息");
+        dto.setStockWaitId(stockWaitDetails.getStockWaitId());
+        this.save(dto);
+    }
+
+    @Override
+    public void edit(StockWaitDetailsCheckDto stockWaitDetailsCheckDto) {
+        this.updateById(stockWaitDetailsCheckDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitDetailsServiceImpl.java

@@ -148,7 +148,7 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
         Assert.notEmpty(stockWaitDetails, "查询不到待出库明细信息");
         StockWaitDto stockWaitDto = BeanUtil.copyProperties(stockWaitDetailsDto, StockWaitDto.class);
         stockWaitDto.setId(stockWaitDetails.getStockWaitId());
-        stockWaitDto.setStockWaitDetailsList(Collections.singletonList(BeanUtil.copyProperties(stockWaitDetailsDto, StockWaitDetails.class)));
+        stockWaitDto.setStockWaitDetailsList(Collections.singletonList(BeanUtil.copyProperties(stockWaitDetailsDto, StockWaitDetailsDto.class)));
         stockWaitService.addByWdly(stockWaitDto);
     }
 
@@ -158,14 +158,13 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
      */
     @Override
     public void changeStockWaitStatus(StockWaitDto stockWaitDto) {
-        List<StockWaitDetails> stockWaitDetailsDtoList = stockWaitDto.getStockWaitDetailsList();
-        List<StockWaitDetailsDto> stockWaitDetailsDtoList1 = BeanUtil.copyToList(stockWaitDetailsDtoList, StockWaitDetailsDto.class);
+        List<StockWaitDetailsDto> stockWaitDetailsDtoList = stockWaitDto.getStockWaitDetailsList();
 
         //获取待入库明细信息
         List<Long> swdIds = stockWaitDetailsDtoList.stream().map(StockWaitDetails::getId).collect(Collectors.toList());
         Map<Long, StockWaitDetails> stockWaitDetailsMap = this.mapKEntity(StockWaitDetails::getId, q -> q.in(StockWaitDetails::getId, swdIds));
 
-        for (StockWaitDetailsDto stockWaitDetailsDto : stockWaitDetailsDtoList1) {
+        for (StockWaitDetailsDto stockWaitDetailsDto : stockWaitDetailsDtoList) {
             //更新已入库数量 根据明细id
             StockWaitDetails stockWaitDetails = stockWaitDetailsMap.get(stockWaitDetailsDto.getId());
             if (ObjectUtil.isEmpty(stockWaitDetails)) {

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -40,6 +40,7 @@ import com.fjhx.wms.service.stock.*;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.fjhx.wms.utils.CodeEnum;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,6 +87,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     private PurService purService;
     @Autowired
     private CompanyInfoService companyInfoService;
+    @Autowired
+    private StockWaitDetailsCheckService stockWaitDetailsCheckService;
 
     @Override
     public Page<StockWaitVo> getPage(StockWaitSelectDto dto) {
@@ -124,7 +127,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             wrapper.and(q -> q
                     .like("sw", StockWait::getBusinessCode, dto.getKeyword())
                     .or().like("lis.code", dto.getKeyword())
-                    .or().inSql("sw.id","SELECT swd.stock_wait_id FROM stock_wait_details swd LEFT JOIN bytesailing_item.product_info pi ON swd.product_id = pi.id where ( pi.`name` LIKE CONCAT( '%', '"+dto.getKeyword()+"', '%' ) OR pi.custom_code LIKE CONCAT( '%', '"+dto.getKeyword()+"', '%' ))")
+                    .or().inSql("sw.id", "SELECT swd.stock_wait_id FROM stock_wait_details swd LEFT JOIN bytesailing_item.product_info pi ON swd.product_id = pi.id where ( pi.`name` LIKE CONCAT( '%', '" + dto.getKeyword() + "', '%' ) OR pi.custom_code LIKE CONCAT( '%', '" + dto.getKeyword() + "', '%' ))")
             );
         }
 
@@ -235,6 +238,13 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             //名称升序
             Collections.sort(stockWaitDetailsVos, Comparator.comparing(StockWaitDetailsVo::getProductName));
         }
+
+        //赋值入库清点信息
+        Map<Long, List<StockWaitDetailsCheck>> checkMap = stockWaitDetailsCheckService.mapKGroup(StockWaitDetailsCheck::getStockWaitDetailsId, q -> q.eq(StockWaitDetailsCheck::getStockWaitId, id));
+        for (StockWaitDetailsVo stockWaitDetailsVo : stockWaitDetailsVos) {
+            stockWaitDetailsVo.setStockWaitDetailsCheckList(checkMap.get(stockWaitDetailsVo.getId()));
+        }
+
         result.setStockWaitDetailsList(stockWaitDetailsVos);
         //如果是采购退货 赋值采购退货信息
         if (result.getBusinessType() == 4) {
@@ -262,7 +272,21 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     public synchronized void addByWdly(StockWaitDto stockWaitDto) {
         List<Stock> stockList = new ArrayList<>();
 
-        List<StockWaitDetails> stockWaitDetailsDtoList = stockWaitDto.getStockWaitDetailsList();
+        List<StockWaitDetailsDto> stockWaitDetailsDtoList = stockWaitDto.getStockWaitDetailsList();
+
+        //更新清点状态
+        for (StockWaitDetailsDto stockWaitDetailsDto : stockWaitDetailsDtoList) {
+            List<StockWaitDetailsCheck> stockWaitDetailsCheckList = stockWaitDetailsDto.getStockWaitDetailsCheckList();
+            if (ObjectUtil.isEmpty(stockWaitDetailsCheckList)) {
+                stockWaitDetailsCheckList = new ArrayList<>();
+            }
+            List<Long> checkIds = stockWaitDetailsCheckList.stream().map(StockWaitDetailsCheck::getId).collect(Collectors.toList());
+            stockWaitDetailsCheckService.update(q -> q
+                    .in(StockWaitDetailsCheck::getId, checkIds).set(StockWaitDetailsCheck::getStatus, 2)
+                    .set(StockWaitDetailsCheck::getUpdateTime, new Date())
+                    .set(StockWaitDetailsCheck::getCreateUser, SecurityUtils.getUserId())
+            );
+        }
 
         //更新已出入库数量以及待出入库状态
         stockWaitDetailsService.changeStockWaitStatus(stockWaitDto);
@@ -515,7 +539,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         }
 
         for (IssueImportExcelBo issueImportExcelBo : excelBoList) {
-            if (ObjectUtil.isEmpty(issueImportExcelBo.getProductCustomCode())){
+            if (ObjectUtil.isEmpty(issueImportExcelBo.getProductCustomCode())) {
                 issueImportExcelBo.setProductCustomCode("");
                 issueImportExcelBo.setProductName("");
             }

hx-wms/src/main/resources/mapper/stock/StockWaitDetailsCheckMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.wms.mapper.stock.StockWaitDetailsCheckMapper">
+    <select id="getList" resultType="com.fjhx.wms.entity.stock.vo.StockWaitDetailsCheckVo">
+        select
+            swdc.id,
+            swdc.stock_wait_details_id,
+            swdc.stock_wait_id,
+            swdc.quantity,
+            swdc.status,
+            swdc.create_user,
+            swdc.create_time,
+            swdc.update_user,
+            swdc.update_time
+        from stock_wait_details_check swdc
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.fjhx.wms.entity.stock.vo.StockWaitDetailsCheckVo">
+        select
+            swdc.id,
+            swdc.stock_wait_details_id,
+            swdc.stock_wait_id,
+            swdc.quantity,
+            swdc.status,
+            swdc.create_user,
+            swdc.create_time,
+            swdc.update_user,
+            swdc.update_time
+        from stock_wait_details_check swdc
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>