diff --git a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java
index 359a4281..39e57d85 100644
--- a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java
+++ b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java
@@ -229,13 +229,16 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
         if (!yemEsMaterialinfo.isEmpty()) {
             Map<String, BigDecimal> map = new HashMap<>();
             for (DynamicObject loadSingle : yemEsMaterialinfo) {
+                String yemContractnumbersM = loadSingle.getString("yem_contractnumbers_m");
+                String yemShipmentnumbersM = loadSingle.getString("yem_shipmentnumbers_m");
+                String yemProducts = loadSingle.getString("yem_products.number");
                 String aLong = loadSingle.getString("yem_productmodel.yem_products.number");
                 BigDecimal yemQty = loadSingle.getBigDecimal("yem_qty");
-                if (map.get(aLong) != null) {
-                    BigDecimal bigDecimal = map.get(aLong);
-                    map.put(aLong, bigDecimal.add(yemQty));
+                if (map.get(yemContractnumbersM+yemShipmentnumbersM+yemProducts+aLong) != null) {
+                    BigDecimal bigDecimal = map.get(yemContractnumbersM+yemShipmentnumbersM+yemProducts+aLong);
+                    map.put(yemContractnumbersM+yemShipmentnumbersM+yemProducts+aLong, bigDecimal.add(yemQty));
                 } else {
-                    map.put(aLong, yemQty);
+                    map.put(yemContractnumbersM+yemShipmentnumbersM+yemProducts+aLong, yemQty);
                 }
             }
             DynamicObjectCollection yemEsSalesorderL = this.getModel().getEntryEntity("yem_es_salesorder_l");
@@ -245,8 +248,11 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
                     DynamicObject yemGiftproactype = loadSingle.getDynamicObject("yem_giftproactype");
                     if (yemGiftproactype != null) {
                         String aLong = yemGiftproactype.getString("number");
-                        if (map.get(aLong) != null) {
-                            this.getModel().setValue("yem_tsagerqty", map.get(aLong), i);
+                        String yemContractnumbers = loadSingle.getString("yem_contractnumbers");
+                        String yemShipmentnumbers = loadSingle.getString("yem_shipmentnumbers");
+                        String yemBdProducts = loadSingle.getString("yem_bd_products");
+                        if (map.get(yemContractnumbers+yemShipmentnumbers+yemBdProducts+aLong) != null) {
+                            this.getModel().setValue("yem_tsagerqty", map.get(yemContractnumbers+yemShipmentnumbers+yemBdProducts+aLong), i);
                         }
                     }
                 }