仓库管理修改

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml

@@ -104,7 +104,6 @@
 
         FROM st_goods_ext ge
         INNER JOIN st_goods g ON g.id = ge.goods_id
-        WHERE g.id = #{goodsId}
 
         LEFT JOIN (
         SELECT b.goods_code, SUM(a.quantity - a.occupy_quantity) AS last_qty
@@ -112,6 +111,7 @@
         INNER JOIN st_goods b ON a.goods_id = b.id
         GROUP BY b.goods_code
         ) mes ON g.goods_code = mes.goods_code
+        WHERE g.id = #{goodsId}
     </select>
 
     <select id="exportStGoodsExt" resultType="org.springblade.wms.excel.StGoodsExtExcel">

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsExtServiceImpl.java

@@ -94,6 +94,10 @@ public class StGoodsExtServiceImpl extends BaseServiceImpl<StGoodsExtMapper, StG
 				String goodsCode = goodsIdToCodeMap.get(goodsId);
 
 				StGoodsExtStatusVO vo = erpDataWmsClient.getGoodsExtStatus(goodsCode).getData();
+				if (vo == null) {
+					log.warn("物料ERP信息不存在，跳过：goodsCode={}", goodsCode);
+					continue;
+				}
 				StGoodsExt goodsExt = baseMapper.getGoodsExt(vo.getInvqty1j(),vo.getPlanqty(),goodsId);
 				ext.setFirstStore(vo.getInvqty1j());
 				ext.setLastStore(goodsExt.getLastStore());

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java

@@ -547,7 +547,7 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
 		// 2. 仅开启最低库存预警时，才执行校验
 		if ("1".equals(stGoods.getMinWarning())) {
 			// 3. 计算出库后库存，处理最低库存空值（默认0）
-			Double currentStock = stGoods.getCurrentQuantity() - outQuantity;
+			Double currentStock = stGoods.getCurrentQuantity();
 			Double minStock = stGoods.getMinNum() == null ? 0.0 : stGoods.getMinNum();
 
 			// 4. 低于最低库存时，生成预警信息+执行后续逻辑