diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java index b438c85..fba9a07 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java @@ -1,5 +1,6 @@ package com.ruoyi.check.stockcheckdetail.domain; +import com.ruoyi.common.domain.ExtraField; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -132,6 +133,15 @@ public class CheckStockinDetail extends BaseEntity private String status; + private ExtraField extraField; + + public ExtraField getExtraField() { + return extraField; + } + public void setExtraField(ExtraField extraField) { + this.extraField = extraField; + } + public String getStatus() { return status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java index 312296e..e779c05 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java @@ -2,7 +2,10 @@ package com.ruoyi.check.stockcheckdetail.service.impl; import java.util.List; +import cn.hutool.json.JSONUtil; import com.ruoyi.check.stockcheck.domain.CheckStockin; +import com.ruoyi.common.domain.ExtraField; +import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.check.stockcheckdetail.mapper.CheckStockinDetailMapper; @@ -42,7 +45,11 @@ public class CheckStockinDetailServiceImpl implements ICheckStockinDetailService @Override public List selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) { - return checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail); + List checkStockinDetails = checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail); + for (CheckStockinDetail stockinDetail : checkStockinDetails) { + stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); + } + return checkStockinDetails; } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java index f8b1865..b7b39bc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java @@ -2,7 +2,9 @@ package com.ruoyi.check.stockcheckdetailfinish.service.impl; import java.util.List; +import cn.hutool.json.JSONUtil; import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail; +import com.ruoyi.common.domain.ExtraField; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper; @@ -95,7 +97,10 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF @Override public List selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) { - return checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail); - + List checkStockinDetails = checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail); + for (CheckStockinDetail stockinDetail : checkStockinDetails) { + stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); + } + return checkStockinDetails; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java index 2410ee9..7990126 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java @@ -113,7 +113,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService BasProduct basProduct = iBasProductService.selectBasProductByProductId(receiveProductVo.getProductId()); ReceiveStockinDetail receiveStockinDetail = new ReceiveStockinDetail(); receiveStockinDetail.setQuantity(receiveProductVo.getQuantity()); - receiveStockinDetail.setProductGuid(receiveProductVo.getProductId()); + receiveStockinDetail.setProductGuid(basProduct.getProductGuid()); receiveStockinDetail.setProductId(basProduct.getProductId()); receiveStockinDetail.setStockinId(receiveStockin.getStockinId()); receiveStockinDetail.setStockinDetailId(receiveStockin.getStockinId()+"-"+i++); @@ -176,7 +176,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService List collect = list.stream().map(ReceiveProductVo::getProductId).collect(Collectors.toList()); List result = iBasProductService.selectBasProductListByProductIds(collect); for (BasProduct basProduct : result) { - Optional first = list.stream().filter(x -> x.getProductId().equals(basProduct.getProductGuid())).findFirst(); + Optional first = list.stream().filter(x -> x.getProductId().equals(basProduct.getProductId())).findFirst(); first.ifPresent(receiveProductVo -> basProduct.setQuantity(receiveProductVo.getQuantity())); first.ifPresent(receiveProductVo -> basProduct.setLotNo(receiveProductVo.getLotNo())); } @@ -259,6 +259,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService inStockinDetail.setStockStatus("0"); inStockinDetail.setAssignNum("0"); inStockinDetail.setScanNum("0"); + inStockinDetail.setSpare2(receiveStockinDetail.getStockinDetailId()); inStockinDetailList.add(inStockinDetail); } return inStockinDetailList; @@ -279,6 +280,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService inStockin.setStockinId(iBasJobIdService.getJobId("RKD")); // 设置状态等默认值 inStockin.setStatus("1"); + inStockin.setSpare1(receiveStockin.getStockinId()); return inStockin; } diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml index 511bce7..1c9d3b4 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml @@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into check_stockin_detail_finish - select * from check_stockin_detail where stock_check_guid = #{stockCheckGuid} + select * from check_stockin_detail where stock_check_id = #{stockCheckId} diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue index c937ca8..1344a7f 100644 --- a/ruoyi-ui/src/views/check/stockCheck/index.vue +++ b/ruoyi-ui/src/views/check/stockCheck/index.vue @@ -223,33 +223,16 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + --> - +