From 99f113b35308144878037b808697c2075c811041 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 四月 2024 11:05:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 CacheGlassModule/src/main/java/com/mes/mapper/PpMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/CacheGlassModule/src/main/java/com/mes/mapper/PpMapper.java b/CacheGlassModule/src/main/java/com/mes/mapper/PpMapper.java
index 68f18e6..bca7747 100644
--- a/CacheGlassModule/src/main/java/com/mes/mapper/PpMapper.java
+++ b/CacheGlassModule/src/main/java/com/mes/mapper/PpMapper.java
@@ -20,7 +20,7 @@
     List<Tempered> selectTemperedTerritory(String projeceid);
 
     // 鍒囧壊鐗堝浘 鎸夊伐绋�,鐗堝浘缂栧彿鏌ヨ
-    @Select("select * from optimize_detail where project_no=#{projeceid} ")
+    @Select("select * from optimize_detail where project_no=#{projeceid} and stock_id=#{TerritoryId}")
     List<Map> selectCutTerritory(String projeceid,String TerritoryId);
 
     // 鍒囧壊鐗堝浘 鎸夊伐绋嬫煡璇�

--
Gitblit v1.8.0