From 49ddd8fd213818bf43ac3b00dede37204aa46049 Mon Sep 17 00:00:00 2001 From: "1009473166@qq.com" <草拟吗23> Date: Tue, 26 May 2026 08:53:09 +0800 Subject: [PATCH] =?UTF-8?q?20206.5.26=20=E6=97=A98;52=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=95=B0=E6=8D=AE=20=E4=BF=AE=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=B0=86=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BC=A0=E5=88=B0?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4=E4=B8=BA?= =?UTF-8?q?barCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockindetail/domain/InStockinDetail.java | 3 +++ .../mapper/InStockinDetailMapper.java | 2 ++ .../service/IInStockinDetailService.java | 2 ++ .../impl/InStockinDetailServiceImpl.java | 5 ++++ .../ruoyi/pda/controller/PdaController.java | 24 ++++++++++--------- .../mapper/in/InStockinDetailMapper.xml | 9 +++++++ 6 files changed, 34 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java index bb7fdad..e4f41a0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java @@ -7,6 +7,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.data.annotation.Transient; /** * 入库单据子表对象 in_stockin_detail @@ -151,4 +152,6 @@ public class InStockinDetail extends BaseEntity private String barCode; private String isBatchManage; private String oldProjectNo; + @Transient + private String erpBill; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java index baa5ba4..93bbedd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java @@ -69,4 +69,6 @@ public interface InStockinDetailMapper void deleteInStockinDetailByStockinGuid(String stockinGuid); InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail); + + List selectStockInByDetailByBarCode(String barCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java index aef8ee6..075e964 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java @@ -81,4 +81,6 @@ public interface IInStockinDetailService public InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail); + + List selectStockInByDetailByBarCode(String barCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java index 1763b66..07d21a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java @@ -127,4 +127,9 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService return inStockinDetailMapper.selectStockinByDetailById(inStockinDetail); } + + @Override + public List selectStockInByDetailByBarCode(String barCode) { + return inStockinDetailMapper.selectStockInByDetailByBarCode(barCode); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java index 22ed130..4f4d077 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.in.stockindetail.domain.InStockinDetail; import com.ruoyi.in.stockindetail.service.IInStockinDetailService; import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; @@ -54,16 +55,18 @@ public class PdaController extends BaseController { } /** - * 通过单据码查询物料详情 + * 通过单据码查询物料详情 TODO 修改单据码为barCode 前端需同步修改 */ @RequestMapping("/selectDetailById") @ResponseBody - public AjaxResult selectDetailById(String inStockinDetailId) { - InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId); - if (inStockinDetail != null) { - inStockinDetail.setQuantity(String.valueOf(Integer.valueOf(inStockinDetail.getQuantity()) - Integer.valueOf(inStockinDetail.getScanNum()))); - } - return AjaxResult.success(inStockinDetail); + public AjaxResult selectDetailById(String barCode) { + List stockinDetails = iInStockinDetailService.selectStockInByDetailByBarCode(barCode); + stockinDetails.stream().forEach(inStockinDetail -> { + Integer quantity = StringUtils.hasText(inStockinDetail.getQuantity()) ? Integer.valueOf(inStockinDetail.getQuantity()) : 0; + Integer scanNum = StringUtils.hasText(inStockinDetail.getScanNum()) ? Integer.valueOf(inStockinDetail.getScanNum()) : 0; + inStockinDetail.setQuantity(String.valueOf(quantity - scanNum)); + }); + return AjaxResult.success(stockinDetails); } /** @@ -308,11 +311,10 @@ public class PdaController extends BaseController { String stockinDetailId = trayCodeMsg.getStockinDetailId(); OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(stockinDetailId); String productId = outStockoutDetail.getProductId(); - Integer integer=pdaService.selectBasStockHcCount(trayCode,productId); - if (integer>0) - { + Integer integer = pdaService.selectBasStockHcCount(trayCode, productId); + if (integer > 0) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error("无该物料"); } diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml index f50bf8b..3e8fe43 100644 --- a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml @@ -343,5 +343,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by ist.create_date desc + + + + +