From 9ea2345963731999a0e4c8f52cb4606eb824be84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B1=97=E9=9D=92?= Date: Mon, 17 Aug 2026 09:53:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MesOutorderMiddleServiceImpl.java | 25 + .../mapper/MesOutorderDetailMiddleMapper.java | 3 + .../mapper/ViewInOrOut/ViewInOrOutMapper.xml | 449 ++++++++++++------ .../mes/MesOutorderDetailMiddleMapper.xml | 6 + .../resources/templates/out/salePlan.html | 4 +- 5 files changed, 351 insertions(+), 136 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/project/middle/mesOutorder/service/impl/MesOutorderMiddleServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/project/middle/mesOutorder/service/impl/MesOutorderMiddleServiceImpl.java index 1b630ce..2a0ccb0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/project/middle/mesOutorder/service/impl/MesOutorderMiddleServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/project/middle/mesOutorder/service/impl/MesOutorderMiddleServiceImpl.java @@ -21,6 +21,7 @@ import com.ruoyi.project.out.outStock.mapper.OutStockoutMapper; import com.ruoyi.project.out.outStockDetail.domain.OutStockoutDetail; import com.ruoyi.project.out.outStockDetail.mapper.OutStockoutDetailMapper; import com.ruoyi.project.out.productAndStock.domain.ViewProductAndStock; +import com.ruoyi.project.out.productAndStock.mapper.ViewProductAndStockMapper; import com.ruoyi.project.out.productAndStock.service.IViewProductAndStockService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,6 +53,8 @@ public class MesOutorderMiddleServiceImpl implements IMesOutorderMiddleService private OutStockoutDetailMapper outStockoutDetailMapper; @Autowired private IViewProductAndStockService viewProductAndStockService; + @Autowired + private ViewProductAndStockMapper viewProductAndStockMapper; /** * 查询mes出库单中间表 @@ -130,6 +133,28 @@ public class MesOutorderMiddleServiceImpl implements IMesOutorderMiddleService @Override public AjaxResult insertMesOutorder(MesOutorderMiddleVo mesOutorderMiddleVo,String createType) { try { + List mesOutorderDetailMiddleList1 = mesOutorderMiddleVo.getMesOutorderDetailMiddleList(); + for (MesOutorderDetailMiddle mesOutorderDetailMiddle : mesOutorderDetailMiddleList1) { + Integer planInQuantity = mesOutorderDetailMiddle.getPlanInQuantity().intValue(); + String productBatch = mesOutorderDetailMiddle.getProductBatch(); + String materialCode = mesOutorderDetailMiddle.getMaterialCode(); + + ViewProductAndStock param = new ViewProductAndStock(); + param.setOutType("15"); + param.setLotNo(productBatch); + param.setClassgroupNumber(materialCode); + List viewProductAndStocks = viewProductAndStockMapper.selectViewProductAndStockList(param); + int stockCount = 0; + for (ViewProductAndStock viewProductAndStock : viewProductAndStocks) { + stockCount = stockCount + viewProductAndStock.getQuantity().intValue(); + } + int djCount = mesOutorderDetailMiddleMapper.selectCountByBatchAndMaterialCode(productBatch, materialCode); + + if (stockCount - djCount < planInQuantity){ + return AjaxResult.error("牌号："+materialCode+"批次："+productBatch+"，剩余库存数量："+(stockCount - djCount)+"，当前计划数量："+planInQuantity+"，库存不足，请检查"); + } + } + MesOutorderMiddle mesOutorderMiddle = mesOutorderMiddleVo.getMesOutorderMiddle(); mesOutorderMiddle.setId(UUID.randomUUID().toString()); String bl = basJobIdService.getJobId("BH"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/project/middle/mesOutorderDetail/mapper/MesOutorderDetailMiddleMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/project/middle/mesOutorderDetail/mapper/MesOutorderDetailMiddleMapper.java index bfcbe2d..cc870c0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/project/middle/mesOutorderDetail/mapper/MesOutorderDetailMiddleMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/project/middle/mesOutorderDetail/mapper/MesOutorderDetailMiddleMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.project.middle.mesOutorderDetail.mapper; import java.util.HashMap; import java.util.List; import com.ruoyi.project.middle.mesOutorderDetail.domain.MesOutorderDetailMiddle; +import org.apache.ibatis.annotations.Param; /** * mes出库子单中间表Mapper接口 @@ -87,4 +88,6 @@ public interface MesOutorderDetailMiddleMapper String selectUrlByLineNoChildTwo(String stockOutDetailId); String selectUrlByLineNoMother(String stockOutDetailId); + + int selectCountByBatchAndMaterialCode(@Param("productBatch") String productBatch,@Param("materialCode") String materialCode); } diff --git a/ruoyi-admin/src/main/resources/mapper/ViewInOrOut/ViewInOrOutMapper.xml b/ruoyi-admin/src/main/resources/mapper/ViewInOrOut/ViewInOrOutMapper.xml index 670d500..dab5c6b 100644 --- a/ruoyi-admin/src/main/resources/mapper/ViewInOrOut/ViewInOrOutMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/ViewInOrOut/ViewInOrOutMapper.xml @@ -49,141 +49,322 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/templates/out/salePlan.html b/ruoyi-admin/src/main/resources/templates/out/salePlan.html index ad561a5..6ffe4a3 100644 --- a/ruoyi-admin/src/main/resources/templates/out/salePlan.html +++ b/ruoyi-admin/src/main/resources/templates/out/salePlan.html @@ -927,7 +927,7 @@ title: '销售单位', align: 'center' }, - { + /*{ field: 'createType', title: '建单类型', align: 'center', @@ -939,7 +939,7 @@ return "自动建单" } } - }, + },*/ { field: 'createTime',