From aa9be9752e84bb68e674fba6aa806345b8b16227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Tue, 24 Dec 2024 14:36:22 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5=20?= =?UTF-8?q?=E5=A7=94=E5=A4=96=E8=AE=A1=E5=88=92=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A7=94=E5=A4=96=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8F=AF=E7=94=A8=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=A7=94=E5=A4=96=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=AF=A6=E6=83=85service=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=81=94=E6=9F=A5=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98=E6=95=B0?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OutsourcePlanController.java | 2 +- .../system/domain/OutsourcePlanDetail.java | 13 ++++++++++++- .../service/impl/OutsourcePlanServiceImpl.java | 17 +++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java index 2153f10b..e9ab26af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java @@ -158,7 +158,7 @@ public class OutsourcePlanController extends BaseController } /** - * 查询委外计划详情 + * 查询委外计划详情（1阶物料） */ @PostMapping("/getRequisitionMaterial") @ResponseBody diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourcePlanDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourcePlanDetail.java index dba19b9f..3f999ad0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourcePlanDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourcePlanDetail.java @@ -81,9 +81,12 @@ public class OutsourcePlanDetail extends BaseEntity /** 委外订单号（不保存数据库，*/ private String outsourceOrderNo; - /** 已委外领料数(不保存数据库*/ + /** 已委外领料数(只做前端展示用）*/ private int pickedNum; + /* 可用库存数（只做前端展示用）*/ + private int stockNum; + private OutsourceMaterial material; public OutsourceMaterial getMaterial() { @@ -252,6 +255,14 @@ public class OutsourcePlanDetail extends BaseEntity this.pickedNum = pickedNum; } + public int getStockNum() { + return stockNum; + } + + public void setStockNum(int stockNum) { + this.stockNum = stockNum; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourcePlanServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourcePlanServiceImpl.java index cdbfff92..e85a8da9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourcePlanServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourcePlanServiceImpl.java @@ -8,9 +8,12 @@ import com.ruoyi.system.domain.Vo.OutsourceProcessVo; import com.ruoyi.system.domain.Vo.Supplier; import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.IOutsourcePlanService; +import com.ruoyi.warehouse.domain.WarehouseInventoryInquiry; +import com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Optional; import java.util.stream.Collectors; import com.ruoyi.common.utils.StringUtils; @@ -18,6 +21,8 @@ import org.springframework.transaction.annotation.Transactional; import com.ruoyi.common.core.text.Convert; +import javax.swing.text.html.Option; + /** * 委外计划Service业务层处理 * @@ -41,6 +46,9 @@ public class OutsourcePlanServiceImpl implements IOutsourcePlanService @Autowired private OutsourceRequisitionMapper requisitionMapper; + + @Autowired + private WarehouseInventoryInquiryMapper inventoryInquiryMapper; /** * 查询委外计划 * @@ -283,6 +291,7 @@ public class OutsourcePlanServiceImpl implements IOutsourcePlanService List details = outsourcePlanMapper.selectOutsourcePlanDetail(outsourcePlanDetail); if(StringUtils.isNotEmpty(details)){ for (OutsourcePlanDetail plan: details) { + /** 获取已领料数*/ OutsourceRequisitionDetail requisitionDetail = new OutsourceRequisitionDetail(); requisitionDetail.setOutsourceOrderNo(outsoutceOrderNo); requisitionDetail.setPlanDetailId(plan.getOutsourcePlanDetailId()); @@ -295,6 +304,14 @@ public class OutsourcePlanServiceImpl implements IOutsourcePlanService int pikenNum = filtList.stream().mapToInt(item -> item.getTakingMaterial()).sum(); plan.setPickedNum(pikenNum); } + /** 获取可用库存数*/ + WarehouseInventoryInquiry inquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(plan.getMaterialNo()); + if(inquiry == null){ + plan.setStockNum(0); + }else{ + int stockNum = Optional.ofNullable(inquiry.getAvailableStockNum()).orElse(0); + plan.setStockNum(stockNum); + } } } return details;