From 5d3fbdc6524682c5d5dfd76ea94bd22003ce06f4 Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Tue, 25 Feb 2025 16:12:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=AD=98=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WmsInstockDetailServiceImpl.java     |  4 +-
 .../mapper/wms/WmsInventoryMapper.xml         | 39 +++++++++----------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java
index b1b8140..2fda59c 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java
@@ -16,9 +16,11 @@ import org.dromara.wms.domain.bo.WmsAllocateOrderDetailBo;
 import org.dromara.wms.domain.bo.WmsInstockDetailBo;
 import org.dromara.wms.domain.vo.BaseMaterialInfoVo;
 import org.dromara.wms.domain.vo.WmsInstockDetailVo;
+import org.dromara.wms.domain.vo.WmsInstockOrderVo;
 import org.dromara.wms.mapper.WmsInstockDetailMapper;
 import org.dromara.wms.service.IBaseMaterialInfoService;
 import org.dromara.wms.service.IWmsInstockDetailService;
+import org.dromara.wms.service.IWmsInstockOrderService;
 import org.dromara.wms.service.IWmsInstockPrintService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -163,7 +165,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
         String materialCode = bo.getMaterialCode();
         String batchCode = instockCode+materialCode+order;
         wmsInstockPrint.setBatchCode(batchCode);
-        wmsInstockPrint.setApportionQty(bo.getPrintNum().longValue());
+        wmsInstockPrint.setApportionQty(bo.getPrintNum());
         wmsInstockPrint.setMaterialQty(bo.getBarcodeNum());
         wmsInstockPrint.setCreateBy(username);
         int rows = wmsInstockPrintService.insertWmsInstockPrint(wmsInstockPrint);
diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml
index d205247..c616e1f 100644
--- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml
+++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml
@@ -16,27 +16,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="listInventoryAlarm" resultType="org.dromara.wms.domain.vo.WmsInventoryVo"
             parameterType="org.dromara.wms.domain.bo.WmsInventoryBo">
         SELECT
-            x.material_id,
-            SUM(x.inventory_qty) inventory_qty,
-            x.warehouse_id,
-            MAX(b.min_stock_amount) min_stock_amount,
-            MAX(b.max_stock_amount) max_stock_amount,
-            MAX(c.warehouse_code) warehouse_code,
-            MAX(b.material_code) material_code,
-            MAX(x.lock_state) lock_state,
-            MAX(x.inventory_status) inventory_status,
-            MAX(x.material_categories) material_categories,
-            MAX(x.location_code) locationCode,
-            MAX(x.batch_code) batchCode
+        x.material_id,
+        SUM(x.inventory_qty) inventory_qty,
+        CASE when SUM(x.inventory_qty) > MAX(b.max_stock_amount) then '0'
+        when MIN(b.min_stock_amount) > SUM(x.inventory_qty)  then '0'
+        ELSE '1' END as inventory_status,
+        x.warehouse_id,
+        MAX(b.min_stock_amount) min_stock_amount,
+        MAX(b.max_stock_amount) max_stock_amount,
+        MAX(c.warehouse_code) warehouse_code,
+        MAX(b.material_code) material_code,
+        MAX(x.lock_state) lock_state,
+        MAX(x.material_categories) material_categories,
+        MAX(x.location_code) locationCode,
+        MAX(x.batch_code) batchCode
         FROM
-            hwmom.dbo.wms_inventory x
-                left join base_material_info b on
-                x.material_id = b.material_id
-                left join wms_base_warehouse c on
-                x.warehouse_id = c.warehouse_id
---                 left join base_material_info d
---                           on
---                               x.material_id = d.material_id
+        hwmom.dbo.wms_inventory x
+        left join base_material_info b on
+        x.material_id = b.material_id
+        left join wms_base_warehouse c on
+        x.warehouse_id = c.warehouse_id
         <where>
 <!--            <if test="entity.materialId != null ">and x.material_id = #{entity.materialId}</if>-->
             <if test="entity.warehouseId != null  and entity.warehouseId != ''">and x.warehouse_id = #{entity.warehouseId}</if>